alter

screenIos/WXdraw.js

@@ -20,6 +20,7 @@ url = url.split('/');
 var parameters = GetRequest();
 
 var form = {};
+var roomList = ['test.androidscloud.com', 'vclusters.imwork.net:2221'];
 form.clientType = parameters['clientType'];
 form.cardIp = parameters['cardIp'];
 form.port = parameters['port'];
@@ -27,8 +28,15 @@ form.sn = parameters['sn'];
 form.username = parameters['username'];
 form.userCardId = parameters['userCardId'];
 form.ip = parameters['ip'];
-
-var cUrl = "ws://192.168.199.243/card?cardIp=" + form.ip;
+var room = parameters["rm"];
+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 wsss;
 doConnect();

screenIos/WXtrialInterface.html

@@ -101,13 +101,13 @@
 			<div class="sboxText">下载地址已复制到剪切板</div>
 			<div class="sboxbu">确定</div>
 		</div>
-		<!-- <div class="loading"></div> -->
+		<div class="loading"></div>
 	</div>
-	<!-- <div class="weui-mask_transparent"></div>
+	<div class="weui-mask_transparent"></div>
 	<div class="weui-toast weui_loading_toast weui-toast--visible">
 		<div class="weui_loading"><i class="weui-loading weui-icon_toast"></i></div>
 		<p class="weui-toast_content">数据加载中</p>
-	</div> -->
+	</div>
 	<div id="copy-txt" style="position: absolute;opacity: 0;">
 		<span id="user_ref_id">www.androidsCloud.com</span>
 	</div>
@@ -447,7 +447,8 @@
 			return obj;
 		}
 		var ip = parameters["ip"];
-		var webSocketWorker = new Worker('websocket.js?ip=' + ip);
+		var rm = parameters["rm"];
+		var webSocketWorker = new Worker('websocket.js?ip=' + ip + '?rm=' + rm);
 
 		webSocketWorker.onmessage = function (event) {
 			var input = event.data;
@@ -487,34 +488,34 @@
 		}
 
 		var isDrag = false;
-		myVideo.onmousedown = function (event) {
-			if (event.button == 0) {
-				var posX = event.offsetX * 720 * 1.0 / myVideo.clientWidth;
-				var posY = event.offsetY * 1280 * 1.0 / myVideo.clientHeight;
-				var buffer = ExexuteMouseDown(posX.toString(), posY.toString(), form.sn);
-				webSocketWorker.postMessage(buffer);
-				isDrag = true;
-			}
-
-		}
-
-		myVideo.onmousemove = function (event) {
-			if (isDrag && event.button == 0) {
-				var posX = event.offsetX * 720 * 1.0 / myVideo.clientWidth;
-				var posY = event.offsetY * 1280 * 1.0 / myVideo.clientHeight;
-				var buffer = ExexuteMouseMove(posX.toString(), posY.toString(), form.sn);
-				webSocketWorker.postMessage(buffer);
-			}
-
-		}
-
-		myVideo.onmouseup = function (event) {
-			isDrag = false;
-			var posX = event.offsetX * 720 * 1.0 / myVideo.clientWidth;
-			var posY = event.offsetY * 1280 * 1.0 / myVideo.clientHeight;
-			var buffer = ExexuteMouseUp(posX.toString(), posY.toString(), form.sn);
-			webSocketWorker.postMessage(buffer);
-		}
+		// myVideo.onmousedown = function (event) {
+		// 	if (event.button == 0) {
+		// 		var posX = event.offsetX * 720 * 1.0 / myVideo.clientWidth;
+		// 		var posY = event.offsetY * 1280 * 1.0 / myVideo.clientHeight;
+		// 		var buffer = ExexuteMouseDown(posX.toString(), posY.toString(), form.sn);
+		// 		webSocketWorker.postMessage(buffer);
+		// 		isDrag = true;
+		// 	}
+
+		// }
+
+		// myVideo.onmousemove = function (event) {
+		// 	if (isDrag && event.button == 0) {
+		// 		var posX = event.offsetX * 720 * 1.0 / myVideo.clientWidth;
+		// 		var posY = event.offsetY * 1280 * 1.0 / myVideo.clientHeight;
+		// 		var buffer = ExexuteMouseMove(posX.toString(), posY.toString(), form.sn);
+		// 		webSocketWorker.postMessage(buffer);
+		// 	}
+
+		// }
+
+		// myVideo.onmouseup = function (event) {
+		// 	isDrag = false;
+		// 	var posX = event.offsetX * 720 * 1.0 / myVideo.clientWidth;
+		// 	var posY = event.offsetY * 1280 * 1.0 / myVideo.clientHeight;
+		// 	var buffer = ExexuteMouseUp(posX.toString(), posY.toString(), form.sn);
+		// 	webSocketWorker.postMessage(buffer);
+		// }
 
 		myVideo.onkeydown = function (event) {
 			ExexuteKeyDown(e.keyCode, form.sn);

screenIos/websocket.js

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