Home Explore Help
Register Sign In
tangdehang
/
android-cloud-H5
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into develop

zengzhixiang 2 years ago
parent
90432ab725 f1d70438bf
commit
790318d645
5 changed files with 23 additions and 19 deletions
Unified View Show Diff Stats
  1. 9 4
      pages/activity/invite-user/register.vue
  2. 3 2
      static/screenAndroid/WXdraw.js
  3. 5 5
      static/screenAndroid/WXtrialInterface.html
  4. 3 2
      static/screenIos/WXdraw.js
  5. 3 6
      static/screenIos/WXtrialInterface.html

+ 9 - 4
pages/activity/invite-user/register.vue
View File 

@@ -62,8 +62,7 @@
 
                 </template>
 
                 </template>
 
               </v-text-field>
 
               </v-text-field>
 
             </validation-provider>
 
             </validation-provider>
 
-
 
-            <div class="">
 
+            <div class="submit-btn-box">
 
               <v-btn
 
               <v-btn
 
                 type="submit"
 
                 type="submit"
 
                 :loading="submitting"
 
                 :loading="submitting"
 
@@ -198,14 +197,20 @@ export default {
 
 .box1 {
 
 .box1 {
 
   margin-top: 275px;
 
   margin-top: 275px;
 
 }
 
 }
 
+.submit-btn-box {
 
+  // 解决百度APP广告屏蔽导致按钮被隐藏
 
+  display: flex !important;
 
+  margin-top: 24px;
 
+  // align-items: center;
 
+  justify-content: center;
 
+}
 
 .submit-btn {
 
 .submit-btn {
 
   display: block;
 
   display: block;
 
-  margin: auto;
 
+  // margin: auto;
 
   width: 302px !important;
 
   width: 302px !important;
 
   height: 62px !important;
 
   height: 62px !important;
 
   background-image: url('~/assets/image/activity/invite-user/share-button@2x.png');
 
   background-image: url('~/assets/image/activity/invite-user/share-button@2x.png');
 
   background-size: 100% 100%;
 
   background-size: 100% 100%;
 
-  margin-top: 24px;
 
   color: #dd1b0d !important;
 
   color: #dd1b0d !important;
 
   font-size: 22px !important;
 
   font-size: 22px !important;
 
   font-weight: bold !important;
 
   font-weight: bold !important;

+ 3 - 2
static/screenAndroid/WXdraw.js
View File 

@@ -20,8 +20,7 @@ var url = window.location.href;
 
 url = url.split('/');
 
 url = url.split('/');
 
 
 
 var parameters = GetRequest();
 
 var parameters = GetRequest();
 
-var videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 
-var videoHeight = videoWidth === 720 ? 1280 : 1920
 
+var videoWidth, videoHeight;
 
 var isControl = true; // 是否是观看模式
 
 var isControl = true; // 是否是观看模式
 
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 
 
 
@@ -41,6 +40,8 @@ function throttle(fn, delay) {
 
 }
 
 }
 
 
 
 function doConnectDirectives() {
 
 function doConnectDirectives() {
 
+  videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 
+  videoHeight = videoWidth === 720 ? 1280 : 1920
 
   wsss = new WebSocket(cUrl);
 
   wsss = new WebSocket(cUrl);
 
   wsss.binaryType = 'arraybuffer';
 
   wsss.binaryType = 'arraybuffer';

+ 5 - 5
static/screenAndroid/WXtrialInterface.html
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta charset="utf-8" />
 
     <meta charset="utf-8" />
 
-    <title></title>
 
+    <title>双子星云手机</title>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <meta name="x5-orientation" content="portrait" />
 
     <meta name="x5-orientation" content="portrait" />
 
     <meta name="screen-orientation" content="portrait" />
 
     <meta name="screen-orientation" content="portrait" />
 
@@ -591,8 +591,8 @@
 
             if (document[hidden]) {
 
             if (document[hidden]) {
 
               ws.close();
 
               ws.close();
 
               wsss.close();
 
               wsss.close();
 
-              uni.webView.navigateTo({
 
-                url: '/pages/index/index',
 
+              uni.webView.navigateBack({
 
+                delta: 1
 
               });
 
               });
 
             }
 
             }
 
           }
 
           }
 
@@ -1517,8 +1517,8 @@
 
             url: '/pages/home/home',
 
             url: '/pages/home/home',
 
           });
 
           });
 
         } else {
 
         } else {
 
-          uni.webView.navigateTo({
 
-            url: '/pages/index/index',
 
+          uni.webView.navigateBack({
 
+	          delta: 1
 
           });
 
           });
 
         }
 
         }
 
       }
 
       }

