Merge branch 'dev-5.3.1' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-5.3.1

static/screenAndroid/WXdraw.js

@@ -20,8 +20,6 @@ var url = window.location.href;
 url = url.split('/');
 
 var parameters = GetRequest();
-var form = {};
-
 var videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 var videoHeight = videoWidth === 720 ? 1280 : 1920
 var isControl = true; // 是否是观看模式

static/screenAndroid/WXtrialInterface.html

@@ -189,7 +189,6 @@
       src="https://cdn.bootcss.com/vConsole/3.2.0/vconsole.min.js"
     ></script>
     <script src="https://cdn.bootcss.com/jquery-weui/1.2.1/js/jquery-weui.min.js"></script>
-    <script type="text/javascript" src="WXdraw.js"></script>
     <script type="text/javascript" src="jmuxer.js"></script>
     <script type="text/javascript" src="spsParser.js"></script>
     <script
@@ -202,9 +201,9 @@
       var baseUrl = url[0] + '//' + url[2];
 
       var parameters = GetRequest();
-      var form = {};
-      form.token = parameters['token'];
-      form.userCardId = parameters['userCardId'];
+      var token = parameters['token'];
+      var userCardId = parameters['userCardId'];
+      var mealType = parameters['mealType'];
       var videoTimer = null,
         videoTime = 0,
         adType = 0,
@@ -280,7 +279,7 @@
         let request = objectStore.get(key);
 
         request.onerror = function (event) {
-          connect();
+          connect('add');
         };
 
         request.onsuccess = function (event) {
@@ -293,7 +292,7 @@
             doConnectBusiness();
             doConnectDirectives();
           } else {
-            connect();
+            connect('add');
           }
         };
       }
@@ -316,7 +315,7 @@
 
       // 由于打开indexDB是异步的加个定时器避免 db对象还没获取到值导致 报错
       setTimeout(() => {
-        getDataByKey(db, storeName, form.userCardId);
+        getDataByKey(db, storeName, userCardId);
       }, 1000);
       var isAudioPlay = false;
       if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
@@ -382,11 +381,11 @@
           url: baseUrl + '/api/resources/user/cloud/connect',
           type: 'post',
           data: JSON.stringify({
-            userCardId: Number(form.userCardId),
+            userCardId: Number(userCardId),
           }),
           headers: {
             'content-Type': 'application/json',
-            Authorization: form.token,
+            Authorization: token,
           },
           dataType: 'json',
           async: false,
@@ -411,15 +410,25 @@
                   '&type=directives';
                 cardToken = res.data.cardToken;
                 resolvingPower = res.data.resolvingPower;
-                addData(db, storeName, {
-                  id: form.userCardId,
-                  socketURL: socketURL,
-                  cUrl: cUrl,
-                  cardToken: res.data.cardToken,
-                  resolvingPower: res.data.resolvingPower,
-                });
                 doConnectBusiness();
                 doConnectDirectives();
+                if (type === 'add') {
+                  addData(db, storeName, {
+                    id: userCardId,
+                    socketURL: socketURL,
+                    cUrl: cUrl,
+                    cardToken: res.data.cardToken,
+                    resolvingPower: res.data.resolvingPower,
+                  });
+                } else {
+                  updateDB(db, storeName, {
+                    id: userCardId,
+                    socketURL: socketURL,
+                    cUrl: cUrl,
+                    cardToken: res.data.cardToken,
+                    resolvingPower: res.data.resolvingPower,
+                  });
+                }
               } else {
                 $.toast('网络异常，请稍后重试', 'text');
               }
