Quellcode durchsuchen

fix:取缓存数据时校验cardToken

lihao vor 1 Jahr
Ursprung
Commit
36dac58fdc
1 geänderte Dateien mit 39 neuen und 4 gelöschten Zeilen
  1. 39 4
      static/screenIos/WXtrialInterface.html

+ 39 - 4
static/screenIos/WXtrialInterface.html

@@ -260,7 +260,7 @@
       var canSlide = true;
       //用于记录按下的点
       var startPoint;
-      var vConsole = new VConsole();
+      //var vConsole = new VConsole();
       $('.slide-content').css({
         width: $('.slide-wrapper').width(),
       });
@@ -388,7 +388,8 @@
     var isAudioPlay = false;
     let dbName = parameters['username'],
       version = 1,
-      storeName = 'usercard';
+      storeName = 'usercard',
+      paramCardToken = decodeURIComponent(parameters['cardToken']);
     let indexedDB = window.indexedDB;
     let db;
     var socketURL;
@@ -442,7 +443,8 @@
 
       request.onsuccess = function (event) {
         console.log('主键查询结果: ', request.result);
-        if (request.result) {
+        if (request.result && paramCardToken == request.result.cardToken) {
+          console.log(paramCardToken,request.result.cardToken,'xxx')
           socketURL = request.result.socketURL;
           cUrl = request.result.cUrl;
           cardToken = request.result.cardToken;
@@ -1155,14 +1157,47 @@
       }
       return obj;
     }
+    var webSocketWorker;
+    /*
+    var webSocketWorker;
+    var intervalId;
+    let num = 0;
+    //心跳
+    function sendHeartbeat() {
+      // console.log(intervalId, 'intervalId')  webSocketWorker.readyState === WebSocket.OPEN &&
+      if (wsss.readyState === WebSocket.OPEN) {
+        console.log('connection is ok');
+        num = 0;
+        //webSocketWorker.send('ping');
+        wsss.send('ping')
+      } else {
+        //clearInterval(intervalId)
+        console.error('connection is not open '+num);
+        if(num == 20) {
+          console.log('num == 20')
+          return;
+        }
+        num++
+        connect("add")
+      }
+    }
+    */
     function doConnectBusiness() {
-      var webSocketWorker = new Worker(
+      webSocketWorker = new Worker(
         'websocket.js?socketURL=' +
         encodeURIComponent(socketURL) +
         '&cardToken=' +
         encodeURIComponent(cardToken),
       );
       window.webSocketWorker = webSocketWorker;
+      /*
+      if(intervalId){
+        clearInterval(intervalId)
+      }
+      intervalId = setInterval(()=> {
+        sendHeartbeat()
+      },5000)
+      */
       webSocketWorker.onmessage = function (event) {
         if(connectStatus==1) {
           getResidueTime();