react_hsbc_teller 2.0.71 → 2.0.73

package/package.json

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

package/packages/demo/demo.js

@@ -46,15 +46,15 @@ class Demo extends Component {
   needPreSale: false
 }
 componentWillMount() {
-    if(window.localStorage.getItem('sessionId') && window.localStorage.getItem('sessionId') != 'null' && window.localStorage.getItem('sessionId') != 'undefined') {
-    this.setState({roomId: window.localStorage.getItem('roomId')});
-    this.setState({mtoken: window.localStorage.getItem('mtoken')});
-    this.setState({sessionId:window.localStorage.getItem('sessionId')});
-    this.setState({imRoomId: window.localStorage.getItem('imRoomId')});
-    this.setState({
-        isVideo: true
-    })
-    }
+    // if(window.localStorage.getItem('sessionId') && window.localStorage.getItem('sessionId') != 'null' && window.localStorage.getItem('sessionId') != 'undefined') {
+    // this.setState({roomId: window.localStorage.getItem('roomId')});
+    // this.setState({mtoken: window.localStorage.getItem('mtoken')});
+    // this.setState({sessionId:window.localStorage.getItem('sessionId')});
+    // this.setState({imRoomId: window.localStorage.getItem('imRoomId')});
+    // this.setState({
+    //     isVideo: true
+    // })
+    // }
 
 }
 handleChangeRoomId = (event) => {

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.71'
+const SDK_VERISON = '2.0.73'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -350,7 +350,6 @@ class Video extends Component {
     transcribeErrorModalVisible: false, // 双录异常
     transcribeErrorCode: '',
     presaleRecordId: '',
-    ipadsaleRecordId: '',
     salePresaleRecordId: '',
     supplesalePresaleRecordId: ''
 
@@ -361,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 => {
 
@@ -411,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 = 'tag1customer'
+      publish_config.publish_tag = 'tag1'
       if (this.props.recordMode == 2) {
         // 分行模式，只收音 不发布摄像头
         publish_config.media_type = 2
@@ -565,7 +564,7 @@ class Video extends Component {
       {
         publish_video_id: 'publish_video1',
         publish_streamId_id: 'publish_streamId1',
-        publish_tag: 'tag1customer'
+        publish_tag: 'tag1'
       },
       // {
       //   publish_video_id: 'publish_video2',
@@ -653,49 +652,49 @@ class Video extends Component {
           height: 720
         },
         {
-          tag: 'tag1customer',
+          tag: 'tag1',
           xPosition: 0,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer1',
+          tag: 'customertag1',
           xPosition: 213 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer2',
+          tag: 'customertag2',
           xPosition: 426 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer3',
+          tag: 'customertag3',
           xPosition: 639 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer4',
+          tag: 'customertag4',
           xPosition: 852 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer5',
+          tag: 'customertag5',
           xPosition: 1065 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer6',
+          tag: 'customertag6',
           xPosition: 1278 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
@@ -754,7 +753,7 @@ class Video extends Component {
         },
       ];
       recordParam.tagPositions = list
-      recordParam.tagFilter = 'customer'
+      recordParam.tagFilter = 'tag'
       console.log('recordParam', recordParam);
       // 开启音频录制，如果有业务id用，没用sessionid  用于在成功回调里去区分是音频还是正常
       that.test_controller.StartRemoteRecord(filePath, recordParam, record_business_id ? record_business_id + '_' + type : this.state.sessionId + '_' + type)
@@ -763,58 +762,6 @@ class Video extends Component {
     }
 
   }
-  // 开启ipad音频录制
-  enableIpadAudioRecording = (record_business_id) => {
-    const that = this
-    const filePath = 'recordId_' + new Date().valueOf() + '_ipadsale';
-      const recordParam = {};
-      recordParam.width = 1280;
-      recordParam.height = 720;
-      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, // x 轴位置
-          yPosition: 8, // y 轴位置
-          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
-          fontSize: 16, // 字体⼤⼩
-          url: '' // ⽔印图⽚ HTTP 地址
-        },
-        {
-          tag: '', // 流 tag，如果不设置或为空，则为全局⽔印
-          type: 1, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
-          id: 1, // ⽔印 ID
-          enable: true,
-          xPosition: 1080, // x 轴位置
-          yPosition: 10, // y 轴位置
-          text: '', // ⽔印⽂字
-          fontSize: 16, // 字体⼤⼩
-          url: '' // ⽔印图⽚ HTTP 地址
-        },
-      ];
-      recordParam.tagPositions = [{
-        tag: that.state.ipadTag,
-        xPosition: 0,
-        yPosition: 0,
-        width: 1280,
-        height: 720
-      },{
-        tag: 'tag1customer',
-        xPosition: 0,
-        yPosition: 0,
-        width: 0,
-        height: 0
-      }]
-      console.log('recordParam', recordParam);
-      that.test_controller.StartRemoteRecord(filePath, recordParam, record_business_id+'_ipadsale')
-  }
   // 开启录制
   enableServerRecording = (record_business_id, type) => {
     const that = this
@@ -844,49 +791,49 @@ class Video extends Component {
         //   height: 350
         // },
         {
-          tag: 'tag1customer',
+          tag: 'tag1',
           xPosition: 0,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer1',
+          tag: 'customertag1',
           xPosition: 213 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer2',
+          tag: 'customertag2',
           xPosition: 426 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer3',
+          tag: 'customertag3',
           xPosition: 639 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer4',
+          tag: 'customertag4',
           xPosition: 852 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer5',
+          tag: 'customertag5',
           xPosition: 1065 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
           height: 175 * SCALE
         },
         {
-          tag: 'customer6',
+          tag: 'customertag6',
           xPosition: 1278 * SCALE,
           yPosition: 0,
           width: 213 * SCALE,
@@ -1003,7 +950,7 @@ class Video extends Component {
         width: 1280,
         height: 720
       },{
-        tag: 'tag1customer',
+        tag: 'tag1',
         xPosition: 0,
         yPosition: 0,
         width: 0,
@@ -2202,7 +2149,6 @@ class Video extends Component {
           // 这里加定时1秒后触发Ipad录制--阿里的胡子老师要求加的，解决录制的问题
           setTimeout(() => {
             if (this.state.ipadTag) this.enableIpadRecording(Mival.id)
-            if (this.state.ipadTag) this.enableIpadAudioRecording(Mival.id)
           }, 1000);
           
           if (this.props.whetherDetectFace && this.props.recordMode != 2){
@@ -2664,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 = 'tag1customer'
+      publish_config.publish_tag = 'tag1'
       if (this.props.recordMode == 2) {
         // 分行模式，只收音 不发布摄像头
         publish_config.media_type = 2
@@ -2742,8 +2688,8 @@ class Video extends Component {
       // if (publish_device != 2) {
       //   return stream
       // }
-      if (publish_tag == 'tag1customer') {
-        console.log('tag1customer', stream)
+      if (publish_tag == 'tag1') {
+        console.log('tag1', stream)
         let newStream = stream;
         if (stream.getVideoTracks()[0]) {
           if (this.state.beautyType || isSuccuseHs){
@@ -2920,6 +2866,7 @@ class Video extends Component {
         })
         this.roomCallBack(2, '发布失败', '4-' + err_code)
       } else {
+        this.test_controller.UnPublish(sid)
         this.messageClick('投屏失败请重新投屏', 'error')
         this.setSharedScreenState(false)
         this.setSharedScreenTimer(false)
@@ -3163,7 +3110,6 @@ class Video extends Component {
         // 如果已经开启了业务录制且ipad未在录制，立即开启ipad录制（ipad后加入）
         if (this.state.businessId && !this.state.ipadRecordId) {
           this.enableIpadRecording(this.state.businessId)
-          this.enableIpadAudioRecording(this.state.businessId)
         } 
       }
     };
@@ -3446,11 +3392,6 @@ class Video extends Component {
         this.state.presaleRecordId = record_id
         this.audioPresaleRecordCallback('1', true)
         this.saveLog('mrtc OnStartPresaleRecordSucc')
-      } else if (String(record_third_id).includes('_ipadsale')){
-        // full录制的ipad音频
-        this.state.ipadsaleRecordId = record_id
-        this.audioIpadsaleRecordCallback('1', true)
-        this.saveLog('mrtc OnStartIpadsaleRecordSucc')
       } else if (String(record_third_id).includes('_sale')){
         // 业务录制的音频
         this.state.salePresaleRecordId = record_id
@@ -3494,11 +3435,6 @@ class Video extends Component {
         this.state.presaleRecordId = ''
         this.audioPresaleRecordCallback('1', false)
         this.saveLog('mrtc OnStartPresaleRecordFailed, code=' + err_code)
-      } else if (String(record_third_id).includes('_ipadsale')){
-        // 录制的ipad音频
-        this.state.ipadsaleRecordId = ''
-        this.audioIpadsaleRecordCallback('1', false)
-        this.saveLog('mrtc OnStartIpadsaleRecordFailed, code=' + err_code)
       } else if (String(record_third_id).includes('_sale')){
         // 业务录制的音频
         this.state.salePresaleRecordId = ''
@@ -3537,11 +3473,6 @@ class Video extends Component {
         this.state.presaleRecordId = ''
         this.audioPresaleRecordCallback('2', true)
         this.saveLog('mrtc OnStopPresaleRecordSucc, recordId='+recordId)
-      } else if (String(record_third_id).includes('_ipadsale')){
-        // 录制的ipad音频
-        this.state.ipadsaleRecordId = ''
-        this.audioIpadsaleRecordCallback('2', true)
-        this.saveLog('mrtc OnStopIpadsaleRecordSucc, recordId='+recordId)
       } else if (String(record_third_id).includes('_sale')){
         // 业务录制的音频
         this.state.salePresaleRecordId = ''
@@ -3583,11 +3514,6 @@ class Video extends Component {
         this.state.presaleRecordId = ''
         this.audioPresaleRecordCallback('2', false)
         this.saveLog('mrtc OnStopPresaleRecordFailed, err_code='+err_code)
-      } else if (String(record_third_id).includes('_ipadsale')){
-        // 录制的ipad音频
-        this.state.ipadsaleRecordId = ''
-        this.audioIpadsaleRecordCallback('2', false)
-        this.saveLog('mrtc OnStopIpadsaleRecordFailed, err_code='+err_code)
       } else if (String(record_third_id).includes('_sale')){
         // 业务录制的音频
         this.state.salePresaleRecordId = ''
@@ -4033,27 +3959,6 @@ class Video extends Component {
       }
     }
     // 业务音频录制
-    audioIpadsaleRecordCallback = 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.ipadsaleRecordId,
-          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) {
-        }
-      }
-    }
-    // ipad音频录制
     audioSalePresaleRecordCallback = async (type, status) => {
       try {
         let result = await API.videoRecordCallback({
@@ -4507,6 +4412,7 @@ class Video extends Component {
   }
   componentWillMount() {
     console.log('hsbc_teller_sdk', SDK_VERISON)
+    console.log(`${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`)
     let arr = []
     for(let i=1;i<=12;i++){
       arr.push({
@@ -5063,7 +4969,6 @@ class Video extends Component {
     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)
-    if (!this.state.ipadRecordId && this.state.ipadTag) this.enableIpadAudioRecording(this.state.businessId)
     clearTimeout(this.recordLoopPlayTimer)
   }
   handleOkLowPowerConfirm = () => {
@@ -8166,7 +8071,7 @@ Video.defaultProps = {
   lightSensitivity: 1, // 光线敏感度系数，默认1
   userSide: 2,
   meetingDuration: null, // 会议时长，单位小时
-  recordMode: 1, // 录制模式 1远程录制 2网点录制   在开启单独音频流的时候1-会有多个音频流单独录制，2-只需要RM
+  recordMode: 1, // 录制模式 1远程录制 2网点录制-分行   在开启单独音频流的时候1-会有多个音频流单独录制，2-只需要RM
   defaultBranchCode: "",// 员工网点缩写
   customerId: "", //客户号
   customerType: "", // 客户类型