huangxiaojing 4 년 전
부모
커밋
9fa26aa03a
4개의 변경된 파일35개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      screenAndroid/WXdraw.js
  2. 16 1
      screenAndroid/WXtrialInterface.html
  3. 1 1
      screenIos/WXdraw.js
  4. 17 2
      screenIos/websocket.js

+ 1 - 1
screenAndroid/WXdraw.js

@@ -82,7 +82,7 @@ urlss = '192.168.31.20'
 // cUrl = "ws://192.168.11.66:9101";
 // var cUrl="wss://www.ted2018.com:9101"
 // var cUrl = "ws://192.168.198.21:9101"
-var cUrl = "ws://192.168.198.21:9101"
+var cUrl = "ws://192.168.198.82:9100" + data.ip;
 // if (data.clientType == 3) {
 // 	cUrl = "wss://" + urlss + "/authControlWebSocket?" + "clientType=" + data.clientType + "&username=" + data.username +
 // 		"&userCardId=" + data.userCardId

+ 16 - 1
screenAndroid/WXtrialInterface.html

@@ -346,7 +346,22 @@
 				};
 			}
 
+			function GetRequest() {
+				var url = location.search; // 获取url中"?"符后的字串
+				var obj= new Object();
+				if (url.indexOf("?") != -1) {
+					var str = url.substr(1);
+					strs = str.split("&");
+					for(var i = 0; i < strs.length; i ++) {
+						obj[strs[i].split("=")[0]]=(strs[i].split("=")[1]);
+					}
+				}
+				return obj;
+			}
+
 			window.onload = function() {
+				var parameters = GetRequest();
+				var ip = parameters["ip"];
 				// var socketURL = 'wss://jmuxer-demo-server.herokuapp.com';
 				//socketURL = "ws://127.0.0.1:8080"
 				// socketURL = "ws://192.168.11.233:8080"
@@ -354,7 +369,7 @@
 				// var socketURL = "ws://192.168.11.66:9101";
 				// var socketURL = "ws://192.168.198.21:9101"
 				// var socketURL = "ws://14.215.128.97:15508"
-				var socketURL = "ws://192.168.198.21:9101"
+				var socketURL = "ws://192.168.198.82:9100" + ip;
 				// socketURL = "ws://14.215.128.98:14077";
 				//socketURL = "wss://192.168.11.242:9104";
 

+ 1 - 1
screenIos/WXdraw.js

@@ -86,7 +86,7 @@ urlss = '192.168.31.20'
 // var cUrl = ''
 // cUrl = "ws://192.168.11.66:9101";
 // var cUrl="14.215.128.98:14102"
-var cUrl = "ws://192.168.198.21:9101"
+var cUrl = "ws://192.168.198.82:9100/card?cardIp=" + data.ip
 // if (data.clientType == 3) {
 // 	cUrl = "wss://" + urlss + "/authControlWebSocket?" + "clientType=" + data.clientType + "&username=" + data.username +
 // 		"&userCardId=" + data.userCardId

+ 17 - 2
screenIos/websocket.js

@@ -1,7 +1,9 @@
 self.importScripts("helper.js");
 // self.importScripts("pcm-player.js");
-// self.importScripts("pcm-player.min.js");   
-var socketURL = "ws://192.168.198.21:9101";
+// self.importScripts("pcm-player.min.js");
+var parameters = GetRequest();
+var ip = parameters["ip"];
+var socketURL = "ws://192.168.198.82:9100/card?cardIp=" + ip;
 // var socketURL = "14.215.128.98:14102";
 // var socketURL = "ws://14.215.128.98:14102"
 // socketURL = "ws://127.0.0.1:8081"
@@ -34,3 +36,16 @@ ws.addEventListener('message', function(event) {
 		self.postMessage(input);
 	}
 });
+
+function GetRequest() {
+  var url = location.search; // 获取url中"?"符后的字串
+  var obj= new Object();
+  if (url.indexOf("?") != -1) {
+    var str = url.substr(1);
+    strs = str.split("&");
+    for(var i = 0; i < strs.length; i ++) {
+      obj[strs[i].split("=")[0]]=(strs[i].split("=")[1]);
+    }
+  }
+  return obj;
+}