@@ -674,7 +683,7 @@
               var checkBuffer = GetScreenState();
               ws.send(checkBuffer);
             } else {
-              connect();
+              connect('update');
             }
           }
           if (input[23] == 0x05) {
@@ -741,7 +750,7 @@
           $.ajax({
             url: baseUrl + '/api/public/v5/shear/content',
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             type: 'get',
             dataType: 'json',
@@ -804,7 +813,7 @@
           $.ajax({
             url: baseUrl + '/api/public/v5/shear/content?' + ids,
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             type: 'DELETE',
             dataType: 'json',
@@ -832,7 +841,7 @@
         $.ajax({
           url: baseUrl + '/api/public/v5/shear/content?ids=' + id,
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'DELETE',
           dataType: 'json',
@@ -1103,11 +1112,11 @@
           $.ajax({
             url: baseUrl + '/api/pay/v5/trialCodeConfig/getConfigByPhoneType',
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             data: {
-              userCardId: form.userCardId,
-              phoneType: form.mealType,
+              userCardId: userCardId,
+              phoneType: mealType,
             },
             type: 'get',
             dataType: 'json',
@@ -1128,7 +1137,7 @@
           $.ajax({
             url: baseUrl + '/api/resources/v4/freetrial/setmeal/list',
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             type: 'get',
             dataType: 'json',
@@ -1162,7 +1171,7 @@
         return $.ajax({
           url: baseUrl + '/api/public/v5/advertising/getAdInfoByAdPlace',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           data: JSON.stringify({
             adPlace: adType,
@@ -1373,10 +1382,10 @@
         $.ajax({
           url: baseUrl + '/api/resources/v1/trial/report',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           data: JSON.stringify({
-            userCardId: form.userCardId,
+            userCardId: userCardId,
             reportType: type,
           }),
           type: 'POST',
@@ -1444,7 +1453,7 @@
                 sourceType == 1
                   ? '试用弹窗购买按钮进入-普通试用'
                   : '试用弹窗购买按钮进入-激活码试用'
-              }&record=` + form.userCardId,
+              }&record=` + userCardId,
           });
         }
       });
@@ -1471,7 +1480,7 @@
         $.ajax({
           url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'post',
           data: JSON.stringify({
@@ -1502,6 +1511,7 @@
         wsss.close();
       };
     </script>
+    <script type="text/javascript" src="WXdraw.js"></script>
     <script type="text/javascript" src="aac.js"></script>
   </body>
 </html>

static/screenIos/WXtrialInterface.html

@@ -164,7 +164,6 @@
       type="text/javascript"
       src="https://cdn.bootcss.com/vConsole/3.2.0/vconsole.min.js"
     ></script>
-    <script type="text/javascript" src="WXdraw.js"></script>
     <script
       type="text/javascript"
       src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"
@@ -276,18 +275,17 @@
       console.log(baseUrl);
 
       var parameters = GetRequest();
-      var form = {};
-      form.token = parameters['token'];
-      form.mealType = parameters['mealType'];
-      form.userCardId = parameters['userCardId'];
+      var token = parameters['token'];
+      var mealType = parameters['mealType'];
+      var userCardId = parameters['userCardId'];
 
-      if (parameters['mealType'] === 'VIP') {
+      if (mealType === 'VIP') {
         $('.loading_sceen_pic').attr('src', '../static/img/home_bg_VIP.png');
-      } else if (parameters['mealType'] === 'SVIP') {
+      } else if (mealType === 'SVIP') {
         $('.loading_sceen_pic').attr('src', '../static/img/home_bg_SVIP.png');
-      } else if (parameters['mealType'] === 'STAR') {
+      } else if (mealType === 'STAR') {
         $('.loading_sceen_pic').attr('src', '../static/img/home_bg_STAR.png');
-      } else if (parameters['mealType'] === 'STARPRO') {
+      } else if (mealType === 'STARPRO') {
         $('.loading_sceen_pic').attr('src', '../static/img/home_bg_PRO.png');
       }
       $('#wine').css({
@@ -353,7 +351,7 @@
         let request = objectStore.get(key);
 
         request.onerror = function (event) {
-          connect();
+          connect('add');
         };
 
         request.onsuccess = function (event) {
@@ -366,7 +364,7 @@
             doConnectBusiness();
             doConnectDirectives();
           } else {
-            connect();
+            connect('add');
           }
         };
       }
@@ -389,19 +387,19 @@
 
       // 由于打开indexDB是异步的加个定时器避免 db对象还没获取到值导致 报错
       setTimeout(() => {
-        getDataByKey(db, storeName, form.userCardId);
+        getDataByKey(db, storeName, userCardId);
       }, 1000);
 
-      function connect() {
+      function connect(type) {
         $.ajax({
           url: baseUrl + '/api/resources/user/cloud/connect',
           type: 'post',
           data: JSON.stringify({
-            userCardId: Number(form.userCardId),
+            userCardId: Number(userCardId),
           }),
           headers: {
             'content-Type': 'application/json',
-            Authorization: form.token,
+            Authorization: token,
           },
           dataType: 'json',
           async: false,
@@ -426,15 +424,25 @@
                   '&type=directives';
                 cardToken = res.data.cardToken;
                 resolvingPower = res.data.resolvingPower;
-                addData(db, storeName, {
-                  id: form.userCardId,
-                  socketURL: socketURL,
-                  cUrl: cUrl,
-                  cardToken: res.data.cardToken,
-                  resolvingPower: res.data.resolvingPower,
-                });
                 doConnectBusiness();
                 doConnectDirectives();
+                if (type === 'add') {
+                  addData(db, storeName, {
+                    id: userCardId,
+                    socketURL: socketURL,
+                    cUrl: cUrl,
+                    cardToken: res.data.cardToken,
+                    resolvingPower: res.data.resolvingPower,
+                  });
+                } else {
+                  updateDB(db, storeName, {
+                    id: userCardId,
+                    socketURL: socketURL,
+                    cUrl: cUrl,
+                    cardToken: res.data.cardToken,
+                    resolvingPower: res.data.resolvingPower,
+                  });
+                }
               } else {
                 $.toast('网络异常，请稍后重试', 'text');
               }
@@ -483,7 +491,7 @@
           $.ajax({
             url: baseUrl + '/api/public/v5/shear/content',
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             type: 'get',
             dataType: 'json',
@@ -546,7 +554,7 @@
           $.ajax({
             url: baseUrl + '/api/public/v5/shear/content?' + ids,
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             type: 'DELETE',
             dataType: 'json',
@@ -574,7 +582,7 @@
         $.ajax({
           url: baseUrl + '/api/public/v5/shear/content?ids=' + id,
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'DELETE',
           dataType: 'json',
@@ -948,7 +956,7 @@
                 var checkBuffer = GetScreenState();
                 webSocketWorker.postMessage(checkBuffer);
               } else {
-                connect();
+                connect('update');
               }
             }
             if (input[23] == 0x05) {
@@ -981,16 +989,15 @@
 
       // 激活码广告相关配置
       function getConfigByPhoneType() {
-        console.log('form', form);
         return new Promise((resolve, reject) => {
           $.ajax({
             url: baseUrl + '/api/pay/v5/trialCodeConfig/getConfigByPhoneType',
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             data: {
-              userCardId: form.userCardId,
-              phoneType: form.mealType,
+              userCardId: userCardId,
+              phoneType: mealType,
             },
             type: 'get',
             dataType: 'json',
@@ -1012,7 +1019,7 @@
           $.ajax({
             url: baseUrl + '/api/resources/v4/freetrial/setmeal/list',
             headers: {
-              Authorization: form.token,
+              Authorization: token,
             },
             type: 'get',
             dataType: 'json',
@@ -1020,7 +1027,7 @@
               if (res.status === 0) {
                 let list = res.data;
                 list.map((item) => {
-                  if (item.phoneType === parameters['mealType']) {
+                  if (item.phoneType === mealType) {
                     resolve(item);
                   }
                 });
@@ -1045,7 +1052,7 @@
         return $.ajax({
           url: baseUrl + '/api/public/v5/advertising/getAdInfoByAdPlace',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           data: JSON.stringify({
             adPlace: adType,
@@ -1176,10 +1183,10 @@
         $.ajax({
           url: baseUrl + '/api/resources/v1/trial/report',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           data: JSON.stringify({
-            userCardId: form.userCardId,
+            userCardId: userCardId,
             reportType: type,
           }),
           type: 'POST',
@@ -1253,7 +1260,7 @@
                   sourceType == 1
                     ? '试用弹窗购买按钮进入-普通试用'
                     : '试用弹窗购买按钮进入-激活码试用'
-                }&record=` + form.userCardId,
+                }&record=` + userCardId,
             });
           } else {
             uni.webView.navigateTo({
@@ -1269,6 +1276,7 @@
         webSocketWorker.terminate();
       };
     </script>
+    <script type="text/javascript" src="WXdraw.js"></script>
     <script type="text/javascript" src="aac.js"></script>
   </body>
 </html>