+ 3 - 2
static/screenIos/WXdraw.js
View File 

@@ -19,8 +19,7 @@ url = url.split('/');
 
 
 
 var parameters = GetRequest();
 
 var parameters = GetRequest();
 
 
 
-var videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 
-var videoHeight = videoWidth === 720 ? 1280 : 1920
 
+var videoWidth, videoHeight;
 
 var isControl = true; // 是否是观看模式
 
 var isControl = true; // 是否是观看模式
 
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 
 var wsss;
 
 var wsss;
 
@@ -41,6 +40,8 @@ function throttle(fn, delay) {
 
 }
 
 }
 
 
 
 function doConnectDirectives() {
 
 function doConnectDirectives() {
 
+  videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 
+  videoHeight = videoWidth === 720 ? 1280 : 1920
 
   wsss = new WebSocket(cUrl);
 
   wsss = new WebSocket(cUrl);
 
   wsss.binaryType = 'arraybuffer';
 
   wsss.binaryType = 'arraybuffer';

+ 3 - 6
static/screenIos/WXtrialInterface.html
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta charset="utf-8" />
 
     <meta charset="utf-8" />
 
-    <title></title>
 
+    <title>双子星云手机</title>
 
     <meta name="x5-orientation" content="portrait" />
 
     <meta name="x5-orientation" content="portrait" />
 
     <meta name="screen-orientation" content="portrait" />
 
     <meta name="screen-orientation" content="portrait" />
 
     <meta name="apple-mobile-web-app-capable" content="yes" />
 
     <meta name="apple-mobile-web-app-capable" content="yes" />
 
@@ -827,7 +827,6 @@
 
       $('#upload').on('click', function () {
 
       $('#upload').on('click', function () {
 
         decodeWoker.postMessage('close');
 
         decodeWoker.postMessage('close');
 
         decodeWoker.terminate();
 
         decodeWoker.terminate();
 
-        webSocketWorker.terminate();
 
         quit();
 
         quit();
 
       });
 
       });
 
 
 
@@ -978,7 +977,6 @@
 
             $.toast('画面异常,请重新进入', 'text');
 
             $.toast('画面异常,请重新进入', 'text');
 
             decodeWoker.postMessage('close');
 
             decodeWoker.postMessage('close');
 
             decodeWoker.terminate();
 
             decodeWoker.terminate();
 
-            webSocketWorker.terminate();
 
             quit();
 
             quit();
 
           }
 
           }
 
         };
 
         };
 
@@ -1285,7 +1283,6 @@
 
         wsss.close();
 
         wsss.close();
 
         decodeWoker.postMessage('close');
 
         decodeWoker.postMessage('close');
 
         decodeWoker.terminate();
 
         decodeWoker.terminate();
 
-        webSocketWorker.terminate();
 
       };
 
       };
 
       function quit() {
 
       function quit() {
 
         if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
 
         if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
 
@@ -1297,8 +1294,8 @@
 
             url: '/pages/home/home',
 
             url: '/pages/home/home',
 
           });
 
           });
 
         } else {
 
         } else {
 
-          uni.webView.navigateTo({
 
-            url: '/pages/index/index',
 
+          uni.webView.navigateBack({
 
+	          delta: 1
 
           });
 
           });
 
         }
 
         }
 
       }
 
       }