Merge branch 'uat' into dev-4.9.3

screenAndroid/WXdraw.js

@@ -34,8 +34,8 @@ var isWSS = true;
 var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
 // var cUrl = "ws://192.168.199.46:9101?token=test0123456789";
 var deviceBoard = parameters['deviceBoard'];
-var videoWidth = deviceBoard.substring(0, 2) === 'MTK' ? 1080 : 720
-var videoHeight = deviceBoard.substring(0, 2) === 'MTK' ? 1920 : 1280
+var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
+var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 var wsss,errorTime = 0;
 doConnect();
 function throttle(fn, delay) {

screenIos/WXdraw.js

@@ -31,8 +31,8 @@ form.domainName = parameters["domainName"];
 var isWSS = true;
 var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
 var deviceBoard = parameters['deviceBoard'];
-var videoWidth = deviceBoard.substring(0, 2) === 'MTK' ? 1080 : 720
-var videoHeight = deviceBoard.substring(0, 2) === 'MTK' ? 1920 : 1280
+var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
+var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 var wsss;
 var errorTime = 0;
 doConnect();

screenIos/WXtrialInterface.html

@@ -649,8 +649,8 @@
 		}
 		
 		var deviceBoard = parameters['deviceBoard'];
-		var videoWidth = deviceBoard.substring(0, 2) === 'MTK' ? 1080 : 720
-		var videoHeight = deviceBoard.substring(0, 2) === 'MTK' ? 1920 : 1280
+		var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
+		var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 		function decodeAAC(data) {
 			var retPtr = Module._malloc(4 * 5 * 1024); //接收的数据
 			var inputPtr = Module._malloc(4 * data.length); //输入数据
@@ -673,7 +673,7 @@
 			Module._free(inputPtr);
 			Module._free(retPtr);
 		}
-		var decodeWoker = new Worker('decoder.js');
+		var decodeWoker = new Worker('decoder.js?deviceBoard=' + deviceBoard);
 		var myVideo = document.getElementById("playCanvas");
 		decodeWoker.onmessage = function (event) {
 			var objData = event.data;

screenIos/decoder.js

@@ -4,8 +4,8 @@ var h264Queue = [];
 var isFirst = true;
 var parameters = GetRequest();
 var deviceBoard = parameters['deviceBoard'];
-var videoWidth = deviceBoard.substring(0, 2) === 'MTK' ? 1080 : 720
-var videoHeight = deviceBoard.substring(0, 2) === 'MTK' ? 1920 : 1280
+var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
+var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 
 var ret = ''
 self.Module = {