wuyongxiang 4 vuotta sitten
vanhempi
commit
1b958cafb7
3 muutettua tiedostoa jossa 30 lisäystä ja 30 poistoa
  1. 8 8
      screenAndroid/WXdraw.js
  2. 21 22
      screenIos/WXdraw.js
  3. 1 0
      screenIos/helper.js

+ 8 - 8
screenAndroid/WXdraw.js

@@ -115,7 +115,7 @@ wsss.onopen = function() {
 		"event": "bitRate"
 	}
 	// wsss.send(JSON.stringify(bitRate));
-	wsss.send(ExexuteMove(JSON.stringify(bitRate)),data.sn) 
+	wsss.send(ExexuteMove(JSON.stringify(bitRate),data.sn)) 
 };
 wsss.onmessage = function(event) {
 	// console.log("onMessage==============", event);
@@ -198,7 +198,7 @@ $(".PictureQuality").on("click", function() {
 		},
 		"event": "bitRate"
 	}
-	wsss.send(ExexuteMove(JSON.stringify(bitRate)),data.sn) 
+	wsss.send(ExexuteMove(JSON.stringify(bitRate),data.sn)) 
 	console.log(id)
 })
 
@@ -247,7 +247,7 @@ var draw_graph = function(graphType, obj) {
 				}
 			}
 			// wsss.send(JSON.stringify(ping));
-			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
+			wsss.send(ExexuteMove(JSON.stringify(ping),data.sn)) 
 			console.log("鼠标按下>>>", ping)
 		} else {
 			let ping
@@ -267,7 +267,7 @@ var draw_graph = function(graphType, obj) {
 
 			}
 			// wsss.send(JSON.stringify(ping));
-			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
+			wsss.send(ExexuteMove(JSON.stringify(ping),data.sn)) 
 			console.log("鼠标按下>>>", ping)
 		}
 
@@ -300,7 +300,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
-			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
+			wsss.send(ExexuteMove(JSON.stringify(ping),data.sn)) 
 
 		} else {
 			let ping
@@ -320,7 +320,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
-			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
+			wsss.send(ExexuteMove(JSON.stringify(ping),data.sn)) 
 		}
 
 		canDraw = false;
@@ -361,7 +361,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
-			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
+			wsss.send(ExexuteMove(JSON.stringify(ping),data.sn)) 
 		} else {
 			let ping
 			for (let i = 0; i < touchfor.length; i++) {
@@ -381,7 +381,7 @@ var draw_graph = function(graphType, obj) {
 			}
 
 			// wsss.send(JSON.stringify(ping));
-			wsss.send(ExexuteMove(JSON.stringify(ping)),data.sn) 
+			wsss.send(ExexuteMove(JSON.stringify(ping),data.sn)) 
 		}
 
 

+ 21 - 22
screenIos/WXdraw.js

@@ -119,9 +119,9 @@ wsss.onopen = function() {
 		},
 		"event": "bitRate"
 	}
-	console.log('打开安卓卡==============', data.sn)
+	console.log('打开安卓卡wsss.onopen========', data.sn)
 	// wsss.send(JSON.stringify(bitRate));
-	wsss.send(ExexuteMove(JSON.stringify(bitRate)),data.sn) 
+	wsss.send(ExexuteMove(JSON.stringify(bitRate), data.sn))
 };
 wsss.onmessage = function(event) {
 	// console.log("onMessage==============", event);
@@ -171,7 +171,7 @@ $(".botmat1img").on("click", function() {
 		// 	"event": "keyCode"
 		// }
 		// console.log("打印主页json", JSON.stringify(bitRate))
-		wsss.send(ExexuteKeyBoard(3),data.sn);
+		wsss.send(ExexuteKeyBoard(3), data.sn);
 		// console.log("打印主页json", wsss)
 	} else if (codes == "return") {
 		// var bitRate = {
@@ -181,7 +181,7 @@ $(".botmat1img").on("click", function() {
 		// 	"event": "keyCode"
 		// }
 		// wsss.send(JSON.stringify(bitRate));
-		wsss.send(ExexuteKeyBoard(4),data.sn);
+		wsss.send(ExexuteKeyBoard(4), data.sn);
 	} else if (codes == "gengduo") {
 		// var bitRate = {
 		// 	"data": {
@@ -190,7 +190,7 @@ $(".botmat1img").on("click", function() {
 		// 	"event": "keyCode"
 		// }
 		// wsss.send(JSON.stringify(bitRate));
-		wsss.send(ExexuteKeyBoard(187),data.sn);
+		wsss.send(ExexuteKeyBoard(187), data.sn);
 	}
 
 })
@@ -205,8 +205,8 @@ $(".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('打开安卓卡11==============', data.sn)
+	wsss.send(ExexuteMove(JSON.stringify(bitRate), data.sn))
 	console.log(id)
 })
 
@@ -255,9 +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,data.sn)
+			console.log('打开安卓卡鼠标按下获取 开始xy开始画图======', data.sn)
+			wsss.send(ExexuteMove(JSON.stringify(ping), data.sn))
+			console.log("鼠标按下>>>", ping, data.sn)
 		} else {
 			let ping
 			for (let i = 0; i < touchfor.length; i++) {
@@ -276,9 +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,data.sn)
+			console.log('打开安卓卡=22=============', data.sn)
+			wsss.send(ExexuteMove(JSON.stringify(ping), data.sn))
+			console.log("鼠标按下>>>", ping, data.sn)
 		}
 
 		canDraw = true;
@@ -310,8 +310,8 @@ 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('打开安卓卡==33============', data.sn)
+			wsss.send(ExexuteMove(JSON.stringify(ping), data.sn))
 
 		} else {
 			let ping
@@ -331,8 +331,8 @@ 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('打开安卓卡=55=============', data.sn)
+			wsss.send(ExexuteMove(JSON.stringify(ping), data.sn))
 		}
 
 		canDraw = false;
@@ -373,8 +373,8 @@ 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('打开安卓卡==66============', data.sn)
+			wsss.send(ExexuteMove(JSON.stringify(ping), data.sn))
 		} else {
 			let ping
 			for (let i = 0; i < touchfor.length; i++) {
@@ -394,8 +394,8 @@ 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('打开安卓卡==88============', data.sn)
+			wsss.send(ExexuteMove(JSON.stringify(ping), data.sn))
 		}
 
 
@@ -426,4 +426,3 @@ var draw_graph = function(graphType, obj) {
 function chooseImg(obj) {
 
 }
-

+ 1 - 0
screenIos/helper.js

@@ -29,6 +29,7 @@
  //jsonCmd: json命令
  //返回值:生成一个Uint8Array,通过websocket发送给板卡
  function makeFrame(sn, dataType, jsonCmd) {
+	 console.log("makeFramemakeFrame",sn)
  	var index = 0;
  	var dataLen = jsonCmd.length;
  	var frameLen = dataLen + 26;