Skip to content

Commit

Permalink
PluginOK网络版2.2.10.8(单机版1.5.10.8)
Browse files Browse the repository at this point in the history
   1、中间件高级版支持启动达索Catia CAD设计软件内嵌到网页运行;
   2、优化中间件文件下载性能及识别文件名生成算法;
   3、PageHiOffice插入图片支持悬浮于文字之上,解决部分下载地址包含问号等时提示文件名非法问题;
   4、PageHiPlayer多引擎及VLC网页播放器优化Win7下叠加透明网页效果,解决Win7下多引擎播放时VLC切换播放时可能卡死问题;
   5、PageHiPlayer多引擎及VLC网页播放器支持设置服务器上及Base64编码的水印图片,优化截图操作,解决接口调用全屏时充满窗口设置无效问题
  • Loading branch information
wangzuohuai committed Jul 24, 2023
1 parent 0137fa4 commit 6612ffc
Show file tree
Hide file tree
Showing 166 changed files with 1,051 additions and 156 deletions.
16 changes: 15 additions & 1 deletion Bin/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
2023-06-26 PluginOK网络版2.2.10.6(单机版1.5.10.6)
2023-07-23 PluginOK网络版2.2.10.8(单机版1.5.10.8)
1、中间件高级版支持启动达索Catia CAD设计软件内嵌到网页运行;
2、优化中间件文件下载性能及识别文件名生成算法;
3、PageHiOffice插入图片支持悬浮于文字之上,解决部分下载地址包含问号等时提示文件名非法问题;
4、PageHiPlayer多引擎及VLC网页播放器优化Win7下叠加透明网页效果,解决Win7下多引擎播放时VLC切换播放时可能卡死问题;
5、PageHiPlayer多引擎及VLC网页播放器支持设置服务器上及Base64编码的水印图片,优化截图操作,解决接口调用全屏时充满窗口设置无效问题。

2023-07-02 PluginOK网络版2.2.10.7(单机版1.5.10.7)
1、优化中间件高级版启动内嵌小程序时窗口显示机制,解决切换到其它窗口时可能影响显示问题;
2、优化中间件系统服务在系统从睡眠中恢复时服务状态检测机制,解决服务恢复可能异常问题;
3、优化PageHiOffice识别本机微软Office安装信息机制,解决个别版本识别不到问题;
4、PageHiPlayer多引擎及VLC网页播放器叠加透明网页支持显示为小窗口,当鼠标滑动到叠加网页区时支持交互操作;
5、PageHiPlayer多引擎网页播放器FFPlayer播放器支持选中区域放大显示播放画面,解决合并视频可能错误问题。

2023-06-26 PluginOK网络版2.2.10.6(单机版1.5.10.6)
1、优化中间件高级版启动内嵌小程序后的输入焦点处理机制,解决在已嵌入小程序中弹出窗口不正常问题;
2、优化中间件安装在长路径下运行的处理机制,高级版支持最新版桌面微信网页窗口,提高部分浏览器的兼容效果;
3、小程序在升级时拒绝启动,避免升级时无法覆盖,解决中间件高级版在启动内嵌小程序时可能提示失败问题;
Expand Down
4 changes: 2 additions & 2 deletions Bin/FileApplet.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

2������װ�ļ�����С�����ڲ���ҳ�������� ws://localhost:80?sid=123&flag=1 ���������м������Ȼ�������������ݵ�����ͣ�

