huangxiaojing 2 年 前
コミット
054158da62
共有5 個のファイルを変更した2307 個の追加2204 個の削除を含む
  1. 3 10
      static/screenAndroid/WXdraw.js
  2. 1168 1123
      static/screenAndroid/WXtrialInterface.html
  3. 3 11
      static/screenIos/WXdraw.js
  4. 1131 1055
      static/screenIos/WXtrialInterface.html
  5. 2 5
      static/screenIos/websocket.js

+ 3 - 10
static/screenAndroid/WXdraw.js

@@ -22,20 +22,13 @@ url = url.split('/');
 var parameters = GetRequest();
 var form = {};
 
-var cardToken = parameters["cardToken"];
-cardToken = cardToken && decodeURIComponent(cardToken);
-form.ip = parameters["ip"];
-form.domainName = parameters["domainName"];
-var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives" : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives";
-var videoWidth = Number(parameters['resolvingPower']) ? Number(parameters['resolvingPower']) : 720
+var videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 var videoHeight = videoWidth === 720 ? 1280 : 1920
 var isControl = true; // 是否是观看模式
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 
 var wsss, errorTime = 0;
 var first = true;
-doConnect();
 function throttle(fn, delay) {
   var flag = true;
   errorTime += delay;
@@ -49,7 +42,7 @@ function throttle(fn, delay) {
   };
 }
 
-function doConnect() {
+function doConnectDirectives() {
   wsss = new WebSocket(cUrl);
   wsss.binaryType = 'arraybuffer';
 
@@ -66,7 +59,7 @@ function doConnect() {
   };
   wsss.onerror = function (evt) {
     wsss.close();
-    throttle(doConnect, 100);
+    throttle(doConnectDirectives, 100);
     if (errorTime > 1000) {
       quit();
     }

File diff suppressed because it is too large
+ 1168 - 1123
static/screenAndroid/WXtrialInterface.html


+ 3 - 11
static/screenIos/WXdraw.js

@@ -19,21 +19,13 @@ url = url.split('/');
 
 var parameters = GetRequest();
 
-var form = {};
-var cardToken = parameters["cardToken"];
-cardToken = cardToken && decodeURIComponent(cardToken);
-form.ip = parameters['ip'];
-form.domainName = parameters["domainName"];
-var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives" : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives";
-var videoWidth = Number(parameters['resolvingPower']) ? Number(parameters['resolvingPower']) : 720
+var videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 var videoHeight = videoWidth === 720 ? 1280 : 1920
 var isControl = true; // 是否是观看模式
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 var wsss;
 var errorTime = 0;
 var first = true;
-doConnect();
 
 function throttle(fn, delay) {
   var flag = true;
@@ -48,7 +40,7 @@ function throttle(fn, delay) {
   };
 }
 
-function doConnect() {
+function doConnectDirectives() {
   wsss = new WebSocket(cUrl);
   wsss.binaryType = 'arraybuffer';
 
@@ -75,7 +67,7 @@ function doConnect() {
   };
   wsss.onerror = function () {
     wsss.close();
-    throttle(doConnect, 100);
+    throttle(doConnectDirectives, 100);
     if (errorTime > 1000) {
       quit();
     }

File diff suppressed because it is too large
+ 1131 - 1055
static/screenIos/WXtrialInterface.html


+ 2 - 5
static/screenIos/websocket.js

@@ -1,12 +1,9 @@
 self.importScripts("helper.js");
 var parameters = GetRequest();
-var ip = parameters["ip"];
-var appletPushAddress = parameters["appletPushAddress"];
-var cardToken = parameters["token"];
+var cardToken = parameters["cardToken"];
 cardToken = cardToken && decodeURIComponent(cardToken);
-var isWSS = true;
 var errorTime = 0;
-var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business" : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business";
+var socketURL = decodeURIComponent(parameters['socketURL']);
 var intervaler;
 doConnect();