Просмотр исходного кода

bugfix:处理部分浏览器退出出现黑屏情况

leo 1 год назад
Родитель
Сommit
ecd5fbc260
1 измененных файлов с 36 добавлено и 89 удалено
  1. 36 89
      static/webRtcYJ/WXtrialInterface.html

+ 36 - 89
static/webRtcYJ/WXtrialInterface.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <meta charset="utf-8" />
   <title>双子星云手机</title>
@@ -33,14 +34,8 @@
   <!-- windows phone 点击无高 -->
   <meta name="msapplication-tap-highlight" content="no" />
   <link rel="stylesheet" type="text/css" href="css/WXtrialInterface.css" />
-  <link
-      rel="stylesheet"
-      href="../static/css/weui.min.css"
-    />
-  <link
-      rel="stylesheet"
-      href="../static/css/jquery-weui.min.css"
-    />
+  <link rel="stylesheet" href="../static/css/weui.min.css" />
+  <link rel="stylesheet" href="../static/css/jquery-weui.min.css" />
   <!-- <link rel="stylesheet" href="../static/lib/swiper/swiper-bundle.min.css" />
     <script src="../static/lib/swiper/swiper-bundle.js"></script> -->
   <script src="../static/lib/doT-1.1.3/doT.min.js"></script>
@@ -51,13 +46,9 @@
 <body class="scroll h-player" style="overscroll-behavior: contain">
   <template id="template-phone-size-item">
     {{~ it.list :value:index }}
-    <div
-        class="phone-size-item {{? value.width === it.active.width && value.height === it.active.height }}active{{?}}"
-      data-id="{{= value.id }}"
-        data-dpi="{{= value.dpi }}"
-        data-width="{{= value.width }}"
-      data-height="{{= value.height }}"
-      >
+    <div class="phone-size-item {{? value.width === it.active.width && value.height === it.active.height }}active{{?}}"
+      data-id="{{= value.id }}" data-dpi="{{= value.dpi }}" data-width="{{= value.width }}"
+      data-height="{{= value.height }}">
       <span>{{= value.width }}x{{= value.height }}</span>
     </div>
     {{~}}
@@ -72,10 +63,7 @@
       {{~ it :item:index }}
       <div class="slide-wrapper" data-id="{{= item.id}}">
         <div class="slide-scroll animate-slide-start">
-          <div
-              class="slide-content"
-              data-content="{{= encodeHtml(item.content)}}"
-            >
+          <div class="slide-content" data-content="{{= encodeHtml(item.content)}}">
             <div>{{= encodeHtml(item.content)}}</div>
           </div>
           <div class="slide-content-button" data-id="{{= item.id}}">
@@ -99,27 +87,15 @@
     <div id="wine">
       <div id="box">
         <!-- 默认webRTC是关闭状态的 -->
-        <video
-            muted
-            poster=""
-            autoplay="autoplay"
-            webkit-playsinline=""
-            playsinline=""
-          style="object-fit: contain; display: none"
-            id="playVideo"
-          ></video>
+        <video muted poster="" autoplay="autoplay" webkit-playsinline="" playsinline=""
+          style="object-fit: contain; display: none" id="playVideo"></video>
         <canvas id="playCanvas" width="450" height="800"></canvas>
       </div>
       <div class="count-view" id="countView">
         <div class="fnca">
           <span class="countdown-time" style="color: #ffffff"></span>
           <div class="line"></div>
-          <img
-              class="wh22"
-              src="../static/img/close.png"
-              alt=""
-              onclick="handleclose()"
-            />
+          <img class="wh22" src="../static/img/close.png" alt="" onclick="handleclose()" />
         </div>
       </div>
     </div>
@@ -143,21 +119,11 @@
           <img src="../static/img/wx/jianqieban_icon.png" />
           <div>剪贴板</div>
         </div>
-        <div
-            class="upload"
-            id="upload"
-            data-text="Signout"
-            onclick="handleQuit('quit')"
-          >
+        <div class="upload" id="upload" data-text="Signout" onclick="handleQuit('quit')">
           <img src="../static/img/wx/tuichu_icon.png" />
           <div>退出</div>
         </div>
-        <div
-            class="upload"
-            id="dormant"
-            data-text="Dormant"
-            onclick="handleQuit('dormant')"
-          >
+        <div class="upload" id="dormant" data-text="Dormant" onclick="handleQuit('dormant')">
           <img src="../static/img/wx/tuichu_icon.png" />
           <div>退出并下机</div>
         </div>
@@ -184,12 +150,7 @@
   </div>
   <div class="mask">
     <div class="box-shear-plate"></div>
-    <img
-        class="close"
-        onclick="handleClose()"
-        src="img/guanbi_icon@2x.png"
-        alt=""
-      />
+    <img class="close" onclick="handleClose()" src="img/guanbi_icon@2x.png" alt="" />
   </div>
   <div class="weui-mask_transparent"></div>
   <div class="weui-toast weui_loading_toast weui-toast--visible">
@@ -200,16 +161,8 @@
   </div>
   <div class="try-use-wrap">
     <div class="try-use-container">