{"req":"Plugin_Install","rid":1,"para":{"Name":"�ļ�����С����","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2023-06-26","Desc":"PluginOK�м��֮�Ͽ���������ļ�����С�����ṩ�ļ�HTTPЭ���ϴ������ء�����ͼ���ļ���������ת�������ļ����ʡ����س������еȷ��񣬿���Chrome��Edge��Firefox��IE��Opera��360��QQ�ȵ���������°��е���","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet.pid","MD5":"52078AFC4F3C29C35135F85702D12F96","Version":"1.5.10.6","Size":524288,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"25FB39B5019B5DC15B59C1F377EAFC921345081EF3E8B256D7192514B30F2C8915DC2F8F89C172064AB26ECB3543469559BAD7723FA0537FBADE90421705742FC0A77FEE4E99BF67B028DD996597D9975D86A5E1EC76B9AE6C6FFB72D597E295B87722E3D6971845C78AB8DA2E470052622ED6AEBC2E7E76138CEEDE3B233775745C34365A116B99B02A27C1057F6042F8859C81FE820DC26030907C7008B3D43DE12F9F2C5E7EF4BA5144AA4A08AD7E995A9D405CE6A6B09D3891DACF459C2B926288918A72AD2DC755D65657677294435C92784B4C9E93F21E642D3495EA2ED501EB492D5A5603F45610C494931AD61553B329965A9BA8F2AEB94055812525"}}
{"req":"Plugin_Install","rid":1,"para":{"Name":"�ļ�����С����","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2023-07-23","Desc":"PluginOK�м��֮�Ͽ���������ļ�����С�����ṩ�ļ�HTTPЭ���ϴ������ء�����ͼ���ļ���������ת�������ļ����ʡ����س������еȷ��񣬿���Chrome��Edge��Firefox��IE��Opera��360��QQ�ȵ���������°��е���","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet.pid","MD5":"4CF84EF491EFA7B7A7B1B5B8D427EF19","Version":"1.5.10.8","Size":524288,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"12C01CD1DB576B9499272FFBF02D926DEEC054EB372313B14CDB597AE970EACC216D8FF29355D0D0190D34898F6BF2135AA73C03C075743D6CCA4B02A7D08EA7A52E398E1F4E03D708EA820BEE53C1FCD56DCD02C2B89183D3FD430C1C2A2710C4CAE7CE6A0C5ECF064B1C5EA029219401149A82E81D8D23BD39C3A97AE7A818EB6CD5791A1D7CF7A0CEBA829CAF8ABEE810ADC2F450DC6FBD0A6925968BD25E0FB24399AE3E41986F45D7A3A9BB5F831BADD4C038250D3467A603EA2A6502C9646083F3D53BC35E2E821BBB34BB9233909799965489910BAEC067A3DF5611832A9B37EE4E2BCC532F56274FC9A5A87653C00CFC8F16C6E9A11459778A4AC4FE"}}

3����������ļ�����С����

{"req":"Plugin_Update","rid":1,"para":{"Name":"�ļ�����С����","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2023-06-26","Desc":"PluginOK�м��֮�Ͽ���������ļ�����С�����ṩ�ļ�HTTPЭ���ϴ������ء�����ͼ���ļ���������ת�������ļ����ʡ����س������еȷ��񣬿���Chrome��Edge��Firefox��IE��Opera��360��QQ�ȵ���������°��е���","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet_Update.pid","MD5":"B608E4B35FDA80F8EDF9800996E20008","Version":"1.5.10.6","Size":524288,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"A3831A274B7C4A8EB0BE6F81540618A3952BD3282F84D0C05543686A28EE8504FB32F5B4F4B61940B64E899375B2D85687BA2372199984B0A21293F3BD9E53764A40886D52E74FAA7389BD75BDB6067344903FDE168CE78BF6325830F4387FDC81E3D22A93170892A97EDEE374E8E89A101379D309DDDD053A7C61004188B33B6B051051BF0791A86BAE86530EBEAFAC05C22A12E355E4D812DAC8706C2A290256CEB006D3DE8977CE223AEFBFC0E72596BF52C1244C167BAB29722DE5C637D83001448A480F8977B82E1241B661373DCBCF9E28B1DCDCB11AAE1A5DA5160F466DA3E8681AD0997F9F96187411BEB4AE4A9BF52ABCD9469A551FC12F14F57E83"}}
{"req":"Plugin_Update","rid":1,"para":{"Name":"�ļ�����С����","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2023-07-23","Desc":"PluginOK�м��֮�Ͽ���������ļ�����С�����ṩ�ļ�HTTPЭ���ϴ������ء�����ͼ���ļ���������ת�������ļ����ʡ����س������еȷ��񣬿���Chrome��Edge��Firefox��IE��Opera��360��QQ�ȵ���������°��е���","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet_Update.pid","MD5":"9FFA1A811473D07B7E6A84DF4EC7E6C2","Version":"1.5.10.8","Size":524288,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"A3D410BFDF634D256C0B3AC3DCB4202363A89E8B94D55D9737A2EDA54285D63A6A21E40ED8B9CE3E2EB14A3B058E5C23F0B1CF993E912B30F7AA003CE2F462A8580B2E43B8504DCFCDD1B3942435D11F82FBAF78AAA8396D367D7F591B35CD124D5100C509EA88C1C89189A23B6B3FA74A3AD826EAB7029972D25466150C683217D7E41342E6221597E162522CDC007B2461464C2455A8C1E5DE0885482B272C1265F520E8B2DFC28C4DD5F1CCC007C4AB896657D9886FB4A3761F09C4B176278B2EC4133DE26FBD411CB256735AA844CF0AF1C8703F0FCE9F2D1BC2CEB929ADB0D8CC1F121F040D5CB0BEDE5EF98038F5CD015AAAEA2BBF21098FFDF825800C"}}

