react_hsbc_teller 2.0.70 → 2.0.72

package/package.json

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

package/packages/demo/demo.js

@@ -15,7 +15,7 @@ class Demo extends Component {
     // sessionId: '',
     pdfRendering: false,
     isVideo: false,
-    tellerAccount: 'wmzTeller',
+    tellerAccount: '20250528',
     // callbackUrl: 'http://182.92.184.31:8720/hsbc/callback',
     callbackUrl: 'https://aag.wealth-platform.uat.ali.cloud.cn.hsbc/nosaml/api/appointment/wealth/api/v1/appointment/ali/createMeetingRoom',
     businessNumber: '123',
@@ -26,7 +26,7 @@ class Demo extends Component {
     // resourcePath:'http://121.196.19.70:8027/',
     roomServerUrl: 'wss://uat.mpaas.investments.hsbc.com.hk:31000/mpaas/mrtc/ws',
     // 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',
+    baseURL:'https://uat.mpaas.investments.hsbc.com.hk:31000/wealth/zuul/api/leimon-counter-api',
     resourcePath:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
     prohibitPrompt: '无客户',
   titleBackground: '#40a9ff',
@@ -42,7 +42,8 @@ class Demo extends Component {
   customerId: "testCustomerId", //客户号
   salesBranchCode: 'salesBranchCode', //网点编号(分行号)
   financialOffice: "defaultOfficeId", // 理财室
-  audioinputNameList: ['默认值 - 外部麦克风 (Realtek(R) Audio)']
+  audioinputNameList: ['默认值 - 外部麦克风 (Realtek(R) Audio)'],
+  needPreSale: false
 }
 componentWillMount() {
     if(window.localStorage.getItem('sessionId') && window.localStorage.getItem('sessionId') != 'null' && window.localStorage.getItem('sessionId') != 'undefined') {
@@ -213,6 +214,7 @@ userExit =(val)=>{
                     this.state.isVideo ?
                     <div>
                         <HSBC
+                        needPreSale={this.state.needPreSale}
                         isOpenSound={true}
                         shareMask={this.state.shareMask}
                         pdfRendering={this.state.pdfRendering}

package/packages/pages/video/video.jsx

@@ -63,7 +63,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.70'
+const SDK_VERISON = '2.0.72'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -348,7 +348,11 @@ class Video extends Component {
     faceDetectionTimer: null, // 人脸检测定时器
     mediaErrorModalMessage: '',
     transcribeErrorModalVisible: false, // 双录异常
-    transcribeErrorCode: ''
+    transcribeErrorCode: '',
+    presaleRecordId: '',
+    salePresaleRecordId: '',
+    supplesalePresaleRecordId: ''
+
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -356,7 +360,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller='+ SDK_VERISON +'&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
+      baseURL: this.props.logUrl + '&message=SDK:' + encodeURIComponent(val) + '&react_hsbc_teller='+ SDK_VERISON +'&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -406,7 +410,7 @@ class Video extends Component {
       publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
       publish_config.publish_video_id = 'publish_video1'
       publish_config.publish_streamId_id = 'publish_streamId1'
-      publish_config.publish_tag = 'tag1'
+      publish_config.publish_tag = 'tag1customer'
       if (this.props.recordMode == 2) {
         // 分行模式，只收音 不发布摄像头
         publish_config.media_type = 2
@@ -560,7 +564,7 @@ class Video extends Component {
       {
         publish_video_id: 'publish_video1',
         publish_streamId_id: 'publish_streamId1',
-        publish_tag: 'tag1'
+        publish_tag: 'tag1customer'
       },
       // {
       //   publish_video_id: 'publish_video2',
@@ -629,6 +633,135 @@ class Video extends Component {
       return data
     }
   }
+  // 开启音频录制
+  enableAudioRecording = (record_business_id, type) => {
+    console.log('enableAudioRecording', record_business_id, type)
+    // true开启
+    console.log(this.props.needPreSale, type == 'presale' && !this.props.needPreSale)
+    if(!(type == 'presale' && !this.props.needPreSale)){
+    const that = this
+    const SCALE = 1.5
+    this.rateAll().then((res) => {
+      console.log('开启音频录制', res)
+      let list = [
+        {
+          tag: 'projectionWhiteboard',
+          xPosition: 0,
+          yPosition: 175 * SCALE,
+          width: 1280,
+          height: 720
+        },
+        {
+          tag: 'tag1customer',
+          xPosition: 0,
+          yPosition: 0,
+          width: 213 * SCALE,
+          height: 175 * SCALE
+        },
+        {
+          tag: 'customer1',
+          xPosition: 213 * SCALE,
+          yPosition: 0,
+          width: 213 * SCALE,
+          height: 175 * SCALE
+        },
+        {
+          tag: 'customer2',
+          xPosition: 426 * SCALE,
+          yPosition: 0,
+          width: 213 * SCALE,
+          height: 175 * SCALE
+        },
+        {
+          tag: 'customer3',
+          xPosition: 639 * SCALE,
+          yPosition: 0,
+          width: 213 * SCALE,
+          height: 175 * SCALE
+        },
+        {
+          tag: 'customer4',
+          xPosition: 852 * SCALE,
+          yPosition: 0,
+          width: 213 * SCALE,
+          height: 175 * SCALE
+        },
+        {
+          tag: 'customer5',
+          xPosition: 1065 * SCALE,
+          yPosition: 0,
+          width: 213 * SCALE,
+          height: 175 * SCALE
+        },
+        {
+          tag: 'customer6',
+          xPosition: 1278 * SCALE,
+          yPosition: 0,
+          width: 213 * SCALE,
+          height: 175 * SCALE
+        },
+      ]
+      Array.isArray(res) ?
+        res.map((item) => {
+          list.push({
+            tag: item.tag,
+            xPosition: 860 * SCALE,
+            yPosition: 235 * SCALE,
+            width: (420 * SCALE),
+            height: (420 * SCALE)
+          })
+        }) :
+        list.push({
+          tag: 'VIDEO_SOURCE_SCREEN',
+          xPosition: 860 * SCALE,
+          yPosition: 235 * SCALE,
+          width: (420 * SCALE),
+          height: (420 * SCALE)
+        })
+        // 开启业务录制的时候type传值，在后面加标识，全局的不加
+      const filePath = 'recordId_' + new Date().valueOf() + type;
+      const recordParam = {};
+      recordParam.width = 1280 * SCALE;
+      recordParam.height = 720 * SCALE;
+      recordParam.recordTotalStream = 0;
+      recordParam.startTimeout = 10;
+      recordParam.splitType = 1;
+      recordParam.endType = 1;
+      recordParam.crf = 26
+      recordParam.overlaps = [
+        {
+          tag: '', // 流 tag，如果不设置或为空，则为全局⽔印
+          type: 2, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
+          id: 2, // ⽔印 ID
+          enable: true,
+          xPosition: 16 * SCALE, // x 轴位置
+          yPosition: 8 * SCALE, // y 轴位置
+          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
+          fontSize: 16 * SCALE, // 字体⼤⼩
+          url: '' // ⽔印图⽚ HTTP 地址
+        },
+        {
+          tag: '', // 流 tag，如果不设置或为空，则为全局⽔印
+          type: 1, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
+          id: 1, // ⽔印 ID
+          enable: true,
+          xPosition: 1080 * SCALE, // x 轴位置
+          yPosition: 10 * SCALE, // y 轴位置
+          text: '', // ⽔印⽂字
+          fontSize: 16 * SCALE, // 字体⼤⼩
+          url: '' // ⽔印图⽚ HTTP 地址
+        },
+      ];
+      recordParam.tagPositions = list
+      recordParam.tagFilter = 'customer'
+      console.log('recordParam', recordParam);
+      // 开启音频录制，如果有业务id用，没用sessionid  用于在成功回调里去区分是音频还是正常
+      that.test_controller.StartRemoteRecord(filePath, recordParam, record_business_id ? record_business_id + '_' + type : this.state.sessionId + '_' + type)
+
+    })
+    }
+
+  }
   // 开启录制
   enableServerRecording = (record_business_id, type) => {
     const that = this
@@ -658,7 +791,7 @@ class Video extends Component {
         //   height: 350
         // },
         {
-          tag: 'tag1',
+          tag: 'tag1customer',
           xPosition: 0,
           yPosition: 0,
           width: 213 * SCALE,
@@ -768,7 +901,6 @@ class Video extends Component {
         },
       ];
       recordParam.tagPositions = list
-      // recordParam.tagFilter = 'customer1'
       console.log('recordParam', recordParam);
       that.test_controller.StartRemoteRecord(filePath, recordParam, record_business_id)
 
@@ -784,7 +916,7 @@ class Video extends Component {
       recordParam.height = 720;
       recordParam.recordTotalStream = 0;
       recordParam.startTimeout = 10;
-      recordParam.splitType = 0;
+      recordParam.splitType = 1;
       recordParam.endType = 1;
       recordParam.crf = 26
       recordParam.overlaps = [
@@ -818,7 +950,7 @@ class Video extends Component {
         width: 1280,
         height: 720
       },{
-        tag: 'tag1',
+        tag: 'tag1customer',
         xPosition: 0,
         yPosition: 0,
         width: 0,
@@ -1651,6 +1783,7 @@ class Video extends Component {
             // 开启录制
             this.saveLog('Start recording')
             this.enableServerRecording()
+            this.enableAudioRecording('','presale')
           } else if (Mival.type == 2) {
             // 关闭录制
             this.saveLog('stop recording')
@@ -2001,6 +2134,18 @@ class Video extends Component {
           this.state.businessId = Mival.id;
           this.saveLog('Start business recording')
           this.enableServerRecording(Mival.id, 'startBusinessRecording')
+          // supplement   1   代表补录
+          if(Mival.supplement == 1) {
+            this.state.supplementWithRoomId = Mival.supplementWithRoomId
+            this.enableAudioRecording(Mival.id,'supplesale')
+          } else {
+            // 开启业务录制的基础上关闭full录制音频，并开启业务录制音频
+            if(this.state.presaleRecordId) {
+              this.test_controller.StopRemoteRecord(this.state.presaleRecordId)
+            }
+            
+            this.enableAudioRecording(Mival.id,'sale')
+          }
           // 这里加定时1秒后触发Ipad录制--阿里的胡子老师要求加的，解决录制的问题
           setTimeout(() => {
             if (this.state.ipadTag) this.enableIpadRecording(Mival.id)
@@ -2465,7 +2610,7 @@ class Video extends Component {
       publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
       publish_config.publish_video_id = 'publish_video1'
       publish_config.publish_streamId_id = 'publish_streamId1'
-      publish_config.publish_tag = 'tag1'
+      publish_config.publish_tag = 'tag1customer'
       if (this.props.recordMode == 2) {
         // 分行模式，只收音 不发布摄像头
         publish_config.media_type = 2
@@ -2543,8 +2688,8 @@ class Video extends Component {
       // if (publish_device != 2) {
       //   return stream
       // }
-      if (publish_tag == 'tag1') {
-        console.log('tag1', stream)
+      if (publish_tag == 'tag1customer') {
+        console.log('tag1customer', stream)
         let newStream = stream;
         if (stream.getVideoTracks()[0]) {
           if (this.state.beautyType || isSuccuseHs){
@@ -3241,13 +3386,28 @@ class Video extends Component {
         const busId = Number(record_third_id.split('_')[0])
         this.ipadRecordCallback('1', true, busId)
         this.saveLog('mrtc OnStartIpadRecordSucc')
+      } else if (String(record_third_id).includes('_presale')){
+        // full录制的音频
+        this.state.presaleRecordId = record_id
+        this.audioPresaleRecordCallback('1', true)
+        this.saveLog('mrtc OnStartPresaleRecordSucc')
+      } else if (String(record_third_id).includes('_sale')){
+        // 业务录制的音频
+        this.state.salePresaleRecordId = record_id
+        this.audioSalePresaleRecordCallback('1', true)
+        this.saveLog('mrtc OnStartSalePresaleRecordSucc')
+      } else if (String(record_third_id).includes('_supplesale')){
+        // 补录业务录制的音频
+        this.state.supplesalePresaleRecordId = record_id
+        this.audiosuppleSalePresaleRecordCallback('1', true)
+        this.saveLog('mrtc OnStartSuppleSalePresaleRecordSucc')
       } else {
         // 业务录制
         this.state.businessRecordId = record_id
         this.businessRecordCallback('1', true, record_third_id)
         this.saveLog('mrtc OnStartRemoteBusinessRecordSucc, businessId=' + record_third_id)
       }
-      
+      // 判断是否是开启的音频录制  调用后台接口多isAudio  --0否1是
       if (this.state.isRecordingeErrorModalVisible) {
         this.setState({
           isRecordingeErrorModalVisible: false
@@ -3269,6 +3429,21 @@ class Video extends Component {
         const busId = Number(record_third_id.split('_')[0])
         this.ipadRecordCallback('1', false, busId)
         this.saveLog('mrtc OnStartIpadRecordFailed, code='+err_code)
+      } else if (String(record_third_id).includes('_presale')){
+        // full录制的音频
+        this.state.presaleRecordId = ''
+        this.audioPresaleRecordCallback('1', false)
+        this.saveLog('mrtc OnStartPresaleRecordFailed, code=' + err_code)
+      } else if (String(record_third_id).includes('_sale')){
+        // 业务录制的音频
+        this.state.salePresaleRecordId = ''
+        this.audioSalePresaleRecordCallback('1', false)
+        this.saveLog('mrtc OnStartSalePresaleRecordFailed, code=' + err_code)
+      } else if (String(record_third_id).includes('_supplesale')){
+        // 补录业务录制的音频
+        this.state.supplesalePresaleRecordId = ''
+        this.audiosuppleSalePresaleRecordCallback('1', false)
+        this.saveLog('mrtc OnStartSuppleSalePresaleRecordFailed, code=' + err_code)
       } else {
         this.businessRecordCallback('1', false, record_third_id)
         this.saveLog('mrtc OnStartRemoteBusinessRecordFailed, code='+err_code + ',businessId=' + record_third_id)
@@ -3292,6 +3467,21 @@ class Video extends Component {
         this.ipadRecordCallback('2', true, busId)
         this.saveLog('mrtc OnStopIpadRecordSucc, recordId='+recordId)
         this.state.ipadRecordId = '';
+      } else if (String(record_third_id).includes('_presale')){
+        // full录制的音频
+        this.state.presaleRecordId = ''
+        this.audioPresaleRecordCallback('2', true)
+        this.saveLog('mrtc OnStopPresaleRecordSucc, recordId='+recordId)
+      } else if (String(record_third_id).includes('_sale')){
+        // 业务录制的音频
+        this.state.salePresaleRecordId = ''
+        this.audioSalePresaleRecordCallback('2', true)
+        this.saveLog('mrtc OnStopSalePresaleSucc, recordId='+recordId)
+      } else if (String(record_third_id).includes('_supplesale')){
+        // 补录业务录制的音频
+        this.state.supplesalePresaleRecordId = ''
+        this.audiosuppleSalePresaleRecordCallback('2', true)
+        this.saveLog('mrtc OnStopSuppleSalePresaleRecordSucc, recordId='+recordId)
       } else {
         this.businessRecordCallback('2', true, record_third_id)
         this.saveLog('mrtc OnStopRemoteBusinessRecordSucc, recordId='+recordId + ',businessId=' + record_third_id)
@@ -3318,6 +3508,21 @@ class Video extends Component {
         const busId = Number(record_third_id.split('_')[0])
         this.ipadRecordCallback('2', false, busId)
         this.saveLog('mrtc OnStopIpadRecordFailed, err_code='+err_code)
+      } else if (String(record_third_id).includes('_presale')){
+        // full录制的音频
+        this.state.presaleRecordId = ''
+        this.audioPresaleRecordCallback('2', false)
+        this.saveLog('mrtc OnStopPresaleRecordFailed, err_code='+err_code)
+      } else if (String(record_third_id).includes('_sale')){
+        // 业务录制的音频
+        this.state.salePresaleRecordId = ''
+        this.audioSalePresaleRecordCallback('2', false)
+        this.saveLog('mrtc OnStopSalePresaleFailed, err_code='+err_code)
+      } else if (String(record_third_id).includes('_supplesale')){
+        // 补录业务录制的音频
+        this.state.supplesalePresaleRecordId = ''
+        this.audiosuppleSalePresaleRecordCallback('2', false)
+        this.saveLog('mrtc OnStopSuppleSalePresaleRecordFailed, err_code='+err_code)
       } else {
         this.businessRecordCallback('2', false, record_third_id)
         this.saveLog('mrtc OnStopRemoteBusinessRecordFailed, err_code='+err_code+',businessId=' + record_third_id)
@@ -3731,6 +3936,70 @@ class Video extends Component {
       // duration: 10
     })
   }
+    // full音频录制
+    audioPresaleRecordCallback = async (type, status) => {
+      try {
+        let result = await API.videoRecordCallback({
+          activityId: this.props.businessNumber,
+          sessionId: this.state.sessionId,
+          roomId: this.state.channelId + '',
+          appId: this.state.appId,
+          recordId: this.state.presaleRecordId,
+          customerId: this.props.customerId,
+          type: type,
+          status: status,
+          isAudio: '1'
+        });
+        console.log(result);
+      } catch (err) {
+        console.error(err);
+        if (err.status == 502 || err.status == 404) {
+        }
+      }
+    }
+    // 业务音频录制
+    audioSalePresaleRecordCallback = async (type, status) => {
+      try {
+        let result = await API.videoRecordCallback({
+          activityId: this.props.businessNumber,
+          sessionId: this.state.sessionId,
+          roomId: this.state.channelId + '',
+          appId: this.state.appId,
+          recordId: this.state.salePresaleRecordId,
+          customerId: this.props.customerId,
+          type: type,
+          status: status,
+          isAudio: '1'
+        });
+        console.log(result);
+      } catch (err) {
+        console.error(err);
+        if (err.status == 502 || err.status == 404) {
+        }
+      }
+    }
+    // 补录业务录制 
+    audiosuppleSalePresaleRecordCallback = async (type, status) => {
+      try {
+        let result = await API.videoRecordCallback({
+          activityId: this.props.businessNumber,
+          sessionId: this.state.sessionId,
+          roomId: this.state.channelId + '',
+          appId: this.state.appId,
+          recordId: this.state.supplesalePresaleRecordId,
+          customerId: this.props.customerId,
+          type: type,
+          status: status,
+          isAudio: '1',
+          supplementWithRoomId: this.state.supplementWithRoomId
+        });
+        console.log(result);
+      } catch (err) {
+        console.error(err);
+        if (err.status == 502 || err.status == 404) {
+        }
+      }
+    }
   // 全局录制
   videoRecordCallback = async (type, status) => {
     if (status) {
@@ -3751,7 +4020,8 @@ class Video extends Component {
         recordId: this.state.recordId,
         customerId: this.props.customerId,
         type: type,
-        status: status
+        status: status,
+        isFull: 1
       });
       console.log(result);
     } catch (err) {
@@ -4695,6 +4965,7 @@ class Video extends Component {
     }
     this.saveLog('Start business recording')
     if (!this.state.businessRecordId) this.enableServerRecording(this.state.businessId)
+    if (!this.state.businessRecordId) this.enableAudioRecording(this.state.businessId,'presale')
     if (!this.state.ipadRecordId && this.state.ipadTag) this.enableIpadRecording(this.state.businessId)
     clearTimeout(this.recordLoopPlayTimer)
   }
@@ -7798,7 +8069,7 @@ Video.defaultProps = {
   lightSensitivity: 1, // 光线敏感度系数，默认1
   userSide: 2,
   meetingDuration: null, // 会议时长，单位小时
-  recordMode: 1, // 录制模式 1远程录制 2网点录制
+  recordMode: 1, // 录制模式 1远程录制 2网点录制-分行   在开启单独音频流的时候1-会有多个音频流单独录制，2-只需要RM
   defaultBranchCode: "",// 员工网点缩写
   customerId: "", //客户号
   customerType: "", // 客户类型
@@ -7808,6 +8079,7 @@ Video.defaultProps = {
   audioinputNameList: ['Microphone Array (Realtek High Definition Audio(SST))'], // 默认匹配的麦克风的名称列表
   echoCancellation: true,
   noiseSuppression: true,
+  needPreSale: true, // 是否开启音频录制 默认true--只控制售前full
   logUrl: 'http://hsbc.cn-shanghai.log.aliyuncs.com/logstores/hsbc/track?APIVersion=0.6.0&app=meeting-ui',
   internalUrl: 'https://wp-staff-gateway.wealth-platform.uat.ali.cloud.cn.hsbc/meeting-ui/OHB/CN/HSBC?chnlID=OHB&locale=zh_CN&chnlCC=CN&chnlGMC=HSBC&targetFunc=supervisorMeeting&sourceFunc=rmMeeting'
 }