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

screenAndroid/WXdraw.js

@@ -23,7 +23,7 @@ var parameters = GetRequest();
 var form = {};
 
 var cardToken = parameters["cardToken"];
-cardToken = cardToken && cardToken.replace(/@/g, "=");
+cardToken = cardToken && decodeURIComponent(cardToken);
 form.cardIp = parameters["cardIp"];
 form.port = parameters["port"];
 form.username = parameters["username"];
@@ -104,7 +104,7 @@ function doConnect() {
       return
     }
     if (result.type === 'forwardMsg' && isAuth !== 'none') {
-      if (result.data.code === 4000) {
+      if (result.data.code === 4000 || result.data.code === 3000) {
         if (isAuth === 'huo') {
           $.confirm("授权方已收回控制权，您进入观看屏幕模式", function () {
             //点击确认后的回调函数

screenAndroid/WXtrialInterface.html

@@ -308,7 +308,8 @@
     var isWSS = true;
     var ip = parameters["ip"];
     var cardToken = parameters["cardToken"];
-    cardToken = cardToken && cardToken.replace(/@/g, "=");
+    cardToken = cardToken && decodeURIComponent(cardToken);
+    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;
@@ -353,7 +354,7 @@
           ws.send("ping");
         } else {
           clearInterval(intervaler);
-          $.toast("画面异常,请重新进入1", "text");
+          $.toast("画面异常,请重新进入", "text");
           if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
             tt.miniProgram.switchTab({
               url: '/pages/home/home'
@@ -378,7 +379,7 @@
         clearInterval(intervaler);
         throttle(doConnect, 100);
         if (errorTime > 1000) {
-          $.toast("画面异常,请重新进入2", "text");
+          $.toast("画面异常,请重新进入", "text");
           wsss.close();
           if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
             tt.miniProgram.switchTab({
@@ -523,7 +524,7 @@
             ws.send(checkBuffer);
           }
           else {
-            $.toast("画面异常,请重新进入3", "text");
+            $.toast("画面异常,请重新进入", "text");
             clearInterval(intervaler);
             ws.close();
             wsss.close();

screenIos/WXdraw.js

@@ -11,7 +11,7 @@ if (numse <= 70) {
 } else {
   var voheight = window.screen.height - topwinHeightDraw - 20
 }
- 
+
 //画笔大小
 var resolving = 1; // 1: 竖屏；2：横屏；
 var url = window.location.href;
@@ -21,7 +21,7 @@ var parameters = GetRequest();
 
 var form = {};
 var cardToken = parameters["cardToken"];
-cardToken = cardToken && cardToken.replace(/@/g, "=");
+cardToken = cardToken && decodeURIComponent(cardToken);
 form.cardIp = parameters['cardIp'];
 form.port = parameters['port'];
 form.sn = parameters['sn'];
@@ -86,12 +86,12 @@ function doConnect() {
         tt.miniProgram.switchTab({
           url: '/pages/home/home'
         })
-      } else if(window.__wxjs_environment === 'miniprogram') {
+      } else if (window.__wxjs_environment === 'miniprogram') {
         wx.miniProgram.switchTab({
           url: '/pages/home/home'
         })
       } else {
-        document.addEventListener('UniAppJSBridgeReady', function() {
+        document.addEventListener('UniAppJSBridgeReady', function () {
           uni.navigateTo({
             url: '/pages/index/index'
           });
@@ -110,7 +110,7 @@ function doConnect() {
       return
     }
     if (result.type === 'forwardMsg' && isAuth !== 'none') {
-      if (result.data.code === 4000) {
+      if (result.data.code === 4000 || result.data.code === 3000) {
         if (isAuth === 'huo') {
           $.confirm("授权方已收回控制权，您进入观看屏幕模式", function () {
             //点击确认后的回调函数

screenIos/websocket.js

@@ -3,7 +3,7 @@ var parameters = GetRequest();
 var ip = parameters["ip"];
 var appletPushAddress = parameters["appletPushAddress"];
 var cardToken = parameters["token"];
-cardToken = cardToken && cardToken.replace(/@/g, "=");
+cardToken = cardToken && decodeURIComponent(cardToken);
 var isWSS = true;
 var errorTime = 0;
 var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business" : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business";