优化

screenAndroid/WXdraw.js

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

screenAndroid/WXtrialInterface.html

@@ -65,7 +65,7 @@
 				<!-- <div id="box"> -->
 				<video muted="muted" x5-video-orientation="landscape" playsinline="true" autoplay="true"
 					webkit-playsinline="true" x5-playsinline="true" x5-video-player-type="h5"
-					x5-video-player-fullscreen="false" style="pointer-events: none;width: 100%;height:100%"
+					x5-video-player-fullscreen="false" style="pointer-events: none;object-fit: fill;width: 100%;height:100%"
 					disablePictureInPicture="true" autoplay poster="images/loader-thumb.jpg" id="playerVideo"></video>
 				<div id="box"></div>
 				<audio preload="auto" autoplay controls poster="images/loader-thumb.jpg" id="audioPlayer"
@@ -350,7 +350,7 @@
 				// socketURL = "ws://192.168.11.233:8080"
 				//socketURL = "ws://14.215.128.98:14112";
 				// var socketURL = "ws://192.168.11.66:9101";
-				var socketURL = "ws://192.168.198.12:9100"
+				var socketURL = "ws://192.168.198.12:9101"
 				// socketURL = "ws://14.215.128.98:14077";
 				//socketURL = "wss://192.168.11.242:9104";
 

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.12:9100"
+var cUrl = "ws://192.168.198.12:9101"
 // if (data.clientType == 3) {
 // 	cUrl = "wss://" + urlss + "/authControlWebSocket?" + "clientType=" + data.clientType + "&username=" + data.username +
 // 		"&userCardId=" + data.userCardId
@@ -119,6 +119,7 @@ wsss.onopen = function() {
 		},
 		"event": "bitRate"
 	}
+	console.log('打开安卓卡==============', data.sn)
 	// wsss.send(JSON.stringify(bitRate));
 	wsss.send(ExexuteMove(JSON.stringify(bitRate)),data.sn) 
 };
@@ -129,7 +130,7 @@ wsss.onmessage = function(event) {
 	// resets.errorMsg && alert(resets.errorMsg)
 	// resolving = resets.data.orientation
 	// if (resolving == 1) {} else {}
-	console.log('>>>resolvingresolvingresolving', resolving)
+	// console.log('>>>resolvingresolvingresolving', resolving)
 
 };
 wsss.onclose = function(event) {
@@ -204,6 +205,7 @@ $(".PictureQuality").on("click", function() {
 		"event": "bitRate"
 	}
 	// wsss.send(JSON.stringify(bitRate));
+	console.log('打开安卓卡==============', data.sn)
 	wsss.send(ExexuteMove(JSON.stringify(bitRate)),data.sn) 
 	console.log(id)
 })
@@ -253,8 +255,9 @@ var draw_graph = function(graphType, obj) {
 				}
 			}
 			// wsss.send(JSON.stringify(ping));
+			console.log('打开安卓卡==============', data.sn)
 			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
-			console.log("鼠标按下>>>", ping)
+			console.log("鼠标按下>>>", ping,data.sn)
 		} else {
 			let ping
 			for (let i = 0; i < touchfor.length; i++) {
@@ -273,8 +276,9 @@ var draw_graph = function(graphType, obj) {
 
 			}
 			// wsss.send(JSON.stringify(ping));
+			console.log('打开安卓卡==============', data.sn)
 			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
-			console.log("鼠标按下>>>", ping)
+			console.log("鼠标按下>>>", ping,data.sn)
 		}
 
 		canDraw = true;
@@ -306,6 +310,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
+			console.log('打开安卓卡==============', data.sn)
 			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
 
 		} else {
@@ -326,6 +331,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
+			console.log('打开安卓卡==============', data.sn)
 			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
 		}
 
@@ -367,6 +373,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
+			console.log('打开安卓卡==============', data.sn)
 			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
 		} else {
 			let ping
@@ -387,6 +394,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
+			console.log('打开安卓卡==============', data.sn)
 			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
 		}
 

screenIos/WXtrialInterface.html

@@ -235,6 +235,7 @@
 
 				data.demoTime = demoTime.substring(9, demoTime.length)
 				data.id = id.substring(3, id.length)
+				console.log("打印sn卡", data.sn)
 
 			} else if (data.clientType == 2) { //分享屏幕
 				console.log("走到分享屏幕里面啦==========", data.clientTypes);
@@ -787,12 +788,12 @@
 			// }
 			var isDrag = false;
 			myVideo.onmousedown = function(event) {
-				console.log('5555555555')
+				console.log('5555555555安卓卡',data.sn)
 				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(),data.sn);
-					console.log('55555', buffer)
+					// console.log('55555', buffer)
 					webSocketWorker.postMessage(buffer);
 					isDrag = true;
 				}

screenIos/websocket.js

@@ -1,7 +1,7 @@
 self.importScripts("helper.js");
 // self.importScripts("pcm-player.js");
 // self.importScripts("pcm-player.min.js");   
-var socketURL = "ws://192.168.198.12:9100";
+var socketURL = "ws://192.168.198.12:9101";
 // var socketURL = "14.215.128.98:14102";
 // var socketURL = "ws://14.215.128.98:14102"
 // socketURL = "ws://127.0.0.1:8081"
@@ -17,7 +17,7 @@ ws.addEventListener('open', function(event) {
 });
 
 self.addEventListener('message', function(e) {
-	console.log("收到数据", e.data);
+	// console.log("收到数据", e.data);
 	ws.send(e.data);
 	console.log('ws', ws)
 }, false);