react_hsbc_teller 2.0.13 → 2.0.15

package/package.json

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

package/packages/api/api.js

@@ -492,7 +492,31 @@ class API extends Server{
         throw err;
       }
     }
-    
+    /**
+   *  用途：查询分行名称
+   *  @url https://api.cangdu.org/shopro/data/products
+   *  返回http_code为200表示成功
+   *  @method post
+   *  @return {promise}
+   */
+    async getBranchName(params = {}){
+      try{
+        let result = await this.axios('get', '/hsbc/getBranchName?branchCode=' + params.branchCode, params); 
+        if(result && (result.data instanceof Object) && result.code === 200){
+          return result.data||[];
+        }else{
+          let err = {
+            tip: '分行名称获取失败',
+            response: result,
+            data: params,
+            // url: 'https://api.cangdu.org/shopro/data/products',
+          }
+          throw err;
+        }
+      }catch(err){
+        throw err;
+      }
+    }
       /**
    *  用途：人脸识别
    *  @url https://elm.cangdu.org/v1/addimg/shop

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.13'
+const SDK_VERISON = '2.0.15'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -367,21 +367,20 @@ class Video extends Component {
       this.state.imRoomId = result.imRoomId,
         this.state.sessionId = result.sessionId;
 
-      this.state.cameraList.forEach((el, i) => {
-        let publish_config = {}
-        publish_config.media_type = i==0? 1:3
-        publish_config.publish_device = 1
-        publish_config.videoSource = el.actionid
-        publish_config.audioSource = this.state.microphoneValue
-        publish_config.need_volume_analyser = true
-        // publish_config.video_profile_type = 3
-        publish_config.video_profile_type = 100
-        publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
-        publish_config.publish_video_id = 'publish_video' + (i+1)
-        publish_config.publish_streamId_id = 'publish_streamId'  + (i+1)
-        publish_config.publish_tag = 'tag' + (i+1)
-        this.test_controller.Publish(publish_config)
-      })
+      let publish_config = {}
+      publish_config.media_type = 1
+      publish_config.publish_device = 1
+      publish_config.videoSource = this.state.cameraValue
+      publish_config.audioSource = this.state.microphoneValue
+      publish_config.need_volume_analyser = true
+      // publish_config.video_profile_type = 3
+      publish_config.video_profile_type = 100
+      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'
+      this.test_controller.Publish(publish_config)
+  
       // this.publishAllScreen();
       // 单独发布录制屏幕设备的流
       this.publishRecorderDevice()
@@ -522,16 +521,16 @@ class Video extends Component {
         publish_streamId_id: 'publish_streamId1',
         publish_tag: 'tag1'
       },
-      {
-        publish_video_id: 'publish_video2',
-        publish_streamId_id: 'publish_streamId2',
-        publish_tag: 'tag2'
-      },
-      {
-        publish_video_id: 'publish_video3',
-        publish_streamId_id: 'publish_streamId3',
-        publish_tag: 'tag3'
-      }
+      // {
+      //   publish_video_id: 'publish_video2',
+      //   publish_streamId_id: 'publish_streamId2',
+      //   publish_tag: 'tag2'
+      // },
+      // {
+      //   publish_video_id: 'publish_video3',
+      //   publish_streamId_id: 'publish_streamId3',
+      //   publish_tag: 'tag3'
+      // }
     ];
     config_param.initSubscribe = [
       {
@@ -567,6 +566,8 @@ class Video extends Component {
     ];
     this.test_controller.InitRoomConfig(config_param)
     this.saveLog('mrtc InitRoomConfig start')
+    // 预热摄像头
+    this.test_controller.PreOpenLocalMedia(config_param)
   };
   rateAll = async () => {
     let data = ''
@@ -617,42 +618,42 @@ class Video extends Component {
           height: 175
         },
         {
-          tag: 'tag2',
+          tag: 'customer1',
           xPosition: 213,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'tag3',
+          tag: 'customer2',
           xPosition: 426,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer1',
+          tag: 'customer3',
           xPosition: 639,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer2',
+          tag: 'customer4',
           xPosition: 852,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer3',
+          tag: 'customer5',
           xPosition: 1065,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer4',
+          tag: 'customer6',
           xPosition: 1278,
           yPosition: 0,
           width: 213,
@@ -707,7 +708,7 @@ class Video extends Component {
           enable: true,
           xPosition: 640, // x 轴位置
           yPosition: 10, // y 轴位置
-          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.props.financialOffice || ''}`,
+          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
           fontSize: 16, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
@@ -1326,10 +1327,12 @@ class Video extends Component {
         }
 
       }
+      cobj.fillStyle = '#333333';
+      cobj.fillRect(0, 0, 640, baseStartHeight)
       // 录制中状态
       if (this.state.businessRecordId) {
         let str = '· 录制中'
-        cobj.fillStyle = '#F8F2F3';
+        // cobj.fillStyle = '#F8F2F3';
         cobj.font = "normal lighter 30px sans-serif";
         // cobj.fillRect(0, 0, 640, recordBoxHeight)
         cobj.textAlign = 'center';
@@ -2084,21 +2087,20 @@ class Video extends Component {
     this.test_controller.OnJoinRoomSucc = () => {
       console.log('加入房间成功')
 
-      this.state.cameraList.forEach((el, i) => {
-        let publish_config = {}
-        publish_config.media_type = i==0? 1:3
-        publish_config.publish_device = 1
-        publish_config.videoSource = el.actionid
-        publish_config.audioSource = this.state.microphoneValue
-        publish_config.need_volume_analyser = true
-        // publish_config.video_profile_type = 3
-        publish_config.video_profile_type = 100
-        publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
-        publish_config.publish_video_id = 'publish_video' + (i+1)
-        publish_config.publish_streamId_id = 'publish_streamId'  + (i+1)
-        publish_config.publish_tag = 'tag' + (i+1)
-        this.test_controller.Publish(publish_config)
-      })
+      let publish_config = {}
+      publish_config.media_type = 1
+      publish_config.publish_device = 1
+      publish_config.videoSource = this.state.cameraValue
+      publish_config.audioSource = this.state.microphoneValue
+      publish_config.need_volume_analyser = true
+      // publish_config.video_profile_type = 3
+      publish_config.video_profile_type = 100
+      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'
+      this.test_controller.Publish(publish_config)
+
       // this.publishAllScreen();
       // 单独发布录制屏幕设备的流
       this.publishRecorderDevice()
@@ -2669,7 +2671,7 @@ class Video extends Component {
         console.log('退出房间者', res)
         let data = res ? res.username ? res.username : '客户' : '客户'
         console.log(data)
-        this.messageClick((data + '已退出会议'), 'error')
+        // this.messageClick((data + '已退出会议'), 'error')
         this.saveLog(data + ' leave room')
         if (res.userType == 1) {
           // 2--坐席  1--客户
@@ -2682,12 +2684,14 @@ class Video extends Component {
             let audio = new Audio(src)
             audio.play()
           }
+          this.messageClick(('客户已退出会议'), 'error')
         } else if (res.userType == 2) {
           if (this.props.isOpenSound) {
             let src = internalLeft
             let audio = new Audio(src)
             audio.play()
           }
+          this.messageClick(('内部人员已退出会议'), 'error')
         } 
         // console.log('退出房间者',res)
         // let data = res? res : '客户'
@@ -3449,6 +3453,21 @@ class Video extends Component {
       this.roomCallBack(2, '获取tiken失败', 'SYS-01')
     }
   }
+  queryBranchName = async () => {
+    try {
+      let result = await API.getBranchName({
+        branchCode: this.props.salesBranchCode
+      })
+      this.setState({
+        branchName: result.branchName || ''
+      })
+      console.log('branchName', this.state.branchName)
+    } catch (err) {
+      console.error(err);
+      
+    }
+  }
+ 
   getRoomStatus = async data => {
     try {
       let result = await API.getRoomStatus({
@@ -3647,6 +3666,10 @@ class Video extends Component {
     } else {
       this.addToScript()
     }
+
+    if (this.props.salesBranchCode) {
+      this.queryBranchName()
+    }
   }
 
   voice = () => {
@@ -5317,6 +5340,16 @@ class Video extends Component {
       envInfo: envInfo
     })
   }
+  handleRetryEnvDetection = () => {
+    this.lightDetect();
+    message.success({
+      content: '已更新检测结果',
+      icon: <img src={require("../../assets/img/tooltips1_pass.png").default} alt="" ></img>,
+      className: 'successClassName',
+      top: 200,
+      duration: 3
+    })
+  }
   handleOkEnvDetection = () => {
     this.setState({
       isModalVisibleEnvironment: false,
@@ -6091,7 +6124,7 @@ class Video extends Component {
                   </div>
 
                 </div>
-                {
+                {/* {
                   this.state.cameraList.map((item, index) => {
                     if (index > 0) 
                     return <div
@@ -6124,7 +6157,7 @@ class Video extends Component {
                     </div>
                   </div>
                   })
-                }
+                } */}
                 {/* <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ position: "relative", display: (this.state.videoList[0].videoName) ? '' : 'none' }}
                 >
@@ -6606,7 +6639,7 @@ class Video extends Component {
           </Modal>
           <Modal title="环境检测" maskClosable={false} width={650} closable={false} centered={true} visible={this.state.isModalVisibleEnvironment} footer={[
             <div key='env'>
-              {/* <Button className="modelButtonCancel" onClick={this.handleCancelEnvDetection}>取消</Button> */}
+              <Button className="modelButtonCancel" onClick={this.handleRetryEnvDetection}>重新检测</Button>
               <Button className={isEnvironmentOK ?"modelButtonOk": "modelButtonNo"} type="primary" disabled={!isEnvironmentOK } danger onClick={this.handleOkEnvDetection}>确定</Button>
             </div>
           ]}>
