h5点对点

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

@@ -146,7 +146,6 @@
     <script type="text/javascript" src="pcm-player.js"></script>
     <script type="text/javascript" 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 type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
@@ -156,9 +155,9 @@
     var baseUrl = url[0] + '//' + url[2];
 
     var parameters = GetRequest();
-    var form = {};
-    form.token = parameters['token'];
-    form.userCardId = parameters['userCardId'];
+    var mealType = parameters['mealType'];
+    var token = parameters['token'];
+    var userCardId = parameters['userCardId'];
     var videoTimer = null,
       videoTime = 0,
       adType = 0,
@@ -176,13 +175,13 @@
       baseUrl = 'http://gntest.phone.androidscloud.com:1280';
       sourceType = 2;
     }
-    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');
     }
     initAD();
@@ -231,7 +230,7 @@
       let request = objectStore.get(key)
 
       request.onerror = function (event) {
-        connect();
+        connect('add');
       }
 
       request.onsuccess = function (event) {
@@ -244,7 +243,7 @@
           doConnectBusiness();
           doConnectDirectives();
         } else {
-          connect();
+          connect('add');
         }
       }
     }
@@ -266,7 +265,8 @@
 
     // 由于打开indexDB是异步的加个定时器避免 db对象还没获取到值导致 报错
     setTimeout(() => {
-      getDataByKey(db, storeName, form.userCardId)
+      console.log(userCardId)
+      getDataByKey(db, storeName, userCardId)
     }, 1000)
     var isAudioPlay = false;
     if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
@@ -327,16 +327,16 @@
     Module.onRuntimeInitialized = function () {
       isFinish = true;
     };
