优化

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.11:9101"
+var cUrl = "ws://192.168.198.12:9100"
 // if (data.clientType == 3) {
 // 	cUrl = "wss://" + urlss + "/authControlWebSocket?" + "clientType=" + data.clientType + "&username=" + data.username +
 // 		"&userCardId=" + data.userCardId

screenAndroid/WXtrialInterface.html

@@ -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.11:9101"
+				var socketURL = "ws://192.168.198.12:9100"
 				// socketURL = "ws://14.215.128.98:14077";
 				//socketURL = "wss://192.168.11.242:9104";
 

screenIos/WXdraw.js

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

screenIos/helper.js

@@ -1,125 +1,191 @@
- //此文件实现将控制命令封装成协议，具体协议内容请看：
-//链接：http://note.youdao.com/noteshare?id=dabda6c613adef7a416bd2625cd770a1
- 
+//此文件实现将控制命令封装成协议，具体协议内容请看：
+ //链接：http://note.youdao.com/noteshare?id=dabda6c613adef7a416bd2625cd770a1
+
  //bcc校验码计算
  //arry: 要计算的数组
  //返回计算协议中校验位的校验码
- function calBcc(arry)
- {
-	var bcc = 0;
-	for(i = 0;i < arry.length;i++)
-	{
-		bcc ^= arry[i];
-	}
-	return bcc;
+ function calBcc(arry) {
+ 	var bcc = 0;
+ 	for (i = 0; i < arry.length; i++) {
+ 		bcc ^= arry[i];
+ 	}
+ 	return bcc;
  }
- 
+
  //数组打印，调试用
- function PrintArry(data)
- {
-	 var str = "";
-	 
-	 for(i = 0;i < data.length;i++)
-	 {
-		 str =  str + data[i].toString(16).padStart(2,'0');
-	 }
-	 
-	 str = str.toUpperCase();
-	 return str;
+ function PrintArry(data) {
+ 	var str = "";
+
+ 	for (i = 0; i < data.length; i++) {
+ 		str = str + data[i].toString(16).padStart(2, '0');
+ 	}
+
+ 	str = str.toUpperCase();
+ 	return str;
  }
- 
+
  //sn:板卡sn号，stirng
  //type：数据类型，数字
  //jsonCmd: json命令
  //返回值：生成一个Uint8Array，通过websocket发送给板卡
- function makeFrame(sn, dataType, jsonCmd)
- {
-	 var index = 0;
-	 var dataLen  = jsonCmd.length;
-	 var frameLen = dataLen + 26;
-	 var outPut = new Uint8Array(frameLen);
-	 outPut[index++] = 0x68;
-	 outPut[index++] = (dataLen & 0xff000000) >> 24;
-	 outPut[index++] = (dataLen & 0x00ff0000) >> 16;
-	 outPut[index++] = (dataLen & 0x0000ff00) >> 8;
-	 outPut[index++] =  dataLen & 0x000000ff;
-	 outPut[index++] = 0;//类型为client
-	 
-	 //sn号赋值，string转ascii
-	 for( i = 0;i< sn.length;i++)
-	 {
-		 outPut[index++] = sn[i].charCodeAt();
-	 }
-	 
-	 outPut[index++] = dataType;//指定数据类型为json
-	 //json string转ascii
-	 for( i = 0;i< jsonCmd.length;i++)
-	 {
-		 outPut[index++] = jsonCmd[i].charCodeAt();
-	 }
-	 
-	 var bccBuffer = outPut.slice(1, frameLen-3 + 1);//忽略协议头和协议尾
-	 outPut[index++] = calBcc(bccBuffer);
-	 outPut[index++] = 0x16;
-	 // console.log("打印数组:%s", PrintArry(outPut));
-	 console.log("数组长度:%d", outPut.length);
-	 //return PrintArry(outPut);
-	 return outPut;
+ function makeFrame(sn, dataType, jsonCmd) {
+ 	var index = 0;
+ 	var dataLen = jsonCmd.length;
+ 	var frameLen = dataLen + 26;
+ 	var outPut = new Uint8Array(frameLen);
+ 	outPut[index++] = 0x68;
+ 	outPut[index++] = (dataLen & 0xff000000) >> 24;
+ 	outPut[index++] = (dataLen & 0x00ff0000) >> 16;
+ 	outPut[index++] = (dataLen & 0x0000ff00) >> 8;
+ 	outPut[index++] = dataLen & 0x000000ff;
+ 	outPut[index++] = 0; //类型为client
+
+ 	//sn号赋值，string转ascii
+ 	for (i = 0; i < sn.length; i++) {
+ 		outPut[index++] = sn[i].charCodeAt();
+ 	}
+
+ 	outPut[index++] = dataType; //指定数据类型为json
+ 	//json string转ascii
+ 	for (i = 0; i < jsonCmd.length; i++) {
+ 		outPut[index++] = jsonCmd[i].charCodeAt();
+ 	}
+
+ 	var bccBuffer = outPut.slice(1, frameLen - 3 + 1); //忽略协议头和协议尾
+ 	outPut[index++] = calBcc(bccBuffer);
+ 	outPut[index++] = 0x16;
+ 	// console.log("打印数组:%s", PrintArry(outPut));
+ 	console.log("数组长度:%d", outPut.length);
+ 	//return PrintArry(outPut);
+ 	return outPut;
  }
  //触发键盘事件, code表示键盘值
- function ExexuteKeyDown(code,sn)
- {	 
-	 var jsonObj = {"data":{"keyCode":code, "event":"keyDown"}};
-	 var json = JSON.stringify(jsonObj);
-	 console.log("json==================",json);
-	 // var sn = "RK3923C1201900139";
-	 return makeFrame(sn, 0, json);
+ function ExexuteKeyDown(code, sn) {
+ 	var jsonObj = {
+ 		"data": {
+ 			"keyCode": code,
+ 			"event": "keyDown"
+ 		}
+ 	};
+ 	var json = JSON.stringify(jsonObj);
+ 	console.log("json==================", json);
+ 	// var sn = "RK3923C1201900139";
+ 	return makeFrame(sn, 0, json);
  }
  //触发鼠标按下事件，x：x坐标， y：y坐标
- function ExexuteMouseDown(x, y,sn)
- {
-	 var jsonObj = {"data":{"action":0, "count":1, "pointerId":0,"x":x, "y":y}, "event":"0"};
-	 var json = JSON.stringify(jsonObj);
-	 console.log("json==================",json);
-	 // var sn = "RK3923C1201900139";
-	 return  makeFrame(sn, 0, json);
+ function ExexuteMouseDown(x, y, sn) {
+ 	var jsonObj = {
+ 		"data": {
+ 			"action": 0,
+ 			"count": 1,
+ 			"pointerId": 0,
+ 			"x": x,
+ 			"y": y
+ 		},
+ 		"event": "0"
+ 	};
+ 	var json = JSON.stringify(jsonObj);
+ 	console.log("json==================", json);
+ 	// var sn = "RK3923C1201900139";
+ 	return makeFrame(sn, 0, json);
  }
-  //触发鼠标移动事件，x：x坐标， y：y坐标
- function ExexuteMouseMove(x, y,sn)
- {
-	 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);	 
+ //触发鼠标移动事件，x：x坐标， y：y坐标
+ function ExexuteMouseMove(x, y, sn) {
+ 	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);
  }
- 
- function ExexuteKeyBoard(keycode,sn)
- {
- 	 var jsonObj = {"data":{"keyCode":keycode.toString()},"event":"keyCode"};
- 	 var json = JSON.stringify(jsonObj);
- 	 // var sn = "RK3923C1201900139";
- 	 return  makeFrame(sn, 0, json);	 
+
+ function ExexuteKeyBoard(keycode, sn) {
+ 	var jsonObj = {
+ 		"data": {
+ 			"keyCode": keycode.toString()
+ 		},
+ 		"event": "keyCode"
+ 	};
+ 	var json = JSON.stringify(jsonObj);
+ 	// var sn = "RK3923C1201900139";
+ 	return makeFrame(sn, 0, json);
  }
- 
-  //触发鼠标抬起事件，x：x坐标， y：y坐标
- function ExexuteMouseUp(x, y,sn)
- {
-	 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);	 
+
+ //触发鼠标抬起事件，x：x坐标， y：y坐标
+ function ExexuteMouseUp(x, y, sn) {
+ 	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);
  }
  //触发滑动事件
- function ExexuteMove(data,sn)
- {
- 	 // 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, data);	 
+ function ExexuteMove(data, sn) {
+ 	// 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, data);
  }
  //示例：
  //var sn = "RK3923C1201900139";
  //var json = "{\"data\":{\"keyCode\":24},\"type\":\"keyDown\"}";
-// makeFrame(sn, 0, json);
-//ExexuteKeyDown()
- 
+ // makeFrame(sn, 0, json);
+ //ExexuteKeyDown()
+
+
+
+ // 加个请求I帧的报文
+ function RequestIFrame(sn) {
+ 	console.log('加个请求I帧的报文')
+ 	var outPut = new Uint8Array([0x20])
+ 	return makeFrameExtend(sn, 6, outPut)
+ }
+
+ function makeFrameExtend(sn, dataType, body) {
+ 	var index = 0
+ 	var dataLen = body.length
+ 	var frameLen = dataLen + 26
+ 	var outPut = new Uint8Array(frameLen)
+ 	outPut[index++] = 0x68
+ 	outPut[index++] = (dataLen & 0xff000000) >> 24
+ 	outPut[index++] = (dataLen & 0x00ff0000) >> 16
+ 	outPut[index++] = (dataLen & 0x0000ff00) >> 8
+ 	outPut[index++] = dataLen & 0x000000ff
+ 	outPut[index++] = 0 // 类型为client
+
+ 	// sn号赋值，string转ascii
+ 	for (let i = 0; i < sn.length; i++) {
+ 		outPut[index++] = sn[i].charCodeAt()
+ 	}
+
+ 	outPut[index++] = dataType // 指定数据类型为json
+ 	// json string转ascii
+ 	for (let i = 0; i < body.length; i++) {
+ 		outPut[index++] = body[i]
+ 	}
+
+ 	var bccBuffer = outPut.slice(1, frameLen - 3 + 1) // 忽略协议头和协议尾
+ 	outPut[index++] = calBcc(bccBuffer)
+ 	outPut[index++] = 0x16
+ 	return outPut
+ }
+
+ function ConfigChannel(sn) {
+ 	var outPut = new Uint8Array([0x07])
+ 	return makeFrameExtend(sn, 6, outPut)
+ }

screenIos/homeNew.html

@@ -44,7 +44,7 @@
 		<meta name="msapplication-tap-highlight" content="no">
 
 		<title></title>
-		<link rel="stylesheet" href="../static/css/homeNew.css?id=103">
+		<link rel="stylesheet" href="../static/css/homeNew.css?id=104">
 		<link rel="stylesheet" type="text/css" href="../static/css/swiper-bundle.min.css" />
 		<script src="../static/css/swiper-bundle.min.js"></script>
 		<style>
@@ -118,7 +118,7 @@
 									</div>
 									<div class="th_right">
 										<div class="thl-font">{{item.diskName}}</div>
-										<div class="thl-time">{{remainTime(item.ctime,item.exceptTime)}}</div>
+										<div class="thl-time">剩{{remainTime(item.ctime,item.exceptTime)}}</div>
 									</div>
 								</div>
 								<div class="th_renew homeRenew" style="z-index: 5000;" @click="renew(item)">
@@ -263,6 +263,7 @@
 					swipeDirection: "",
 				},
 				mounted() {
+					
 					// //初始化一下就可以了，
 					let vConsole = new VConsole();
 					//			 //你打印的数据 比如
@@ -697,6 +698,9 @@
 										var decodeWoker = new Worker('decoder.js');
 										var id = 'playCanvas' + activeIndex;
 										var myVideo = document.getElementById(id);
+										
+										decodeWoker.postMessage(RequestIFrame(that.homeList[0].sn));
+										
 										var isDrag = false;
 										console.log("首页=====", id);
 										// var secanv = document.getElementById(id);

screenIos/websocket.js

@@ -1,7 +1,8 @@
 self.importScripts("helper.js");
 // self.importScripts("pcm-player.js");
 // self.importScripts("pcm-player.min.js");   
-var socketURL = "ws://192.168.198.11:9101";
+var socketURL = "ws://192.168.198.12:9100";
+// var socketURL = "14.215.128.98:14102";
 // var socketURL = "ws://14.215.128.98:14102"
 // socketURL = "ws://127.0.0.1:8081"
 

static/css/homeNew.css

@@ -98,10 +98,10 @@
 	width: 94%;
 	background: rgba(0, 0, 0, 0.4);
 	font-size: 14px;
-	padding: 0px 10px 0px 10px;
+	padding: 0px .75rem 0px .75rem;
 	color: rgba(255, 255, 255, 1);
 	margin-top: 7px;
-	border-radius: 20px;
+	border-radius: 20px 20px 0 0;
 	box-sizing: border-box;
 	left: 0;
 	margin-left: 3%;
@@ -495,5 +495,5 @@ canvas {
 
 .thl-time {
 	text-align: left;
-	margin-left: -0.4rem !important;
+	margin-left: -0.1rem !important;
 }