@@ -6632,7 +6665,7 @@ class Video extends Component {
                       </div>
                     })
                   }
-                  {this.state.cameraList.length == 0 ? <p className="envClass">获取不到摄像头设备，请检查</p> : null}
+                  {this.state.cameraList.length == 0 ? <p className="envClass">获取不到设备，请检查电脑“设置”中的摄像头权限是否开启，并重启浏览器再试</p> : null}
                 </div>
               </Panel>
               <Panel header={<span>麦克风设备 - {this.state.envInfo.microResult} {this.state.envInfo.microResult=='不合格'? <img src={IconFail} />: <img src={IconSuccess} />}</span>} key="4" className={this.state.envInfo.microResult=='不合格'? 'panel-error':''}>
@@ -6644,7 +6677,7 @@ class Video extends Component {
                       </div>
                     })
                   }
-                  {this.state.cameraList.length == 0 ? <p className="envClass">获取不到麦克风设备，请检查</p> : null}
+                  {this.state.cameraList.length == 0 ? <p className="envClass">获取不到设备，请检查电脑“设置”中的麦克风权限是否开启，并重启浏览器再试</p> : null}
                 </div>
               </Panel>
               <Panel header={<span>背光、曝光 - {this.state.envInfo.lightResult} {this.state.envInfo.lightResult=='合格'? <img src={IconSuccess} />: <img src={IconFail} />}</span>} key="6" className={this.state.envInfo.lightResult=='合格'? '':'panel-error'}>