-    function connect() {
+    function connect(type) {
       $.ajax({
         url: baseUrl + "/api/resources/user/cloud/connect",
         type: 'post',
         data: JSON.stringify({
-          "userCardId": Number(form.userCardId)
+          "userCardId": +userCardId
         }),
         headers: {
           'content-Type': 'application/json',
-          'Authorization': form.token
+          'Authorization': token
         },
         dataType: 'json',
         async: false,
@@ -347,9 +347,13 @@
               cUrl = "wss://" + res.data.internetHttps + "/businessChannel?cardIp=" + res.data.localIp + "&token=" + res.data.cardToken + "&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');
             }
@@ -599,7 +603,7 @@
             var checkBuffer = GetScreenState();
             ws.send(checkBuffer);
           } else {
-            connect();
+            connect('update');
           }
         }
         if (input[23] == 0x05) {
@@ -666,7 +670,7 @@
         $.ajax({
           url: baseUrl + '/api/public/v5/shear/content',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'get',
           dataType: 'json',
@@ -729,7 +733,7 @@
         $.ajax({
           url: baseUrl + '/api/public/v5/shear/content?' + ids,
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'DELETE',
           dataType: 'json',
@@ -757,7 +761,7 @@
       $.ajax({
         url: baseUrl + '/api/public/v5/shear/content?ids=' + id,
         headers: {
-          Authorization: form.token,
+          Authorization: token,
         },
         type: 'DELETE',
         dataType: 'json',
@@ -1028,11 +1032,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',
@@ -1053,7 +1057,7 @@
         $.ajax({
           url: baseUrl + '/api/resources/v4/freetrial/setmeal/list',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'get',
           dataType: 'json',
@@ -1061,7 +1065,7 @@
             if (res.status === 0) {
               let list = res.data;
               list.map((item) => {
-                if (item.phoneType === parameters['mealType']) {
+                if (item.phoneType === mealType) {
                   resolve(item);
                 }
               });
@@ -1087,7 +1091,7 @@
       return $.ajax({
         url: baseUrl + '/api/public/v5/advertising/getAdInfoByAdPlace',
         headers: {
-          Authorization: form.token,
+          Authorization: token,
         },
         data: JSON.stringify({
           adPlace: adType,
@@ -1298,10 +1302,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',
@@ -1364,7 +1368,7 @@
       } else {
         // 过期续费按钮进入
         wx.miniProgram.navigateTo({
-          url: `/packageA/order/renew/index?buyType=${sourceType == 1 ? '试用弹窗购买按钮进入-普通试用' : '试用弹窗购买按钮进入-激活码试用'}&record=` + form.userCardId,
+          url: `/packageA/order/renew/index?buyType=${sourceType == 1 ? '试用弹窗购买按钮进入-普通试用' : '试用弹窗购买按钮进入-激活码试用'}&record=` + userCardId,
         });
       }
     });
@@ -1391,7 +1395,7 @@
       $.ajax({
         url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
         headers: {
-          Authorization: form.token,
+          Authorization: token,
         },
         type: 'post',
         data: JSON.stringify({
@@ -1423,6 +1427,7 @@
     };
     </script>
     <script type="text/javascript" src="aac.js"></script>
+    <script type="text/javascript" src="WXdraw.js"></script>
   </body>
 
   </html>

static/screenIos/WXtrialInterface.html

@@ -137,7 +137,6 @@
   <script type="text/javascript" src="pcm-player.js"></script>
   <script type="text/javascript" src="webgl.js"></script>
   <script 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"></script>
   <script type="text/javascript">
     $(function () {
@@ -246,18 +245,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({
@@ -320,7 +318,7 @@
       let request = objectStore.get(key)
 
       request.onerror = function (event) {
-        connect();
+        connect('add');
       }
 
       request.onsuccess = function (event) {
@@ -333,7 +331,7 @@
           doConnectBusiness();
           doConnectDirectives();
         } else {
-          connect();
+          connect('add');
         }
       }
     }
@@ -355,7 +353,7 @@
 
     // 由于打开indexDB是异步的加个定时器避免 db对象还没获取到值导致 报错
     setTimeout(() => {
-      getDataByKey(db, storeName, form.userCardId)
+      getDataByKey(db, storeName, userCardId)
     }, 1000);
 
     function connect() {
@@ -363,11 +361,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,
@@ -378,9 +376,13 @@
               cUrl = "wss://" + res.data.internetHttps + "/businessChannel?cardIp=" + res.data.localIp + "&token=" + res.data.cardToken + "&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');
             }
@@ -429,7 +431,7 @@
         $.ajax({
           url: baseUrl + '/api/public/v5/shear/content',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'get',
           dataType: 'json',
@@ -492,7 +494,7 @@
         $.ajax({
           url: baseUrl + '/api/public/v5/shear/content?' + ids,
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'DELETE',
           dataType: 'json',
@@ -520,7 +522,7 @@
       $.ajax({
         url: baseUrl + '/api/public/v5/shear/content?ids=' + id,
         headers: {
-          Authorization: form.token,
+          Authorization: token,
         },
         type: 'DELETE',
         dataType: 'json',
@@ -883,7 +885,7 @@
               var checkBuffer = GetScreenState();
               webSocketWorker.postMessage(checkBuffer);
             } else {
-              connect();
+              connect('update');
             }
           }
           if (input[23] == 0x05) {
@@ -916,16 +918,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',
@@ -947,7 +948,7 @@
         $.ajax({
           url: baseUrl + '/api/resources/v4/freetrial/setmeal/list',
           headers: {
-            Authorization: form.token,
+            Authorization: token,
           },
           type: 'get',
           dataType: 'json',
@@ -955,7 +956,7 @@
             if (res.status === 0) {
               let list = res.data;
               list.map((item) => {
-                if (item.phoneType === parameters['mealType']) {
+                if (item.phoneType === mealType) {
                   resolve(item);
                 }
               });
@@ -980,7 +981,7 @@
       return $.ajax({
         url: baseUrl + '/api/public/v5/advertising/getAdInfoByAdPlace',
         headers: {
-          Authorization: form.token,
+          Authorization: token,
         },
         data: JSON.stringify({
           adPlace: adType,
@@ -1111,10 +1112,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',
@@ -1183,7 +1184,7 @@
       } else {
         if (window.__wxjs_environment === 'miniprogram') {
           wx.miniProgram.navigateTo({
-            url: `/packageA/order/renew/index?buyType=${sourceType == 1 ? '试用弹窗购买按钮进入-普通试用' : '试用弹窗购买按钮进入-激活码试用'}&record=` + form.userCardId
+            url: `/packageA/order/renew/index?buyType=${sourceType == 1 ? '试用弹窗购买按钮进入-普通试用' : '试用弹窗购买按钮进入-激活码试用'}&record=` + userCardId
           });
         } else {
           uni.webView.navigateTo({
@@ -1216,7 +1217,7 @@
       $.ajax({
         url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
         headers: {
-          Authorization: form.token,
+          Authorization: token,
         },
         type: 'post',
         data: JSON.stringify({
@@ -1312,6 +1313,7 @@
       webSocketWorker.terminate();
     };
   </script>
+  <script type="text/javascript" src="WXdraw.js"></script>
   <script type="text/javascript" src="aac.js"></script>
 </body>