ws地址加上token

screenAndroid/WXdraw.js

@@ -22,7 +22,8 @@ url = url.split('/');
 var parameters = GetRequest();
 var form = {};
 
-form.clientType = parameters["clientType"];
+var cardToken = parameters["cardToken"];
+cardToken = cardToken && cardToken.replace(/@/g,"=");
 form.cardIp = parameters["cardIp"];
 form.port = parameters["port"];
 form.sn = parameters["sn"];
@@ -31,7 +32,7 @@ form.userCardId = parameters["userCardId"];
 form.ip = parameters["ip"];
 form.domainName = parameters["domainName"];
 var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
+var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken : "ws://" + form.domainName + "?cardIp=" + form.ip  + "&token=" + cardToken;
 // var cUrl = "wss://192.168.31.198/businessChannel?cardIp=192.168.20.53&token=LDAz32tutqS9wQqi0WlmvJ68/Is83cX+kavJQij1IMRvewgZ1dLvviFZqd4b8gcaR1eLztR/ViRLyyAVvZO7GA==";
 
 var wsss,errorTime = 0;

screenIos/WXdraw.js

@@ -20,7 +20,8 @@ url = url.split('/');
 var parameters = GetRequest();
 
 var form = {};
-form.clientType = parameters['clientType'];
+var cardToken = parameters["cardToken"];
+cardToken = cardToken && cardToken.replace(/@/g,"=");
 form.cardIp = parameters['cardIp'];
 form.port = parameters['port'];
 form.sn = parameters['sn'];
@@ -29,7 +30,7 @@ form.userCardId = parameters['userCardId'];
 form.ip = parameters['ip'];
 form.domainName = parameters["domainName"];
 var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
+var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken;
 
 var wsss;
 var errorTime = 0;

screenIos/WXtrialInterface.html

@@ -708,7 +708,8 @@
 		}
 		var ip = parameters["ip"];
 		var appletPushAddress = parameters["appletPushAddress"];
-		var webSocketWorker = new Worker('websocket.js?ip=' + ip + '&appletPushAddress=' + appletPushAddress);
+		var token = parameters["token"];
+		var webSocketWorker = new Worker('websocket.js?ip=' + ip + '&appletPushAddress=' + appletPushAddress + '&token=' + token);
 
 		webSocketWorker.onmessage = function (event) {
 			var input = event.data;

screenIos/websocket.js

@@ -2,9 +2,11 @@ self.importScripts("helper.js");
 var parameters = GetRequest();
 var ip = parameters["ip"];
 var appletPushAddress = parameters["appletPushAddress"];
+var cardToken = parameters["cardToken"];
+cardToken = cardToken && cardToken.replace(/@/g,"=");
 var isWSS = true;
 var errorTime = 0;
-var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip : "ws://" + appletPushAddress + "?cardIp=" + ip;
+var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
 
 doConnect();