huangxiaojing 3 年之前
父節點
當前提交
4fa3ac84ad
共有 2 個文件被更改,包括 13 次插入14 次删除
  1. 2 3
      screenAndroid/WXdraw.js
  2. 11 11
      screenIos/WXdraw.js

+ 2 - 3
screenAndroid/WXdraw.js

@@ -31,8 +31,8 @@ form.userCardId = parameters["userCardId"];
 form.ip = parameters["ip"];
 form.domainName = parameters["domainName"];
 var isWSS = true;
-// var cUrl = isWSS ? "wss://" + form.domainName + "/card?cardIp=" + form.ip : "ws://" + form.domainName + "/card?cardIp=" + form.ip;
-var cUrl = "ws://192.168.199.46:9101?token=test0123456789";
+var cUrl = isWSS ? "wss://" + form.domainName + "/card?cardIp=" + form.ip : "ws://" + form.domainName + "/card?cardIp=" + form.ip;
+// var cUrl = "ws://192.168.199.46:9101?token=test0123456789";
 
 var wsss,errorTime = 0;
 doConnect();
@@ -67,7 +67,6 @@ function doConnect() {
 		wsss.send(JSON.stringify(bitRate))
 	};
 	wsss.onclose = function (evt) {
-		console.log(evt);
 		wsss.close();
 		throttle(doConnect,100);
 		if(errorTime > 1000){

+ 11 - 11
screenIos/WXdraw.js

@@ -63,7 +63,7 @@ function doConnect() {
 			},
 			"event": "bitRate"
 		}
-		wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+		wsss.send(JSON.stringify(bitRate))
 	};
 	wsss.onclose = function () {
 		wsss.close();
@@ -104,11 +104,11 @@ $(".upload").on("click", function () {
 $(".botmat1img").on("click", function () {
 	var codes = $(this).attr("data-text")
 	if (codes == "home") {
-		wsss.send(ExexuteKeyBoard(3, form.sn));
+		wsss.send(ExexuteKeyBoard(3), form.sn);
 	} else if (codes == "return") {
-		wsss.send(ExexuteKeyBoard(4, form.sn));
+		wsss.send(ExexuteKeyBoard(4), form.sn);
 	} else if (codes == "gengduo") {
-		wsss.send(ExexuteKeyBoard(187, form.sn));
+		wsss.send(ExexuteKeyBoard(187), form.sn);
 	}
 })
 //高清控制
@@ -121,7 +121,7 @@ $(".PictureQuality").on("click", function () {
 		},
 		"event": "bitRate"
 	}
-	wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+	wsss.send(JSON.stringify(bitRate))
 })
 var canDraw = false;
 //画图形
@@ -156,7 +156,7 @@ var draw_graph = function (graphType) {
 					"event": "0"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping
 			for (var i = 0; i < touchfor.length; i++) {
@@ -174,7 +174,7 @@ var draw_graph = function (graphType) {
 				}
 
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 
 		canDraw = true;
@@ -201,7 +201,7 @@ var draw_graph = function (graphType) {
 					"event": "1"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping
 			for (var i = 0; i < touchfor.length; i++) {
@@ -218,7 +218,7 @@ var draw_graph = function (graphType) {
 					"event": "1"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 		canDraw = false;
 	};
@@ -249,7 +249,7 @@ var draw_graph = function (graphType) {
 					"event": "2"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping
 			for (var i = 0; i < touchfor.length; i++) {
@@ -266,7 +266,7 @@ var draw_graph = function (graphType) {
 					"event": "2"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 	};