���ϰ�װ��������JSON�������������汾�����������ݲ�ͬ��������װ������ʱ����������ϵ�ͷ���ȡ���µ��������

Expand Down
Binary file modified Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf
Binary file not shown.
Binary file not shown.
Binary file modified Bin/Plugins/MSTTSApp/PluginAuth.paf
Binary file not shown.
21 changes: 21 additions & 0 deletions Bin/Test/CatiaCadApplet0.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<head>
<meta charset="UTF-8">
<title>Catia Applet</title>
<style>
.CatiaCadApplet
{
margin: 0px 0 0 0px;
width: 480px;
height: 320px;
border: 1px solid blue;
}
</style>
<script src="PluginOK/base.js"></script>
<script src="PluginOK/PluginOK.js"></script>
</head>

<body>
<div id="CatiaCadApplet" class="CatiaCadApplet"</div>
</body>
</html>
18 changes: 18 additions & 0 deletions Bin/Test/CatiaCadApplet3.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!DOCTYPE html>
<head>
<meta charset="UTF-8">
<title>Catia Applet</title>
</head>
<style>
.CatiaCadApplet
{
margin: 210px 0 0 20px;
width: 480px;
height: 320px;
border: 1px solid blue;
}
</style>
<body>
<div id="CatiaCadApplet" class="CatiaCadApplet"</div>
</body>
</html>
81 changes: 81 additions & 0 deletions Bin/Test/CatiaCadFrame.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@

<!DOCTYPE html>
<html manifest="/websocket.appcache">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>Solidworks Applet Test</title>

<link href="css/res.css" rel="stylesheet"/>
<link rel="shortcut icon" href="{% static 'Files/favicon.ico' %}" type="image/x-icon">

<script src="PluginOK/base.js"></script>
<script src="PluginOK/PluginOK.js"></script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onopen()">
showmessage('连接成功');
WrlVisibilityListener(true);
WrlScrollListener(true);
$('body').find('#btn_send').attr('disabled', false);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onclose(param1,param2,param3)">
WrlVisibilityListener(false);
WrlScrollListener(false);
nAppletRunID = 0;
nRequstAppletID = 0;
showmessage(param2);
$('body').find('#btn_conn').attr('disabled', false);
$('body').find('#btn_close').attr('disabled', true);
$('body').find('#btn_send').attr('disabled', true);
$('body').find('#btn_fitpage').attr('disabled', true);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onmessage(param)">
DealRecMessage(param);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onerror(param)">
showmessage(param);
</script>
<script type="text/javascript">
$(document).ready(function(){
$("#inp_url").attr("value",GetDefaultConn());
});
</script>
</head>

<body>
<object ID="WrlWS" CLASSID="CLSID:C0971B90-4513-4E2D-A0B6-15B915FE748A" width="0" height="0"></object>
<br />
<iframe name="CatiaCadApplet" id="CatiaCadApplet" src="CatiaCadApplet3.html" frameborder="0" align="left" width="550" height="540" scrolling="no">
</iframe>
<div class="container">
<div class="page-header">
<h2 style="margin-top:20px;margin-left:20px; text-align:center; ">PluginOK内嵌Solidworks小程序自动适配及还原1</h2>
</div>
<div class="row" style="margin-bottom:20px;">
<div class="col-sm-6 col-md-5 col-lg-4">
<div>
<input type="text" class="form-control" size="50" style="margin-bottom:3px;" id="inp_url" placeholder="连接" value="ws://localhost:80?sid=12345&flag=1" />
<button type="button" id="btn_conn" class="btn btn-primary">连接</button>
<button type="button" id="btn_close" class="btn btn-danger" disabled="disabled">断开</button>
<button type="button" id="btn_clear" class="btn btn-danger">清空通讯记录</button>
<button type="button" id="btn_fitpage" class="btn btn-danger" disabled="disabled">适配显示切换</button>
</div>
<br />
<div style="margin-bottom:20px;">
<textarea id="inp_send" class="form-control" style="margin-bottom:3px;min-width:350px;min-height:250px;" placeholder="请输入发送的内容">{"req":"Wrl_CatiaApplet","rid":8,"para":{"Type":"0","Title":"Catia Applet","Flag":66,"Left":20,"Top":20,"Width":480,"Height":320,"IframeX":0,"IframeY":210,"BarW":0,"BarH":0,"ScrollTop":0,"Version":"0","Web": [],"Open":"D:/Zorro/Test.CATPart"}}</textarea>
<button type="button" id="btn_send" class="btn btn-info btn-block">发送(Ctrl+Enter)</button>
</div>
</div>
<div class="col-sm-6 col-md-7 col-lg-8">
<div id="div_msgzone" class="panel panel-default">
<div class="panel-heading">通讯记录</div>
<div id="div_msg" class="panel-body" style="min-height:400px;width:500px;"></div>
</div>
</div>
</div>
</div>
</body>
</html>
96 changes: 96 additions & 0 deletions Bin/Test/CatiaCadOcx.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@

