react_hsbc_teller 2.0.29 → 2.0.31

package/package.json

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

package/packages/api/api.js

@@ -105,6 +105,22 @@ class API extends Server{
       throw err;
     }
   }
+  /**
+   *  用途：开启业务录制
+   *  @url https://api.cangdu.org/shopro/data/products
+   *  返回http_code为200表示成功
+   *  @method post
+   *  @return {promise}
+   */
+  async startBusinessRecord(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/business/record', params); 
+      return result
+    }catch(err){
+      throw err;
+    }
+  }
   /**
    *  用途：人脸检测
    *  @url https://api.cangdu.org/shopro/data/products

package/packages/demo/demo.js

@@ -236,6 +236,7 @@ userExit =(val)=>{
                             salesBranchCode={this.state.salesBranchCode}
                             financialOffice={this.state.financialOffice}
                             onLeaveRoom={this.onLeaveRoom}
+                            getBusinessData={() => { return { businessList: [], businessType: 'REC' } }}
                             createRoomCallback={this.createRoomCallback}
                             joinRoomCallback={this.joinRoomCallback}
                             imgCallback={this.imgCallback}

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.29'
+const SDK_VERISON = '2.0.31'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -591,10 +591,11 @@ class Video extends Component {
     ];
     this.test_controller.InitRoomConfig(config_param)
     this.saveLog('mrtc InitRoomConfig start')
-    // 预热摄像头
-    config_param.videoSource = this.state.cameraValue
-    config_param.audioSource = this.state.microphoneValue
-    this.test_controller.PreOpenLocalMedia(config_param)
+
+    // 预热摄像头 （可能导致录屏插件发布时变成摄像头 以及重音问题，先注释掉）
+    // config_param.videoSource = this.state.cameraValue
+    // config_param.audioSource = this.state.microphoneValue
+    // this.test_controller.PreOpenLocalMedia(config_param)
   };
   rateAll = async () => {
     let data = ''
@@ -615,7 +616,7 @@ class Video extends Component {
     const that = this
     const SCALE = 1.5
     this.rateAll().then((res) => {
-      console.log('退出房间者', res)
+      console.log('开启录制', res)
       let list = [
         {
           tag: 'projectionWhiteboard',
@@ -687,13 +688,13 @@ class Video extends Component {
           width: 213 * SCALE,
           height: 175 * SCALE
         },
-        // {
-        //   tag: 'sharedScreen', // 一期暂时不需要录制
-        //   xPosition: 960,
-        //   yPosition: 180,
-        //   width: 320,
-        //   height: 180
-        // }
+        {
+          tag: 'sharedScreen', // 一期暂时不需要录制
+          xPosition: 960 * SCALE,
+          yPosition: 180 * SCALE,
+          width: 320 * SCALE,
+          height: 180 * SCALE
+        }
       ]
       Array.isArray(res) ?
         res.map((item) => {
@@ -736,7 +737,7 @@ class Video extends Component {
           enable: true,
           xPosition: 640 * SCALE, // x 轴位置
           yPosition: 10 * SCALE, // y 轴位置
-          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
+          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.state.salesBranchCode || ''} ${this.state.branchName || ''} ${this.state.financialOffice || ''}`,
           fontSize: 16 * SCALE, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
@@ -779,7 +780,7 @@ class Video extends Component {
           enable: true,
           xPosition: 640, // x 轴位置
           yPosition: 10, // y 轴位置
-          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
+          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.state.salesBranchCode || ''} ${this.state.branchName || ''} ${this.state.financialOffice || ''}`,
           fontSize: 16, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
@@ -1771,6 +1772,13 @@ class Video extends Component {
 
         }
 
+      } else if (Mival.typeId == 1219) {
+        // 传入分行信息
+        if (Mival.sessionId == this.state.sessionId && this.props.recordMode == 2) {
+          this.state.salesBranchCode = Mival.salesBranchCode;
+          this.state.financialOffice = Mival.financialOffice;
+          this.state.branchName = Mival.salesBranchName;
+        }
       } else if (Mival.typeId == 3100) {
         if(Mival.data.sessionId == this.state.sessionId) {
           muteJson.set(Mival.data.userId, JSON.stringify(Mival)) 
@@ -2770,6 +2778,10 @@ class Video extends Component {
       // 记录ipad摄像头流，需要单独开启录制
       if (feed.mediaSource == 'VIDEO_SOURCE_CAMERA' && feed.uid.includes(IPAD_SUFFIX)) {
         this.state.ipadTag = feed.tag;
+        // 如果已经开启了业务录制且ipad未在录制，立即开启ipad录制（ipad后加入）
+        if (this.state.businessId && !this.state.ipadRecordId) {
+          this.enableIpadRecording(this.state.businessId)
+        } 
       }
     };
     // 推送“有新订阅”给与会者
@@ -3029,6 +3041,7 @@ class Video extends Component {
       if (!record_third_id && third_id_Map.get(recordId)) {
         record_third_id = third_id_Map.get(recordId)
       }
+      console.log('record_third_id=', record_third_id)
       if (!record_third_id) {
         this.videoRecordCallback('2', true)
         this.saveLog('mrtc OnStopRemoteRecordSucc, recordId='+recordId)
@@ -4041,8 +4054,10 @@ class Video extends Component {
           // 业务录制
           this.state.businessRecordId = result.businessRecordId;
           this.state.businessId = result.businessId;
+          this.state.ipadRecordId = result.businessIpadRecordId;
           third_id_Map.set(result.businessRecordId, result.businessId);
-          console.log(third_id_Map)
+          third_id_Map.set(result.businessIpadRecordId, result.businessId+'_ipad');
+          console.log("third_id_map", third_id_Map)
           if (this.props.whetherDetectFace && this.props.recordMode != 2) this.startFaceDetection();
           if (this.props.whetherDetectLight && this.props.recordMode != 2) this.startImageDetection();
           if (this.props.whetherNeedAsr) this.startASR();
@@ -5724,13 +5739,41 @@ class Video extends Component {
       duration: 3
     })
   }
-  handleOkEnvDetection = () => {
+  handleOkEnvDetection = async () => {
     this.setState({
       isModalVisibleEnvironment: false,
     })
     if (!this.state.isPictureInPicture) {
       this.pictureInPicture()
     }
+    // 分行模式，需要自动开启业务录制
+    if (this.props.recordMode == 2) {
+      this.startBusinessRecord()
+    }
+  }
+
+  async startBusinessRecord() {
+    const busData = this.props.getBusinessData()
+    if (busData) {
+      try {
+        let result = await API.startBusinessRecord({
+          sessionId: this.state.sessionId,
+          roomId: this.state.channelId,
+          type: 1,
+          ...busData
+        });
+        console.log(result)
+        if (result.code == 200) {
+          console.log('成功')
+        } else if (result.code == 500) {
+          this.messageClick('服务异常，业务录制开启失败','error')
+        } else {
+          console.warn('业务录制开启失败', result.code, result.message)
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    }
   }
   // handleCancelEnvDetection = () => {
   //   this.setState({