Merge branch 'dev-5.0' into uat-new

screenAndroid/WXdraw.js

@@ -24,8 +24,7 @@ var form = {};
 
 var cardToken = parameters["cardToken"];
 cardToken = cardToken && cardToken.replace(/@/g, "=");
-cardToken = cardToken.replace(/$/g, "+");
-
+cardToken = cardToken.replace(/\$/g, "+");
 form.cardIp = parameters["cardIp"];
 form.port = parameters["port"];
 form.username = parameters["username"];

screenAndroid/WXtrialInterface.html

@@ -182,7 +182,7 @@
     var ip = parameters["ip"];
     var cardToken = parameters["cardToken"];
     cardToken = cardToken && cardToken.replace(/@/g, "=");
-    cardToken = cardToken.replace(/$/g, "+");
+    cardToken = cardToken.replace(/\$/g, "+");
     var appletPushAddress = parameters["appletPushAddress"];
     var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
 

screenIos/WXdraw.js

@@ -22,7 +22,7 @@ var parameters = GetRequest();
 var form = {};
 var cardToken = parameters["cardToken"];
 cardToken = cardToken && cardToken.replace(/@/g, "=");
-cardToken = cardToken.replace(/$/g, "+");
+cardToken = cardToken.replace(/\$/g, "+");
 form.cardIp = parameters['cardIp'];
 form.port = parameters['port'];
 form.sn = parameters['sn'];

screenIos/websocket.js

@@ -4,7 +4,7 @@ var ip = parameters["ip"];
 var appletPushAddress = parameters["appletPushAddress"];
 var cardToken = parameters["token"];
 cardToken = cardToken && cardToken.replace(/@/g,"=");
-cardToken = cardToken.replace(/$/g, "+");
+cardToken = cardToken.replace(/\$/g, "+");
 var isWSS = true;
 var errorTime = 0;
 var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;