修改指令推流方式

screenAndroid/WXdraw.js

@@ -31,7 +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 = isWSS ? "wss://" + form.domainName + "/card?cardIp=" + form.ip : "ws://" + form.domainName + "/card?cardIp=" + form.ip;
+var cUrl = "ws://192.168.11.69:9101";
 
 var wsss,errorTime = 0;
 doConnect();
@@ -63,7 +64,7 @@ function doConnect() {
 			},
 			"event": "bitRate"
 		}
-		wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+		wsss.send(JSON.stringify(bitRate))
 	};
 	wsss.onclose = function (evt) {
 		console.log(evt);
@@ -125,7 +126,7 @@ $(".PictureQuality").on("click", function () {
 		},
 		"event": "bitRate"
 	}
-	wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+	wsss.send(JSON.stringify(bitRate))
 })
 
 //画图形
@@ -161,7 +162,7 @@ var draw_graph = function (graphType, obj) {
 					"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++) {
@@ -179,7 +180,7 @@ var draw_graph = function (graphType, obj) {
 				}
 
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn));
+			wsss.send(JSON.stringify(ping));
 		}
 		canDraw = true;
 	};
@@ -204,7 +205,7 @@ var draw_graph = function (graphType, obj) {
 					"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++) {
@@ -221,7 +222,7 @@ var draw_graph = function (graphType, obj) {
 					"event": "1"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 		canDraw = false;
 	};
@@ -253,7 +254,7 @@ var draw_graph = function (graphType, obj) {
 				}
 
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping;
 			for (var i = 0; i < touchfor.length; i++) {
@@ -270,7 +271,7 @@ var draw_graph = function (graphType, obj) {
 					"event": "2"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn));
+			wsss.send(JSON.stringify(ping));
 		};
 	};
 

screenAndroid/WXtrialInterface.html

@@ -171,6 +171,7 @@
 		var ip = parameters["ip"];
 		var domainName = parameters["domainName"];
 		var socketURL = isWSS ? "wss://" + domainName + "/card?cardIp=" + ip : "ws://" + domainName + "/card?cardIp=" + ip;
+		// var socketURL = "ws://192.168.11.69:9100";
 
 		var jmuxer = new JMuxer({
 			node: 'playerVideo',

screenAndroid/helper.js

@@ -40,10 +40,10 @@ function makeFrame(sn, dataType, jsonCmd) {
 	outPut[index++] = dataLen & 0x000000ff;
 	outPut[index++] = 0;//类型为client
 
-	//sn号赋值，string转ascii
-	for (i = 0; i < sn.length; i++) {
-		outPut[index++] = sn[i].charCodeAt();
-	}
+	// //sn号赋值，string转ascii
+	// for (i = 0; i < sn.length; i++) {
+	// 	outPut[index++] = sn[i].charCodeAt();
+	// }
 
 	outPut[index++] = dataType;//指定数据类型为json
 	//json string转ascii
@@ -61,28 +61,28 @@ function ExexuteKeyDown(code) {
 	var jsonObj = { "data": { "keyCode": code, "event": "keyDown" } };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 //触发鼠标按下事件，x：x坐标， y：y坐标
 function ExexuteMouseDown(x, y) {
 	var jsonObj = { "data": { "action": 0, "count": 1, "pointerId": 0, "x": x, "y": y }, "event": "0" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 //触发鼠标移动事件，x：x坐标， y：y坐标
 function ExexuteMouseMove(x, y) {
 	var jsonObj = { "data": { "action": 2, "count": 1, "pointerId": 0, "x": x, "y": y }, "event": "2" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 
 function ExexuteKeyBoard(keycode) {
 	var jsonObj = { "data": { "keyCode": keycode.toString() }, "event": "keyCode" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 
 //触发鼠标抬起事件，x：x坐标， y：y坐标
@@ -90,7 +90,7 @@ function ExexuteMouseUp(x, y) {
 	var jsonObj = { "data": { "action": 1, "count": 1, "pointerId": 0, "x": x, "y": y }, "event": "1" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 //触发滑动事件
 function ExexuteMove(data, sn) {