Merge branch 'hotfix/修复云机横屏触控偏移' of Software/android-cloud-H5 into develop

static/screenAndroid/WXdraw.js

@@ -197,14 +197,14 @@ function doConnectDirectives() {
       // console.log(result);
       const data = window.phoneSizeList.find(function (v) {
         return (
-          v.width === result.data[resolving ? 'width' : 'height'] &&
-          v.height === result.data[resolving ? 'height' : 'width'] &&
+          v.width === Math.min(result.data.width, result.data.height) &&
+          v.height === Math.max(result.data.width, result.data.height) &&
           v.pid === result.data.pid
         );
       });
       window.currentPhoneSize = data || {
-        width: result.data[resolving ? 'width' : 'height'],
-        height: result.data[resolving ? 'height' : 'width'],
+        width: Math.min(result.data.width, result.data.height),
+        height: Math.max(result.data.width, result.data.height),
         pid: result.data.pid,
       };
       return;

static/screenIos/WXdraw.js

@@ -206,14 +206,14 @@ function doConnectDirectives() {
       // console.log(result);
       const data = window.phoneSizeList.find(function (v) {
         return (
-          v.width === result.data[resolving ? 'width' : 'height'] &&
-          v.height === result.data[resolving ? 'height' : 'width'] &&
+          v.width === Math.min(result.data.width, result.data.height) &&
+          v.height === Math.max(result.data.width, result.data.height) &&
           v.pid === result.data.pid
         );
       });
       window.currentPhoneSize = data || {
-        width: result.data[resolving ? 'width' : 'height'],
-        height: result.data[resolving ? 'height' : 'width'],
+        width: Math.min(result.data.width, result.data.height),
+        height: Math.max(result.data.width, result.data.height),
         pid: result.data.pid,
       };
       return;

static/screenIos/WXtrialInterface.html

@@ -1139,7 +1139,7 @@
               //       type: 'getPhoneSize',
               //     }),
               //   );
-              // }, 1000);
+              // }, 500);
             }
             if (input[23] == 0x0b) {
               console.log('多端登陆');