Merge branch 'develop' of Software/android-cloud-H5 into release/v5.4.0

static/screenAndroid/WXtrialInterface.html

@@ -818,17 +818,19 @@
             }
           }
           if (input[23] == 0x05) {
-            //横竖屏标识
-            var state = CheckScreenDirection(input.slice(24, 24 + 8));
-
-            if (state == 1) {
-              console.log('安卓卡此时竖屏');
-              //竖屏处理
-              resolving = 1;
-            } else {
-              console.log('安卓卡此时横屏');
-              //横屏处理
-              resolving = 0;
+            if (input[28] == 0x01 && input[29] == 0x01) {
+              //横竖屏标识
+              var state = CheckScreenDirection(input.slice(24, 24 + 8));
+  
+              if (state == 1) {
+                console.log('安卓卡此时竖屏');
+                //竖屏处理
+                resolving = 1;
+              } else {
+                console.log('安卓卡此时横屏');
+                //横屏处理
+                resolving = 0;
+              }
             }
             // window.phoneSizeList = window.phoneSizeListBack.map(function (
             //   item,

static/screenIos/WXtrialInterface.html

@@ -1152,18 +1152,20 @@
             }
             if (input[23] == 0x05) {
               //横竖屏标识
-              var state = CheckScreenDirection(input.slice(24, 24 + 8));
-
-              if (state == 1) {
-                console.log('安卓卡此时竖屏');
-                //竖屏处理
-                resolving = 1;
-                // $('#playCanvas').removeClass('horizontal').addClass('vertical');
-              } else {
-                console.log('安卓卡此时横屏');
-                //横屏处理
-                resolving = 0;
-                // $('#playCanvas').removeClass('vertical').addClass('horizontal');
+              if (input[28] == 0x01 && input[29] == 0x01) {
+                var state = CheckScreenDirection(input.slice(24, 24 + 8));
+  
+                if (state == 1) {
+                  console.log('安卓卡此时竖屏');
+                  //竖屏处理
+                  resolving = 1;
+                  // $('#playCanvas').removeClass('horizontal').addClass('vertical');
+                } else {
+                  console.log('安卓卡此时横屏');
+                  //横屏处理
+                  resolving = 0;
+                  // $('#playCanvas').removeClass('vertical').addClass('horizontal');
+                }
               }
               // window.phoneSizeList = window.phoneSizeListBack.map(function (
               //   item,