hrsass-components 1.7.24 → 1.7.25

package/lib/hrsass-components.js

@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
 var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
 var saveSvgAsPng = require('save-svg-as-png');
 
-var version = "1.7.24";
+var version = "1.7.25";
 
 /**
  * 版本号
@@ -1955,6 +1955,18 @@ function Photograph () {
     ws.binaryType = "arraybuffer";
 
     ws.onmessage = function (event) {
+      if (typeof event.data == "string") {
+        if (event.data.indexOf("GetPicBase64:") >= 0) {
+          var strTemp = event.data.substr(13);
+          InfoTextCallback(5, strTemp);
+        } else if (event.data.indexOf("GetPic2Base64:") >= 0) {
+          var strTemp = event.data.substr(14);
+          InfoTextCallback(21, strTemp);
+        }
+
+        return;
+      }
+
       var aDataArray = new Uint8Array(event.data);
 
       if (aDataArray.length > 0) {
@@ -2382,6 +2394,7 @@ function Photograph () {
 
     ws.onopen = function (event) {
       if (enableCanvas) {
+        sendSendStrBase64();
         sendMsgGetMainCameraID();
         sendMsgRefreshDev();
         initParameter(orignalCanvasW, orignalCanvasH, orignalCanvasW2, orignalCanvasH2);
@@ -3040,6 +3053,15 @@ function Photograph () {
     ws.send(aDataArray.buffer);
   }
 
+  function sendSendStrBase64() {
+    var aDataArray = new Uint8Array(4);
+    aDataArray[0] = 0xef;
+    aDataArray[1] = 0xb2;
+    aDataArray[2] = 0x01;
+    aDataArray[3] = 0x01;
+    ws.send(aDataArray.buffer);
+  }
+
   function GetFaceZuobiao(Xdis, Ydis) {
     if (isFaceOpen) {
       for (var j = 0; j < faceNum; j++) {
@@ -3170,20 +3192,23 @@ var HrPhotograph = {
   },
   computed: {
     loading: function loading() {
-      return this.connNum < this.deviceNum || this.deviceNum === 0 || this.capturing;
+      return this.connNum < 1 || this.deviceNum === 0 || this.capturing;
     }
   },
   methods: {
     changeDevice: function changeDevice(device) {
       this.activeDevice = device;
+      this.connNum = 0;
+      device === '2' ? (this.photograph.closeMain(), this.photograph.openSub()) : (this.photograph.closeSub(), this.photograph.openMain());
     },
     open: function open() {
       var _this = this;
 
       this.visible = true;
-      this.photograph.open();
       this.$nextTick(function () {
         _this.initPhotograph();
+
+        _this.photograph.open();
       });
     },
     close: function close() {
@@ -3230,7 +3255,8 @@ var HrPhotograph = {
   created: function created() {
     var _this2 = this;
 
-    var WsUtil;
+    var WsUtil,
+        $this = this;
     var photograph = {
       ratioW: null,
       ratioH: null,
@@ -3251,11 +3277,7 @@ var HrPhotograph = {
         WsUtil.sendMsgStartVideo2(WsUtil.camidSub, this.subRatioW, this.subRatioH);
       },
       open: function open() {
-        this.openMain();
-
-        if (this.isSecondDev) {
-          this.openSub();
-        }
+        $this.changeDevice('1');
       },
       closeMain: function closeMain() {
         WsUtil.sendMsgCloseVideo();
@@ -3366,7 +3388,7 @@ var HrPhotograph = {
     canvasSub.height = 375;
     this.canvasMain = canvasMain;
     this.canvasSub = canvasSub;
-    this.WsUtil.WsInit(510, 375, 505, 375, true, this.canvasMain, this.canvasSub);
+    this.WsUtil.WsInit(510, 375, 505, 375, true, this.canvasMain, this.canvasSub, '');
 
     window.onmousewheel = document.onmousewheel = function (e) {
       return _this2.onmousewheel(e);