huangxiaojing 4 years ago
parent
commit
20314ee015
4 changed files with 8 additions and 36 deletions
  1. 2 9
      screenAndroid/WXdraw.js
  2. 2 9
      screenAndroid/WXtrialInterface.html
  3. 2 9
      screenIos/WXdraw.js
  4. 2 9
      screenIos/websocket.js

+ 2 - 9
screenAndroid/WXdraw.js

@@ -21,7 +21,6 @@ url = url.split('/');
 
 
 var parameters = GetRequest();
 var parameters = GetRequest();
 var form = {};
 var form = {};
-var roomList = ['test.androidscloud.com', 'vclusters.imwork.net:2221'];
 
 
 form.clientType = parameters["clientType"];
 form.clientType = parameters["clientType"];
 form.cardIp = parameters["cardIp"];
 form.cardIp = parameters["cardIp"];
@@ -30,15 +29,9 @@ form.sn = parameters["sn"];
 form.username = parameters["username"];
 form.username = parameters["username"];
 form.userCardId = parameters["userCardId"];
 form.userCardId = parameters["userCardId"];
 form.ip = parameters["ip"];
 form.ip = parameters["ip"];
-var room = parameters["rm"];
+form.domainName = parameters["domainName"];
 var isWSS = false;
 var isWSS = false;
-var wsUrl;
-if (room == "A1") {
-	wsUrl = roomList[0];
-} else {
-	wsUrl = roomList[1];
-}
-var cUrl = isWSS ? "wss" : "ws" + "://" + wsUrl + "/card?cardIp=" + form.ip;
+var cUrl = isWSS ? "wss" : "ws" + "://" + form.domainName + "/card?cardIp=" + form.ip;
 
 
 var wsss;
 var wsss;
 doConnect();
 doConnect();

+ 2 - 9
screenAndroid/WXtrialInterface.html

@@ -174,17 +174,10 @@
 		}
 		}
 
 
 		var isWSS = false;
 		var isWSS = false;
-		var roomList = ['test.androidscloud.com', 'vclusters.imwork.net:2221'];
 		var parameters = GetRequest();
 		var parameters = GetRequest();
 		var ip = parameters["ip"];
 		var ip = parameters["ip"];
-		var room = parameters["rm"];
-		var wsUrl;
-		if (room == "A1") {
-			wsUrl = roomList[0];
-		} else {
-			wsUrl = roomList[1];
-		}
-		var socketURL = isWSS ? "wss" : "ws" + "://" + wsUrl + "/card?cardIp=" + ip;
+		var domainName = parameters["domainName"];
+		var socketURL = isWSS ? "wss" : "ws" + "://" + domainName + "/card?cardIp=" + ip;
 
 
 		var jmuxer = new JMuxer({
 		var jmuxer = new JMuxer({
 			node: 'playerVideo',
 			node: 'playerVideo',

+ 2 - 9
screenIos/WXdraw.js

@@ -20,7 +20,6 @@ url = url.split('/');
 var parameters = GetRequest();
 var parameters = GetRequest();
 
 
 var form = {};
 var form = {};
-var roomList = ['test.androidscloud.com', 'vclusters.imwork.net:2221'];
 form.clientType = parameters['clientType'];
 form.clientType = parameters['clientType'];
 form.cardIp = parameters['cardIp'];
 form.cardIp = parameters['cardIp'];
 form.port = parameters['port'];
 form.port = parameters['port'];
@@ -28,15 +27,9 @@ form.sn = parameters['sn'];
 form.username = parameters['username'];
 form.username = parameters['username'];
 form.userCardId = parameters['userCardId'];
 form.userCardId = parameters['userCardId'];
 form.ip = parameters['ip'];
 form.ip = parameters['ip'];
-var room = parameters["rm"];
+form.domainName = parameters["domainName"];
 var isWSS = false;
 var isWSS = false;
-var wsUrl;
-if (room == "A1") {
-	wsUrl = roomList[0];
-} else {
-	wsUrl = roomList[1];
-}
-var cUrl = isWSS ? "wss" : "ws" + "://" + wsUrl + "/card?cardIp=" + form.ip;
+var cUrl = isWSS ? "wss" : "ws" + "://" + form.domainName + "/card?cardIp=" + form.ip;
 
 
 var wsss;
 var wsss;
 doConnect();
 doConnect();

+ 2 - 9
screenIos/websocket.js

@@ -1,16 +1,9 @@
 self.importScripts("helper.js");
 self.importScripts("helper.js");
 var parameters = GetRequest();
 var parameters = GetRequest();
 var ip = parameters["ip"];
 var ip = parameters["ip"];
-var roomList = ['test.androidscloud.com', 'vclusters.imwork.net:2221'];
-var room = parameters["rm"];
+var domainName = parameters["domainName"];
 var isWSS = false;
 var isWSS = false;
-var wsUrl;
-if (room == "A1") {
-	wsUrl = roomList[0];
-} else {
-	wsUrl = roomList[1];
-}
-var socketURL = isWSS ? "wss" : "ws" + "://" + wsUrl + "/card?cardIp=" + ip;
+var socketURL = isWSS ? "wss" : "ws" + "://" + domainName + "/card?cardIp=" + ip;
 
 
 doConnect();
 doConnect();