react_hsbc_teller 2.0.26 → 2.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",

package/packages/demo/demo.js

@@ -33,7 +33,7 @@ roomId
     // resourcePath: 'https://counter-web.leimondata.cn:7199',
     // resourcePath:'http://121.196.19.70:8027/',
     roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws',
-    baseURL:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuulsit/api/leimon-counter-api',
+    baseURL:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
     resourcePath:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
     prohibitPrompt: '无客户',
   titleBackground: '#40a9ff',
@@ -192,6 +192,10 @@ userExit =(val)=>{
             
           })
     }
+    componentDidCatch(error, info) {
+        console.log('componentDidCatch')
+        console.error(error, info)
+    }
   render() {
     return (
       <div className="test">

package/packages/pages/video/video.jsx

@@ -58,7 +58,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.26'
+const SDK_VERISON = '2.0.27'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -139,6 +139,7 @@ function clearStreamRemain() {
     beautyDiv.beauty_canvas = null;
   }
   if (!(beautyDiv.beauty_player == null || beautyDiv.beauty_player == undefined)) {
+    console.log('beautyDiv destroy')
     beautyDiv.beauty_player.destroy();
     beautyDiv.beauty_player = null;
   }
@@ -612,15 +613,16 @@ class Video extends Component {
   // 开启录制
   enableServerRecording = (record_business_id) => {
     const that = this
+    const SCALE = 1.5
     this.rateAll().then((res) => {
       console.log('退出房间者', res)
       let list = [
         {
           tag: 'projectionWhiteboard',
           xPosition: 0,
-          yPosition: 175,
-          width: 960,
-          height: 540
+          yPosition: 175 * SCALE,
+          width: 1280,
+          height: 720
         },
         // {
         //   tag: 'VIDEO_SOURCE_SCREEN_ONE',
@@ -640,50 +642,50 @@ class Video extends Component {
           tag: 'tag1',
           xPosition: 0,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer1',
-          xPosition: 213,
+          xPosition: 213 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer2',
-          xPosition: 426,
+          xPosition: 426 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer3',
-          xPosition: 639,
+          xPosition: 639 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer4',
-          xPosition: 852,
+          xPosition: 852 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer5',
-          xPosition: 1065,
+          xPosition: 1065 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer6',
-          xPosition: 1278,
+          xPosition: 1278 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         // {
         //   tag: 'sharedScreen', // 一期暂时不需要录制
@@ -697,18 +699,18 @@ class Video extends Component {
         res.map((item) => {
           list.push({
             tag: item.tag,
-            xPosition: item.xaxis,
-            yPosition: item.yaxis,
-            width: item.width,
-            height: item.height
+            xPosition: (item.xaxis * SCALE),
+            yPosition: (item.yaxis * SCALE),
+            width: (item.width * SCALE),
+            height: (item.height * SCALE)
           })
         }) :
         list.push({
           tag: 'VIDEO_SOURCE_SCREEN',
-          xPosition: 960,
-          yPosition: 535,
-          width: 320,
-          height: 180
+          xPosition: 960 * SCALE,
+          yPosition: 535 * SCALE,
+          width: 320 * SCALE,
+          height: 180 * SCALE
         })
       // list.push({
       //   tag: 'VIDEO_SOURCE_SCREEN_19_9',
@@ -719,8 +721,8 @@ class Video extends Component {
       // })
       const filePath = 'recordId_' + new Date().valueOf();
       const recordParam = {};
-      recordParam.width = 1280;
-      recordParam.height = 720;
+      recordParam.width = 1280 * SCALE;
+      recordParam.height = 720 * SCALE;
       recordParam.recordTotalStream = 0;
       recordParam.startTimeout = 10;
       recordParam.splitType = 0;
@@ -732,10 +734,10 @@ class Video extends Component {
           type: 2, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
           id: 2, // ⽔印 ID
           enable: true,
-          xPosition: 640, // x 轴位置
-          yPosition: 10, // y 轴位置
+          xPosition: 640 * SCALE, // x 轴位置
+          yPosition: 10 * SCALE, // y 轴位置
           text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
-          fontSize: 16, // 字体⼤⼩
+          fontSize: 16 * SCALE, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
         {
@@ -743,10 +745,10 @@ class Video extends Component {
           type: 1, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
           id: 1, // ⽔印 ID
           enable: true,
-          xPosition: 1080, // x 轴位置
-          yPosition: 10, // y 轴位置
+          xPosition: 1080 * SCALE, // x 轴位置
+          yPosition: 10 * SCALE, // y 轴位置
           text: '', // ⽔印⽂字
-          fontSize: 16, // 字体⼤⼩
+          fontSize: 16 * SCALE, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
       ];
@@ -3566,6 +3568,11 @@ class Video extends Component {
       }
     }
   }
+  componentDidCatch(error, info) {
+    console.log('componentDidCatch')
+    console.error(error, info)
+  }
+
   componentWillUnmount() {
     this.saveLog('Exit meeting')
     if (this.test_controller && this.state.sessionType) {
@@ -3868,7 +3875,7 @@ class Video extends Component {
     })
     this.asr_controller = new MyAsrController({
       token: this.state.asrToken,
-      appkey: this.state.asrAppKey,
+      appKey: this.state.asrAppKey,
       url: this.state.asrServerUrl,
       recorder: this.state.recorder
     })
@@ -5697,7 +5704,7 @@ class Video extends Component {
     this.setState({
       isModalVisibleEnvironment: false,
     })
-    if (!this.state.isPictureInPicture && this.props.recordMode != 2) {
+    if (!this.state.isPictureInPicture) {
       this.pictureInPicture()
     }
   }

package/packages/utils/asrController.js

@@ -37,8 +37,9 @@ let websocket_audio2txt_complete_time_end = 100;  //websocket 语音转文本
 
 export default class MyAsrController {
   constructor(headers) {
+    console.log('MyAsrController', headers, headers.appKey)
     this.token = headers.token || 'default';
-    this.appKey = headers.appKey || 'E6DAPlpMun5L2dJ7';
+    this.appKey = headers.appKey;
     this.url = headers.url;
 
     //初始化录音实例
@@ -97,7 +98,11 @@ export default class MyAsrController {
   }
   
   Disconnect() {
-    this.recorderInstance.stop();
+    try { 
+      this.recorderInstance.stop();
+    } catch(err){
+      console.log(err)
+    }
     clearInterval(this.interval);
     this.websocketStopTranscription()
   }