huangxiaojing 3 anos atrás
pai
commit
5e0f78940b
3 arquivos alterados com 11 adições e 5 exclusões
  1. 1 1
      screenAndroid/WXdraw.js
  2. 8 2
      screenIos/WXdraw.js
  3. 2 2
      screenIos/websocket.js

+ 1 - 1
screenAndroid/WXdraw.js

@@ -31,7 +31,7 @@ form.userCardId = parameters["userCardId"];
 form.ip = parameters["ip"];
 form.domainName = parameters["domainName"];
 var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.domainName + "/card?cardIp=" + form.ip : "ws://" + form.domainName + "/card?cardIp=" + form.ip;
+var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
 // var cUrl = "ws://192.168.199.46:9101?token=test0123456789";
 
 var wsss,errorTime = 0;

+ 8 - 2
screenIos/WXdraw.js

@@ -20,10 +20,16 @@ url = url.split('/');
 var parameters = GetRequest();
 
 var form = {};
+form.clientType = parameters['clientType'];
+form.cardIp = parameters['cardIp'];
+form.port = parameters['port'];
+form.sn = parameters['sn'];
+form.username = parameters['username'];
+form.userCardId = parameters['userCardId'];
 form.ip = parameters['ip'];
-form.appletPushAddress = parameters["appletPushAddress"];
+form.domainName = parameters["domainName"];
 var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.appletPushAddress + "?cardIp=" + form.ip : "ws://" + form.appletPushAddress + "?cardIp=" + form.ip;
+var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
 
 var wsss;
 var errorTime = 0;

+ 2 - 2
screenIos/websocket.js

@@ -1,10 +1,10 @@
 self.importScripts("helper.js");
 var parameters = GetRequest();
 var ip = parameters["ip"];
-var domainName = parameters["domainName"];
+var appletPushAddress = parameters["appletPushAddress"];
 var isWSS = true;
 var errorTime = 0;
-var socketURL = isWSS ? "wss://" + domainName + "/card?cardIp=" + ip : "ws://" + domainName + "/card?cardIp=" + ip;
+var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip : "ws://" + appletPushAddress + "?cardIp=" + ip;
 
 doConnect();