Kaynağa Gözat

fix(云机): 修复触控权限

zengzhixiang 2 yıl önce
ebeveyn
işleme
202a387c85
2 değiştirilmiş dosya ile 68 ekleme ve 83 silme
  1. 44 29
      static/screenAndroid/WXdraw.js
  2. 24 54
      static/screenIos/WXdraw.js

+ 44 - 29
static/screenAndroid/WXdraw.js

@@ -82,11 +82,10 @@ function doConnectDirectives() {
       return;
     }
     if (result.type === 'forwardMsg') {
-      if (isAuth !== 'none') {
-        if (
-          String(result.data.code) === '4000' ||
-          String(result.data.code) === '3000'
-        ) {
+      switch (String(result.data.code)) {
+        case '3000': {
+        }
+        case '4000': {
           if (isAuth === 'huo') {
             $.confirm(
               '授权方已收回控制权,您进入观看屏幕模式',
@@ -100,31 +99,46 @@ function doConnectDirectives() {
                 quit();
               },
             );
-          } else {
-            $.confirm(
-              '当前云手机正在授控,是否请求获取云手机控制权?',
-              function () {
-                //点击确认后的回调函数
-                var ping = {
-                  type: 'forwardMsg',
-                  data: {
-                    code: '5000',
-                    desc: '控制权限收回', // 可选
-                  },
-                };
-                wsss.send(JSON.stringify(ping));
-                isControl = true;
-              },
-              function () {
-                //点击取消后的回调函数
-                isControl = false;
-              },
-            );
+            return;
           }
+          $.confirm(
+            '当前云手机正在授控,是否请求获取云手机控制权?',
+            function () {
+              //点击确认后的回调函数
+              var ping = {
+                type: 'forwardMsg',
+                data: {
+                  code: '5000',
+                  desc: '控制权限收回', // 可选
+                },
+              };
+              wsss.send(JSON.stringify(ping));
+              isControl = true;
+            },
+            function () {
+              //点击取消后的回调函数
+              isControl = false;
+            },
+          );
+          return;
+        }
+        case '5000': {
+          console.log(result);
+          $.confirm(
+            '授权方已收回控制权,您进入观看屏幕模式',
+            function () {
+              //点击确认后的回调函数
+              isControl = false;
+            },
+            function () {
+              isControl = false;
+              //点击取消后的回调函数
+              quit();
+            },
+          );
           return;
         }
-        if (result.data.code === 'phoneSizeChange') {
-          console.log(result.data);
+        case 'phoneSizeChange': {
           window.currentPhoneSize = {
             id: result.data.id,
             width: result.data.width,
@@ -133,9 +147,10 @@ function doConnectDirectives() {
           };
           return;
         }
-        return;
+        default: {
+          return;
+        }
       }
-      return;
     }
     if (result.type === 'payInitiateEvent') {
       var url = window.location.href;

+ 24 - 54
static/screenIos/WXdraw.js

@@ -135,65 +135,35 @@ function doConnectDirectives() {
           );
           return;
         }
-        default: {
+        case '5000': {
+          console.log(result);
+          $.confirm(
+            '授权方已收回控制权,您进入观看屏幕模式',
+            function () {
+              //点击确认后的回调函数
+              isControl = false;
+            },
+            function () {
+              isControl = false;
+              //点击取消后的回调函数
+              quit();
+            },
+          );
           return;
         }
-      }
-
-      if (isAuth !== 'none') {
-        if (
-          String(result.data.code) === '4000' ||
-          String(result.data.code) === '3000'
-        ) {
-          if (isAuth === 'huo') {
-            $.confirm(
-              '授权方已收回控制权,您进入观看屏幕模式',
-              function () {
-                //点击确认后的回调函数
-                isControl = false;
-              },
-              function () {
-                isControl = false;
-                //点击取消后的回调函数
-                quit();
-              },
-            );
-          } else {
-            $.confirm(
-              '当前云手机正在授控,是否请求获取云手机控制权?',
-              function () {
-                //点击确认后的回调函数
-                var ping = {
-                  type: 'forwardMsg',
-                  data: {
-                    code: '5000',
-                    desc: '控制权限收回', // 可选
-                  },
-                };
-                wsss.send(JSON.stringify(ping));
-                isControl = true;
-              },
-              function () {
-                //点击取消后的回调函数
-                isControl = false;
-              },
-            );
-          }
+        case 'phoneSizeChange': {
+          window.currentPhoneSize = {
+            id: result.data.id,
+            width: result.data.width,
+            height: result.data.height,
+            pid: result.data.pid,
+          };
+          return;
+        }
+        default: {
           return;
         }
-        return;
-      }
-      if (result.data.code === 'phoneSizeChange') {
-        // console.log(result.data);
-        window.currentPhoneSize = {
-          id: result.data.id,
-          width: result.data.width,
-          height: result.data.height,
-          pid: result.data.pid,
-        };
-        return;
       }
-      return;
     }
     if (result.type === 'payInitiateEvent') {
       var url = window.location.href;