react_hsbc_teller 2.0.16 → 2.0.18

package/package.json

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

package/packages/api/api.js

@@ -57,6 +57,30 @@ class API extends Server{
       throw err;
     }
   }
+  /**
+   *  用途：获取录制状态
+   *  @url https://api.cangdu.org/shopro/data/products
+   *  返回http_code为200表示成功
+   *  @method post
+   *  @return {promise}
+   */
+  async getRecordStatus(params = {}){
+    try{
+      let result = await this.axios('get', '/hsbc/record/status?roomId=' + params.roomId, params); 
+      if(result && result.code === 200){
+        return result.data||[];
+      }else{
+        let err = {
+          tip: '录制状态获取失败',
+          response: result,
+          data: params,
+        }
+        throw err;
+      }
+    }catch(err){
+      throw err;
+    }
+  }
   /**
    *  用途：人脸检测
    *  @url https://api.cangdu.org/shopro/data/products

package/packages/demo/demo.js

@@ -31,6 +31,7 @@ roomId
     // roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
     // baseURL:'https://counter-web.leimondata.cn:18082/api/leimon-counter-api',
     // 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/zuul/api/leimon-counter-api',
     resourcePath:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',

package/packages/pages/video/video.jsx

@@ -53,7 +53,7 @@ import Step from '../components/step/step.jsx'
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.16'
+const SDK_VERISON = '2.0.18'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -86,6 +86,7 @@ let muteJson = new Map()
 // let dateTime = 0
 let messageValue = ''
 let messageValueMap = new Map()
+let third_id_Map = new Map()
 // let beautyType = false
 // let beautyNum = 0  // 0-关闭  1--弱  2--中 5---高
 let rateList = []
@@ -1728,7 +1729,7 @@ class Video extends Component {
           }
         } else if (Mival.status == 2) {
           // 关闭了业务录制
-          console.log('业务录制关闭')
+          console.log('业务录制关闭', this.state.businessRecordId)
           this.saveLog('Stop business recording')
           this.test_controller.StopRemoteRecord(this.state.businessRecordId)
           this.state.businessId = '';
@@ -2760,6 +2761,10 @@ class Video extends Component {
     // 结束服务端录制成功
     this.test_controller.OnStopRemoteRecordSucc = (recordId, record_third_id) => {
       console.log('结束服务端录制成功', recordId, record_third_id);
+      // 重进会议前端会丢失之前的third_id，从服务端去取
+      if (!record_third_id && third_id_Map.get(recordId)) {
+        record_third_id = third_id_Map.get(recordId)
+      }
       if (!record_third_id) {
         this.videoRecordCallback('2', true)
         this.saveLog('mrtc OnStopRemoteRecordSucc, recordId='+recordId)
@@ -2779,6 +2784,10 @@ class Video extends Component {
       record_third_id
     ) => {
       console.log('结束服务端录制失败', recordId, err_code, err_msg, record_third_id)
+      // 重进会议前端会丢失之前的third_id，从服务端去取
+      if (!record_third_id && third_id_Map.get(recordId)) {
+        record_third_id = third_id_Map.get(recordId)
+      }
       if (!record_third_id) {
         this.videoRecordCallback('2', false)
         this.saveLog('mrtc OnStopRemoteRecordFailed, err_code='+err_code)
@@ -3349,6 +3358,7 @@ class Video extends Component {
         type: '2'
       });
       console.log(result);
+      this.queryRecordStatus()
       this.appGetUsername(document.getElementById('publish_video1').name)
       this.sendMessage({
           'typeId': 1014,
@@ -3507,7 +3517,7 @@ class Video extends Component {
       loading: true,
     })
     const that = this
-    axios.get(this.props.resourcePath + "/mcu.js")
+    axios.get(this.props.resourcePath + `/mcu.js?v=${SDK_VERISON}`)
       .then(response => this.addToScriptClick()).catch(function (error) {
         console.log(error);
         that.state.sessionType = false
@@ -3718,6 +3728,34 @@ class Video extends Component {
       }
     }
   };
+  queryRecordStatus = async()=>{
+    try {
+      let result = await API.getRecordStatus({
+        roomId: this.state.channelId + ''
+      });
+      console.log('RecordStatus', result)
+      if (result.fullRecordStatus == 1) { // 1开启 2未开启
+        // 全局录制
+        this.state.recordId = result.fullRecordId
+        if (result.businessRecordStatus == 1){
+          // 业务录制
+          this.state.businessRecordId = result.businessRecordId;
+          this.state.businessId = result.businessId;
+          third_id_Map.set(result.businessRecordId, result.businessId);
+          console.log(third_id_Map)
+          if (this.props.whetherDetectFace) this.startFaceDetection();
+          if (this.props.whetherDetectLight) this.startImageDetection();
+        }
+      } else {
+        this.state.recordId = ''
+      }
+    } catch (err) {
+      console.error(err);
+      if(err.status == 502 || err.status== 404) {
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
+      }
+    }
+  }
   isFileSuccuse = () => {
     if (!this.state.sessionId || !this.state.sessionType || !this.state.imStatus) {
       this.messageClick('当前程序异常请先退出重开', 'error')
@@ -6073,7 +6111,11 @@ class Video extends Component {
                       {!this.state.loading && this.state.sessionType && this.state.sessionId?
                       <div className='QRCode'>
                         <QRCode
-                            value={this.state.sessionId}  //value参数为生成二维码的链接
+                            value={JSON.stringify({
+                              sessionId:this.state.sessionId,
+                              staffId: this.props.tellerAccount,
+                              staffName: this.props.staffName
+                            })}  //value参数为生成二维码的链接
                             size={110} //二维码的宽高尺寸
                             fgColor="#000000"  //二维码的颜色
                         />