Merge branch 'develop' of Software/android-cloud-H5 into master

static/screenIos/WXtrialInterface.html

@@ -362,7 +362,7 @@
     if ([1,2,3].includes(userCardType)) {
       $('#dormant').css({ display: 'block' })
     }
-
+    
     /*
     if (mealType === 'VIP') {
       $('.loading_sceen_pic').attr('src', '../static/img/home_bg_VIP.png');
@@ -455,7 +455,6 @@
             height: request.result.height,
             dpi: request.result.dpi,
           };
-
           doConnectBusiness();
           doConnectDirectives();
         } else {
@@ -516,6 +515,9 @@
         success: function (res) {
           if (res.status === 0) {
             //getResidueTime()
+            if(connectStatus==1) {
+              getResidueTime();
+            }
             if (timerInterval) {
               timerInterval = clearTimeout();
             }
@@ -1199,9 +1201,6 @@
       },5000)
       */
       webSocketWorker.onmessage = function (event) {
-        if(connectStatus==1) {
-          getResidueTime();
-        }
         var input = event.data;
         if (input[0] == 0xff && isAudioPlay) {
           decodeAAC(input);

static/webRtcYJ/WXtrialInterface.html

@@ -654,6 +654,9 @@
           success: function (res) {
             if (res.status === 0) {
               //getResidueTime()
+              if(connectStatus==1) {
+                getResidueTime();
+              }
               if (timerInterval) {
                 timerInterval = clearTimeout();
               }
@@ -1384,9 +1387,6 @@
         );
         window.webSocketWorker = webSocketWorker;
         webSocketWorker.onmessage = function (event) {
-          if (connectStatus == 1) {
-            getResidueTime();
-          }
           var input = event.data;
           if (input[0] == 0xff && isAudioPlay && !isVideo) {
             decodeAAC(input);