react_hsbc_teller 2.0.72 → 2.0.74

package/package.json

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

package/packages/demo/demo.js

@@ -43,18 +43,18 @@ class Demo extends Component {
   salesBranchCode: 'salesBranchCode', //网点编号(分行号)
   financialOffice: "defaultOfficeId", // 理财室
   audioinputNameList: ['默认值 - 外部麦克风 (Realtek(R) Audio)'],
-  needPreSale: false
+  needPreSale: true
 }
 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.72'
+const SDK_VERISON = '2.0.74'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -410,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
@@ -564,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',
@@ -636,6 +636,7 @@ class Video extends Component {
   // 开启音频录制
   enableAudioRecording = (record_business_id, type) => {
     console.log('enableAudioRecording', record_business_id, type)
+    this.saveLog('mrtc needPreSale ' + this.props.needPreSale)
     // true开启
     console.log(this.props.needPreSale, type == 'presale' && !this.props.needPreSale)
     if(!(type == 'presale' && !this.props.needPreSale)){
@@ -652,49 +653,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,
@@ -753,7 +754,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)
@@ -791,49 +792,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,
@@ -950,7 +951,7 @@ class Video extends Component {
         width: 1280,
         height: 720
       },{
-        tag: 'tag1customer',
+        tag: 'tag1',
         xPosition: 0,
         yPosition: 0,
         width: 0,
@@ -2610,7 +2611,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
@@ -2688,8 +2689,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){
@@ -2866,6 +2867,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)
@@ -4411,6 +4413,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({
@@ -4964,8 +4967,8 @@ class Video extends Component {
       this.pictureInPicture()
     }
     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.businessRecordId) this.enableServerRecording(this.state.businessId, 'startBusinessRecording')
+    if (!this.state.businessRecordId) this.enableAudioRecording(this.state.businessId,'sale')
     if (!this.state.ipadRecordId && this.state.ipadTag) this.enableIpadRecording(this.state.businessId)
     clearTimeout(this.recordLoopPlayTimer)
   }