<!DOCTYPE html>
<html manifest="/websocket.appcache">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>Catia Applet Test</title>
<style>
.CatiaCadApplet {
margin: 20px 0 0 20px;
width: 480px;
height: 320px;
border: 1px solid blue;
}
</style>

<link href="css/res.css" rel="stylesheet"/>
<link rel="shortcut icon" href="{% static 'Files/favicon.ico' %}" type="image/x-icon">

<script src="PluginOK/base.js"></script>
<script src="PluginOK/PluginOK.js"></script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onopen()">
showmessage('连接成功');
WrlVisibilityListener(true);
WrlScrollListener(true);
$('body').find('#btn_send').attr('disabled', false);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onclose(param1,param2,param3)">
WrlVisibilityListener(false);
WrlScrollListener(false);
nAppletRunID = 0;
nRequstAppletID = 0;
showmessage(param2);
$('body').find('#btn_conn').attr('disabled', false);
$('body').find('#btn_send').attr('disabled', true);
$('body').find('#btn_close').attr('disabled', true);
$('body').find('#btn_max').attr('disabled', true);
$('body').find('#btn_restore').attr('disabled', true);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onmessage(param)">
DealRecMessage(param);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onerror(param)">
showmessage(param);
</script>
<script type="text/javascript">
$(document).ready(function(){
$("#inp_url").attr("value",GetDefaultConn());
});
</script>
</head>

<body>
<object ID="WrlWS" CLASSID="CLSID:C0971B90-4513-4E2D-A0B6-15B915FE748A" width="0" height="0"></object>
<br />
<iframe name="CatiaCadApplet" id="CatiaCadApplet" src="CatiaCadApplet0.html" frameborder="0" align="left" width="500" height="350" scrolling="no">
</iframe>
<div class="container">
<div class="page-header">
<h2 style="margin-top:20px;margin-left:20px; text-align:center; ">PluginOK内嵌Catia CAD小程序指定位置最大适配显示及还原1</h2>
</div>
<div class="row" style="margin-bottom:20px;">
<div class="col-sm-6 col-md-5 col-lg-4">
<div>
<input type="text" class="form-control" size="50" style="margin-bottom:4px;" id="inp_url" placeholder="连接" value="ws://local.zorrosoft.com:80?sid=123&flag=1" />
<button type="button" id="btn_conn" class="btn btn-primary">连接</button>
<span style="width:10px;">&nbsp;</span>
<button type="button" id="btn_close" class="btn btn-danger" disabled="disabled">断开</button>
<span style="width:10px;">&nbsp;</span>
<button type="button" id="btn_clear" class="btn btn-danger">清空通讯记录</button>
<br />
<br />
<button type="button" id="btn_max" class="btn btn-danger" disabled="disabled">适配显示</button>
<span style="width:10px;">&nbsp;</span>
<button type="button" id="btn_restore" class="btn btn-danger" disabled="disabled">还原显示</button>
</div>
<br />
<div style="margin-bottom:20px;">
<textarea id="inp_send" class="form-control" style="margin-bottom:3px;min-width:350px;min-height:250px;" placeholder="请输入发送的内容">{"req":"Wrl_CatiaApplet","rid":5,"para":{"Type":"0","Title":"Catia Applet","Flag":64,"IframeX":-20,"IframeY":8,"BarW":0,"BarH":0,"ScrollTop":0,"Version":"1","Web": [],"Open":"D:/Zorro/Test.CATPart"}}</textarea>
<button type="button" id="btn_send" class="btn btn-info btn-block">发送(Ctrl+Enter)</button>
</div>
</div>
<div class="col-sm-6 col-md-7 col-lg-8">
<div id="div_msgzone" class="panel panel-default">
<div class="panel-heading">通讯记录</div>
<div id="div_msg" class="panel-body" style="min-height:400px;width:500px;"></div>
</div>
</div>
</div>
</div>
</body>
</html>
94 changes: 94 additions & 0 deletions Bin/Test/CatiaCadfull.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<!DOCTYPE html>
<html manifest="/websocket.appcache">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>当前页内嵌Solidworks小程序编辑审核3D工程图</title>
<script type="text/javascript">
</script>

