huangxiaojing преди 3 години
родител
ревизия
3006d862b5

+ 0 - 16
screenAndroid/WXdraw.js

@@ -66,15 +66,6 @@ function doConnect() {
       "type": "bitRate"
     }
     wsss.send(JSON.stringify(bitRate));
-    // 获取实时截图
-    var screenPic = {
-      type: 'getScreenPic',
-      data: {
-        taskUid: '346789',
-        intervalTime: 0
-      }
-    }
-    wsss.send(JSON.stringify(screenPic));
   };
   wsss.onerror = function (evt) {
     wsss.close();
@@ -101,13 +92,6 @@ function doConnect() {
       }
       return
     }
-    var unit8Arr = new Uint8Array(result);
-    if (unit8Arr[0] == 0x68 && unit8Arr[1] == 0x09 && first) {
-      first = false;
-      unit8Arr = unit8Arr.slice(12, unit8Arr.length - 2);
-      var base64 = 'data:image/jpg;base64,' + window.btoa(String.fromCharCode(...new Uint8Array(unit8Arr)));
-      $(".loading_sceen_pic").attr('src', base64);
-    }
   }
 }
 

+ 43 - 36
screenAndroid/WXtrialInterface.html

@@ -114,32 +114,42 @@
   <script type="text/javascript" src="WXdraw.js?v=110"></script>
   <script type="text/javascript" src="jmuxer.js"></script>
   <script>
+    var parameters = GetRequest();
+    if (parameters['mealType'] === 'VIP') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_VIP.png');
+    } else if (parameters['mealType'] === 'SVIP') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_SVIP.png');
+    } else if (parameters['mealType'] === 'STAR') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_STAR.png');
+    } else if (parameters['mealType'] === 'STARPRO') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_STARPRO.png');
+    }
     var isAudioPlay = false;
