Merge branch 'feature/云机控制权/优化收回控制权' of Software/android-cloud-H5 into develop

static/screenAndroid/WXdraw.js

@@ -190,7 +190,7 @@ function doConnectDirectives() {
           return;
         }
         case '5000': {
-          if (isControl) {
+          if (isControl && isAuth === 'huo') {
             $.confirm(
               '授权方已收回控制权，您进入观看屏幕模式',
               function () {
@@ -257,7 +257,7 @@ function doConnectDirectives() {
         dpi: result.data.dpi,
       };
 
-      if( result.type === 'setPhoneSize'){
+      if (result.type === 'setPhoneSize') {
         lastSetPhone = Date.now();
       }
       return;

static/screenIos/WXdraw.js

@@ -199,7 +199,11 @@ function doConnectDirectives() {
           return;
         }
         case '5000': {
-          if (isControl) {
+          // if (result.data.username === username) {
+          //   changIsControl(true);
+          //   return;
+          // }
+          if (isControl && isAuth === 'huo') {
             $.confirm(
               '授权方已收回控制权，您进入观看屏幕模式',
               function () {
@@ -214,6 +218,7 @@ function doConnectDirectives() {
             );
             return;
           }
+
           return;
         }
         default: {
@@ -266,7 +271,7 @@ function doConnectDirectives() {
         dpi: result.data.dpi,
       };
 
-      if( result.type === 'setPhoneSize'){
+      if (result.type === 'setPhoneSize') {
         lastSetPhone = Date.now();
       }
       return;