Merge branch 'dev-5.0' into uat-new

screenAndroid/WXdraw.js

@@ -32,8 +32,8 @@ form.ip = parameters["ip"];
 form.domainName = parameters["domainName"];
 var isWSS = true;
 var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken;
-var videoWidth = 720
-var videoHeight = 1280
+var videoWidth = parameters['mealType'] === "STARPRO" || parameters['mealType'] === "STAR" ? 1080 : 720
+var videoHeight = parameters['mealType'] === "STARPRO" || parameters['mealType'] === "STAR" ? 1920 : 1280
 
 var wsss, errorTime = 0;
 var first = true;
@@ -75,11 +75,6 @@ function doConnect() {
       }
     }
     wsss.send(JSON.stringify(screenPic));
-    // 获取分辨率
-    var phoneSize = {
-      "type": "getPhoneSize"
-    }
-    wsss.send(JSON.stringify(phoneSize));
   };
   wsss.onerror = function (evt) {
     wsss.close();
@@ -106,13 +101,6 @@ function doConnect() {
       }
       return
     }
-    if (result.type === 'getPhoneSize') {
-      if (result.data.status === 0) {
-        videoWidth = result.data.width
-        videoHeight = result.data.height
-      }
-      return
-    }
     var unit8Arr = new Uint8Array(result);
     if (unit8Arr[0] == 0x68 && unit8Arr[1] == 0x09 && first) {
       first = false;

screenIos/WXdraw.js

@@ -31,8 +31,8 @@ form.ip = parameters['ip'];
 form.domainName = parameters["domainName"];
 var isWSS = true;
 var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken;
-var videoWidth = 720
-var videoHeight = 1280
+var videoWidth = parameters['mealType'] === "STARPRO" || parameters['mealType'] === "STAR" ? 1080 : 720
+var videoHeight = parameters['mealType'] === "STARPRO" || parameters['mealType'] === "STAR" ? 1920 : 1280
 var wsss;
 var errorTime = 0;
 var first = true;
@@ -75,11 +75,6 @@ function doConnect() {
       }
     }
     wsss.send(JSON.stringify(screenPic));
-    // 获取分辨率
-    var phoneSize = {
-      "type": "getPhoneSize"
-    }
-    wsss.send(JSON.stringify(phoneSize));
   };
   wsss.onerror = function () {
     wsss.close();
@@ -106,13 +101,6 @@ function doConnect() {
       }
       return
     }
-    if (result.type === 'getPhoneSize') {
-      if (result.data.status === 0) {
-        videoWidth = result.data.width
-        videoHeight = result.data.height
-      }
-      return
-    }
     var unit8Arr = new Uint8Array(result);
     if (unit8Arr[0] == 0x68 && unit8Arr[1] == 0x09 && first) {
       first = false;

screenIos/WXtrialInterface.html

@@ -636,9 +636,7 @@
       Module._free(inputPtr);
       Module._free(retPtr);
     }
-    var vWidth = Number(parameters['width']) ? Number(parameters['width']) : videoWidth;
-    var vHeight = Number(parameters['height']) ? Number(parameters['height']) : videoHeight;
-    var decodeWoker = new Worker('decoder.js?width=' + vWidth + '&height=' + vHeight);
+    var decodeWoker = new Worker('decoder.js?width=' + videoWidth + '&height=' + videoHeight);
     var myVideo = document.getElementById("playCanvas");
     decodeWoker.onmessage = function (event) {
       var objData = event.data;
@@ -650,7 +648,7 @@
           if (renderCount++ < 4 || !isAudioPlay) {
             return
           }
-          webglPlayer.renderFrame(objData.data, vWidth, vHeight, vWidth * vHeight, (vWidth / 2) * (vHeight / 2));
+          webglPlayer.renderFrame(objData.data, videoWidth, videoHeight, videoWidth * videoHeight, (videoWidth / 2) * (videoHeight / 2));
           $('.weui-mask_transparent').hide()
           $('.weui-toast').hide()
           $('.loading').hide()