Merge branch 'dev-5.2' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-5.2

screenAndroid/WXdraw.js

@@ -24,10 +24,6 @@ var form = {};
 
 var cardToken = parameters["cardToken"];
 cardToken = cardToken && decodeURIComponent(cardToken);
-form.cardIp = parameters["cardIp"];
-form.port = parameters["port"];
-form.username = parameters["username"];
-form.userCardId = parameters["userCardId"];
 form.ip = parameters["ip"];
 form.domainName = parameters["domainName"];
 var isWSS = true;
@@ -58,16 +54,6 @@ function doConnect() {
   wsss.binaryType = 'arraybuffer';
 
   wsss.onopen = function () {
-    // 获取虚拟场景状态
-    var pings = { "type": "getVsStatus" }
-    wsss.send(JSON.stringify(pings));
-    var bitRate = {
-      "data": {
-        "bitRate": 1243000
-      },
-      "type": "bitRate"
-    }
-    wsss.send(JSON.stringify(bitRate));
     // 进入发起询问
     var pings2 = {
       "type": "forwardMsg",

screenAndroid/WXtrialInterface.html

@@ -312,7 +312,7 @@
     console.log(decodeURIComponent(cardToken));
     var appletPushAddress = parameters["appletPushAddress"];
     // "&type=business"
-    var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
+    var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business" : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
 
     var jmuxer = new JMuxer({
       node: 'playerVideo',

screenIos/WXdraw.js

@@ -22,17 +22,12 @@ var parameters = GetRequest();
 var form = {};
 var cardToken = parameters["cardToken"];
 cardToken = cardToken && decodeURIComponent(cardToken);
-form.cardIp = parameters['cardIp'];
-form.port = parameters['port'];
-form.sn = parameters['sn'];
-form.username = parameters['username'];
-form.userCardId = parameters['userCardId'];
 form.ip = parameters['ip'];
 form.domainName = parameters["domainName"];
 var isWSS = true;
 var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives" : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives";
-var videoWidth = parameters['resolvingPower'] ? parameters['resolvingPower'] : 720
-var videoHeight = parameters['resolvingPower'] === 720 ? 1280 : 1920
+var videoWidth = Number(parameters['resolvingPower']) ? Number(parameters['resolvingPower']) : 720
+var videoHeight = videoWidth === 720 ? 1280 : 1920
 var isControl = true; // 是否是观看模式
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 var wsss;