-		if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
-			var video = document.getElementById("playerVideo");
-			video.play();
-			setTimeout(() => { // 抖音环境需要设置延时,不然会有video默认图显示
-				$.alert({
-					title: '提示',
-					text: '开始使用云手机',
-					onOK: function () {
-						setTimeout(() => {
-							isAudioPlay = true;
-						}, 1000);
-					}
-				});
-			}, 1000)
-		}else{
-			$.alert({
-				title: '提示',
-				text: '开始使用云手机',
-				onOK: function () {
-					var video = document.getElementById("playerVideo");
-					video.play();
-					isAudioPlay = true;
-				}
-			});
-		}
+    if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
+      var video = document.getElementById("playerVideo");
+      video.play();
+      setTimeout(() => { // 抖音环境需要设置延时,不然会有video默认图显示
+        $.alert({
+          title: '提示',
+          text: '开始使用云手机',
+          onOK: function () {
+            setTimeout(() => {
+              isAudioPlay = true;
+            }, 1000);
+          }
+        });
+      }, 1000)
+    } else {
+      $.alert({
+        title: '提示',
+        text: '开始使用云手机',
+        onOK: function () {
+          var video = document.getElementById("playerVideo");
+          video.play();
+          isAudioPlay = true;
+        }
+      });
+    }
     var topwinHeight = window.screen.height - window.innerHeight + 30; //计算title top 头部  
     $('#wine').css({
       "width": window.screen.width,
@@ -169,14 +179,11 @@
     }
 
     var isWSS = true;
-    var parameters = GetRequest();
     var ip = parameters["ip"];
     var cardToken = parameters["cardToken"];
     cardToken = cardToken && cardToken.replace(/@/g, "=");
     var appletPushAddress = parameters["appletPushAddress"];
     var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
-    // var socketURL = "wss://192.168.31.198/businessChannel?cardIp=192.168.20.53&token=LDAz32tutqS9wQqi0WlmvJ68/Is83cX+kavJQij1IMRvewgZ1dLvviFZqd4b8gcaR1eLztR/ViRLyyAVvZO7GA==";
-    // var socketURL = "ws://192.168.20.53:9100";
 
     var jmuxer = new JMuxer({
       node: 'playerVideo',
@@ -221,11 +228,11 @@
         } else {
           clearInterval(intervaler);
           $.toast("画面异常,请重新进入", "text");
-          if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
+          if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
             tt.miniProgram.switchTab({
               url: '/pages/home/home'
             })
-          }else{
+          } else {
             wx.miniProgram.switchTab({
               url: '/pages/home/home'
             })
@@ -247,11 +254,11 @@
         if (errorTime > 1000) {
           $.toast("画面异常,请重新进入", "text");
           wsss.close();
-          if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
+          if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
             tt.miniProgram.switchTab({
               url: '/pages/home/home'
             })
-          }else{
+          } else {
             wx.miniProgram.switchTab({
               url: '/pages/home/home'
             })
@@ -376,11 +383,11 @@
             clearInterval(intervaler);
             ws.close();
             wsss.close();
-            if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
+            if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
               tt.miniProgram.switchTab({
                 url: '/pages/home/home'
               })
-            }else{
+            } else {
               wx.miniProgram.switchTab({
                 url: '/pages/home/home'
               })
@@ -772,11 +779,11 @@
       clearInterval(intervaler);
       ws.close();
       wsss.close();
-      if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
+      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
         tt.miniProgram.switchTab({
           url: '/pages/home/home'
         })
-      }else{
+      } else {
         wx.miniProgram.switchTab({
           url: '/pages/home/home'
         })

BIN
screenAndroid/img/homebg.jpg


BIN
screenAndroid/img/homebg.png


+ 1 - 17
screenIos/WXdraw.js

@@ -65,16 +65,7 @@ function doConnect() {
       },
       "type": "bitRate"
     }
-    wsss.send(JSON.stringify(bitRate))
-    // 获取实时截图
-    var screenPic = {
-      type: 'getScreenPic',
-      data: {
-        taskUid: '346789',
-        intervalTime: 0
-      }
-    }
-    wsss.send(JSON.stringify(screenPic));
+    wsss.send(JSON.stringify(bitRate));
   };
   wsss.onerror = function () {
     wsss.close();
@@ -101,13 +92,6 @@ function doConnect() {
       }
       return
     }
-    var unit8Arr = new Uint8Array(result);
-    if (unit8Arr[0] == 0x68 && unit8Arr[1] == 0x09 && first) {
-      first = false;
-      unit8Arr = unit8Arr.slice(12, unit8Arr.length - 2);
-      var base64 = 'data:image/jpg;base64,' + window.btoa(String.fromCharCode(...new Uint8Array(unit8Arr)));
-      $(".loading_sceen_pic").attr('src', base64)
-    }
   }
 }
 $('body').on("click", function () {

+ 18 - 9
screenIos/WXtrialInterface.html

@@ -189,7 +189,17 @@
   </script>
   <script>
     var topwinHeight = window.screen.height - window.innerHeight + 30; //计算title top 头部
-    var renderCount = 0
+    var parameters = GetRequest();
+    var renderCount = 0;
+    if (parameters['mealType'] === 'VIP') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_VIP.png');
+    } else if (parameters['mealType'] === 'SVIP') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_SVIP.png');
+    } else if (parameters['mealType'] === 'STAR') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_STAR.png');
+    } else if (parameters['mealType'] === 'STARPRO') {
+      $(".loading_sceen_pic").attr('src', '../static/img/home_bg_STARPRO.png');
+    }
     $('#wine').css({
       "width": window.screen.width,
       "height": window.screen.height - topwinHeight - 20,
@@ -213,8 +223,7 @@
     url = url.split('/');
     var baseUrl = url[0] + '//' + url[2];
     var form = {};
-    var parameters = GetRequest();
-    form.userCardId = parameters['userCardId'];
+
     form.token = parameters['token'];
     var orientation = 0; //0 竖屏,1横屏
     function array_unique(arr) {
@@ -559,11 +568,11 @@
       decodeWoker.postMessage('close');
       decodeWoker.terminate();
       webSocketWorker.terminate();
-      if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
+      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
         tt.miniProgram.switchTab({
           url: '/pages/home/home'
         })
-      }else{
+      } else {
         wx.miniProgram.switchTab({
           url: '/pages/home/home'
         })
@@ -697,11 +706,11 @@
             decodeWoker.postMessage('close');
             decodeWoker.terminate();
             webSocketWorker.terminate();
-            if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
+            if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
               tt.miniProgram.switchTab({
                 url: '/pages/home/home'
               })
-            }else{
+            } else {
               wx.miniProgram.switchTab({
                 url: '/pages/home/home'
               })
@@ -730,11 +739,11 @@
         decodeWoker.postMessage('close');
         decodeWoker.terminate();
         webSocketWorker.terminate();
-        if(navigator.userAgent.toLowerCase().includes('toutiaomicroapp')){
+        if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
           tt.miniProgram.switchTab({
             url: '/pages/home/home'
           })
-        }else{
+        } else {
           wx.miniProgram.switchTab({
             url: '/pages/home/home'
           })

BIN
screenIos/img/homebg.png


BIN
static/img/home_bg_PRO.png


BIN
static/img/home_bg_STAR.png


BIN
static/img/home_bg_SVIP.png


BIN
static/img/home_bg_VIP.png