<link href="css/res.css" rel="stylesheet"/>
<script src="PluginOK/base.js"></script>
<script src="PluginOK/PluginOK.js"></script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onopen()">
showmessage('连接成功');
WrlVisibilityListener(true);
WrlScrollListener(true);
$('body').find('#btn_send').attr('disabled', false);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onclose(param1,param2,param3)">
showmessage(param2);
WrlVisibilityListener(false);
WrlScrollListener(false);
$('body').find('#btn_conn').attr('disabled', false);
$('body').find('#btn_close').attr('disabled', true);
$('body').find('#btn_send').attr('disabled', true);
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onmessage(param)">
DealRecMessage(param);
showmessage(param, 'receive');
</script>

<script language ="javascript" type ="text/javascript" for="WrlWS" event="onerror(param)">
showmessage(param);
</script>
<script type="text/javascript">
$(document).ready(function(){
$("#inp_url").attr("value",GetDefaultConn());
});
</script>
</head>
<style>
.CatiaCadApplet
{
margin: 0px 0px 0px 0px;
width: 20px;
height: 20px;
border: 1px solid blue;
}
</style>
<body>
<div id="CatiaCadApplet" class="CatiaCadApplet"</div>
<object ID="WrlWS" CLASSID="CLSID:C0971B90-4513-4E2D-A0B6-15B915FE748A" width="0" height="0"></object>
<div class="container">
<div class="page-header">
<h2 style="margin-top:20px;margin-left:20px; text-align:center; ">牛插(PluginOK)中间件在线体验</h2>
<a href=http://local.zorrosoft.com/Files/PluginOK.pdf>产品介绍</a>
<a href=http://local.zorrosoft.com/Files/PluginOK.zip>中间件安装包</a>
<a href=http://local.zorrosoft.com/Files/ZbaSDK.zip>中间件开发包(SDK)</a>
<br />
<br />
</div>
<div class="row" style="margin-bottom:20px;">
<div class="col-sm-6 col-md-5 col-lg-4">
<div>
<input type="text" class="form-control" size="80" style="margin-bottom:3px;" id="inp_url" placeholder="连接" value="ws://wrl.zorrosoft.com:80?
sid=123&flag=1" />
<button type="button" id="btn_conn" class="btn btn-primary">连接</button>
<span style="width:10px;">&nbsp;</span>
<button type="button" id="btn_close" class="btn btn-danger" disabled="disabled">断开</button>
<span style="width:10px;">&nbsp;</span>
<button type="button" id="btn_clear" class="btn btn-danger">清空通讯记录</button>
</div>
<br />
<div style="margin-bottom:20px;">
<textarea id="inp_send" class="form-control" style="margin-bottom:3px;min-width:350px;min-height:200px;" placeholder="请输入发送的内容">{"req":"Wrl_CatiaApplet","rid":97,"para":{"Type":"0","Title":"Catia Applet Full","Flag":72,"IframeX":0,"IframeY":0,"ScrollTop":0,"Web": [],"Open":"D:/Zorro/Test.CATPart","Version":0}}</textarea>
<button type="button" id="btn_send" class="btn btn-info btn-block">发送(Ctrl+Enter)</button>
</div>
</div>
<div class="col-sm-6 col-md-7 col-lg-8">
<div id="div_msgzone" class="panel panel-default">
<div class="panel-heading">通讯记录</div>
<div id="div_msg" class="panel-body" style="min-height:300px;"></div>
</div>
</div>
</div>

</div>

</body>
</html>
Loading

0 comments on commit 6612ffc

Please sign in to comment.