-      <video
-          width="100%"
-          height="100%"
-          id="source"
-          autoplay="autoplay"
-          loop="loop"
-          webkit-playsinline="true"
-        playsinline="true"
-          x5-video-player-type="h5-page"
-        >
+      <video width="100%" height="100%" id="source" autoplay="autoplay" loop="loop" webkit-playsinline="true"
+        playsinline="true" x5-video-player-type="h5-page">
         您的浏览器不支持 video 标签。
       </video>
       <div class="time-close-wrap"><span class="time-node"></span> 关闭</div>
@@ -301,10 +254,7 @@
         </div>
       </script>
   </div>
-  <script
-      type="text/javascript"
-      src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"
-    ></script>
+  <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
   <script src="https://lf1-cdn-tos.bytegoofy.com/goofy/developer/jssdk/jssdk-1.0.3.js"></script>
   <script type="text/javascript" src="jquery-1.11.0.min.js"></script>
   <!-- ffm软解 -->
@@ -313,10 +263,7 @@
   <script type="text/javascript" src="pcm-player.js"></script>
   <script type="text/javascript" src="webgl.js"></script>
   <script type="text/javascript" src="rtcEngine.min.js"></script>
-  <script
-      type="text/javascript"
-      src="../static/js/uni.webview.1.5.2.js"
-    ></script>
+  <script type="text/javascript" src="../static/js/uni.webview.1.5.2.js"></script>
   <script type="text/javascript">
     $(function () {
       //手指滑动多少距离就认为是滑成功
@@ -1030,7 +977,7 @@
                 top: top,
               }),
             );
-          } catch (ex) {}
+          } catch (ex) { }
         };
         var getHistory = function () {
           try {
@@ -1231,7 +1178,7 @@
             logicWidth * logicHeight,
             (logicWidth / 2) * (logicHeight / 2),
           );
-          if(getResidueTimeBool) {
+          if (getResidueTimeBool) {
             // 如果是计时卡的话就上报
             getResidueTime()
             getResidueTimeBool = false
@@ -1377,17 +1324,17 @@
               // connect('update');
               clearInterval(connectClearSetInterval)
               connectClearSetInterval = setInterval(() => {
-                if(numberOfTimes >= 6) {
+                if (numberOfTimes >= 6) {
                   quit();
                   clearInterval(connectClearSetInterval)
                   return
                 }
                 numberOfTimes++
                 engine && engine.disconnect();
-                wsss&&wsss.close();
+                wsss && wsss.close();
                 webSocketWorker && webSocketWorker.postMessage('endRequest');
-                decodeWoker&&decodeWoker.postMessage('close');
-                decodeWoker&&decodeWoker.terminate();
+                decodeWoker && decodeWoker.postMessage('close');
+                decodeWoker && decodeWoker.terminate();
                 webSocketWorker && webSocketWorker.postMessage('close');
                 setTimeout(() => {
                   connect('update');
@@ -1634,7 +1581,7 @@
         type: 'get',
         dataType: 'json',
         contentType: 'application/json;charset=UTF-8',
-      }).then(function (res) {});
+      }).then(function (res) { });
     }
 
     // 秒转化为时分秒
@@ -1814,7 +1761,7 @@
         type: 'post',
         contentType: 'application/json',
         dataType: 'json',
-        success: function (res) {},
+        success: function (res) { },
       });
     }
     //间隔广告上报
@@ -1831,7 +1778,7 @@
         type: 'POST',
         dataType: 'json',
         contentType: 'application/json;charset=UTF-8',
-        success: function (res) {},
+        success: function (res) { },
       });
     }
     //关闭广告
@@ -1904,8 +1851,7 @@
         if (window.__wxjs_environment === 'miniprogram') {
           wx.miniProgram.navigateTo({
             url:
-              `/packageA/order/renew/index?buyType=${
-                  sourceType == 1
+              `/packageA/order/renew/index?buyType=${sourceType == 1
                 ? '试用弹窗购买按钮进入-普通试用'
                 : '试用弹窗购买按钮进入-激活码试用'
               }&record=` + userCardId,
@@ -1941,7 +1887,7 @@
         }),
         contentType: 'application/json',
         dataType: 'json',
-        success: function (res) {},
+        success: function (res) { },
       });
     }
     // 避免重复退出的字段
@@ -1949,13 +1895,13 @@
     function quit() {
       // 退出云机页时,把所有链接都关闭掉
       engine && engine.disconnect();
-      wsss&&wsss.close();
-      decodeWoker&&decodeWoker.postMessage('close');
-      decodeWoker&&decodeWoker.terminate();
+      wsss && wsss.close();
+      decodeWoker && decodeWoker.postMessage('close');
+      decodeWoker && decodeWoker.terminate();
       // 如果是指令请求失败或者直接退出,都要发送消息给视频流js文件,告知视频流请求失败情况不再做退出操作
       webSocketWorker && webSocketWorker.postMessage('endRequest');
       webSocketWorker && webSocketWorker.postMessage('close');
-      if(!quitBool) {
+      if (!quitBool) {
         return
       }
       quitBool = false
@@ -1973,8 +1919,8 @@
         //   },
         //   '*',
         // );
-        uni.navigateBack({
-          delta: 1,
+        uni.reLaunch({
+          url: '/pages/index/index'
         });
       }
     }
@@ -2146,4 +2092,5 @@
   <script type="text/javascript" src="aac.js"></script>
   <script type="text/javascript" src="./timer.js"></script>
 </body>
-</html>
+
+</html>