Merge branch 'hotfix/修复云机页面滑动' of Software/android-cloud-H5 into develop

static/screenAndroid/WXdraw.js

@@ -83,7 +83,10 @@ function doConnectDirectives() {
     }
     if (result.type === 'forwardMsg') {
       if (isAuth !== 'none') {
-        if (result.data.code === 4000 || result.data.code === 3000) {
+        if (
+          String(result.data.code) === '4000' ||
+          String(result.data.code) === '3000'
+        ) {
           if (isAuth === 'huo') {
             $.confirm(
               '授权方已收回控制权，您进入观看屏幕模式',
@@ -123,7 +126,7 @@ function doConnectDirectives() {
         if (result.data.code === 'phoneSizeChange') {
           console.log(result.data);
           window.currentPhoneSize = {
-          id: result.data.id,
+            id: result.data.id,
             width: result.data.width,
             height: result.data.height,
             pid: result.data.pid,
@@ -313,6 +316,7 @@ var draw_graph = function (graphType, obj) {
 
   // 鼠标移动
   var touchmove = function (e) {
+    e.preventDefault();
     if (!isControl) {
       return;
     }
@@ -354,11 +358,11 @@ var draw_graph = function (graphType, obj) {
     }
   };
 
-  $(canvas_bak).unbind();
-  $(canvas_bak).bind('touchstart', touchstart);
-  $(canvas_bak).bind('touchmove', touchmove);
-  $(canvas_bak).bind('touchend', touchend);
-  $(canvas_bak).bind('mouseout', mouseout);
+  $(canvas_bak).off();
+  $(canvas_bak).on('touchstart', touchstart);
+  $(canvas_bak).on('touchmove', touchmove);
+  $(canvas_bak).on('touchend', touchend);
+  $(canvas_bak).on('mouseout', mouseout);
 };
 
 // 获取url中"?"符后的字串

static/screenIos/WXdraw.js

@@ -95,8 +95,56 @@ function doConnectDirectives() {
       return;
     }
     if (result.type === 'forwardMsg') {
+      switch (String(result.data.code)) {
+        case '3000': {
+        }
+        case '4000': {
+          if (isAuth === 'huo') {
+            $.confirm(
+              '授权方已收回控制权，您进入观看屏幕模式',
+              function () {
+                //点击确认后的回调函数
+                isControl = false;
+              },
+              function () {
+                isControl = false;
+                //点击取消后的回调函数
+                quit();
+              },
+            );
+            return;
+          }
+          $.confirm(
+            '当前云手机正在授控，是否请求获取云手机控制权？',
+            function () {
+              //点击确认后的回调函数
+              var ping = {
+                type: 'forwardMsg',
+                data: {
+                  code: '5000',
+                  desc: '控制权限收回', // 可选
+                },
+              };
+              wsss.send(JSON.stringify(ping));
+              isControl = true;
+            },
+            function () {
+              //点击取消后的回调函数
+              isControl = false;
+            },
+          );
+          return;
+        }
+        default: {
+          return;
+        }
+      }
+
       if (isAuth !== 'none') {
-        if (result.data.code === 4000 || result.data.code === 3000) {
+        if (
+          String(result.data.code) === '4000' ||
+          String(result.data.code) === '3000'
+        ) {
           if (isAuth === 'huo') {
             $.confirm(
               '授权方已收回控制权，您进入观看屏幕模式',
@@ -381,6 +429,7 @@ var draw_graph = function (graphType) {
 
   // 鼠标移动
   var touchmove = function (e) {
+    e.preventDefault();
     if (!isControl) {
       return;
     }
@@ -465,11 +514,11 @@ var draw_graph = function (graphType) {
       clearContext();
     }
   };
-  $(canvas_bak).unbind();
-  $(canvas_bak).bind('touchstart', touchstart);
-  $(canvas_bak).bind('touchmove', touchmove);
-  $(canvas_bak).bind('touchend', touchend);
-  $(canvas_bak).bind('mouseout', mouseout);
+  $(canvas_bak).off();
+  $(canvas_bak).on('touchstart', touchstart);
+  $(canvas_bak).on('touchmove', touchmove);
+  $(canvas_bak).on('touchend', touchend);
+  $(canvas_bak).on('mouseout', mouseout);
 };
 
 function GetRequest() {