react_hsbc_teller 2.0.14 → 2.0.16

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -27,9 +27,6 @@ export default class foot extends Component {
     ocrClick=()=>{
         this.props.ocrClick()
     }
-    paperOcrClick=()=>{
-        this.props.paperOcrClick()
-    }
     pictureInPicture=()=>{
         this.props.pictureInPicture()
     }
@@ -156,15 +153,6 @@ export default class foot extends Component {
                                   </div>
                                 //   </Popover>
                               }
-                              {
-                                  item == 'PAPER_OCR' && 
-                                  <div className="one"  onClick={this.paperOcrClick.bind(this)}>
-                                      <img className="imgClass" src={require("../../assets/img/icon_paper.png").default} alt="" />
-                                      <div className="text">
-                                        纸质识别
-                                      </div>
-                                  </div>
-                              }
                               {
                                   item == 'INVITE' && <div className="one" onClick={this.invitationClick.bind(this)}>
                                   <img className="imgClass" src={require("../../assets/img/icon_invitation.png").default} alt="" />

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.14'
+const SDK_VERISON = '2.0.16'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -69,7 +69,9 @@ const POINT_TYPE = {
   pipd:	"画中画显示、关闭",
   pwd:	"违禁词检测",
   wnd:	"弱网",
-  mute:  "静音"
+  mute:  "静音",
+  expDark: '曝光、背光',
+  fcd: '人脸变化检测'
 }
 const RECORD_DEVICE_NAME = 'screen-capture-recorder'
 // const RECORD_DEVICE_NAME = 'Full HD webcam'
@@ -367,21 +369,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 +523,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 +568,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 +620,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,
@@ -939,8 +942,8 @@ class Video extends Component {
   }
   messageClick = (value, tipType) => {
     console.log('messageClick', value, tipType)
-    const intervalSec = 15 // 相同提示触发间隔
-    const durationSec = 10 // 提示持续时间
+    const intervalSec = 5 // 相同提示触发间隔
+    const durationSec = 4.5 // 提示持续时间
     if (messageValueMap.get(value) == undefined) {
       // map中没有相同消息
       messageValue = value
@@ -1085,18 +1088,6 @@ class Video extends Component {
       this.selectCustomer('ocr')
     }
   };
-  paperOcrClick  = () => {
-    setTimeout(() => {
-      // this.messageClick('系统检测到您已签署2/3个地方，还有1处未签署', 'error')
-      message.error({
-        content: '系统检测到您已签署2/3个地方，还有1处未签署',
-        icon: <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>,
-        className: 'errorClassName',
-        top: 200,
-        duration: 10
-      })
-    }, 1500);
-  };
   endSessionValue = () => {
     this.saveLog('RM actively exits the meeting')
     if (streamShare) {
@@ -1795,7 +1786,7 @@ class Video extends Component {
         if (res==1 || res== -1){
           // 背景曝光过度
           this.messageClick('检测到当前背光、曝光过度', 'error')
-          this.saveVideoPoint('env', 'RM端背光、曝光过度');
+          this.saveVideoPoint('expDark', 'RM端背光、曝光过度');
         }
         origin.delete()
         // let end = new Date().getTime()
@@ -1849,6 +1840,8 @@ class Video extends Component {
         roomId: this.state.channelId + '',
         appId: this.state.appId,
         recordId: this.state.recordId,
+        client: 'rm',
+        customerId: this.props.tellerAccount
       });
     } catch (err) {
       console.error(err);
@@ -2086,21 +2079,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()
@@ -2671,7 +2663,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--客户
@@ -2684,12 +2676,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 : '客户'
@@ -5338,6 +5332,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,
@@ -6112,7 +6116,7 @@ class Video extends Component {
                   </div>
 
                 </div>
-                {
+                {/* {
                   this.state.cameraList.map((item, index) => {
                     if (index > 0) 
                     return <div
@@ -6145,7 +6149,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' }}
                 >
@@ -6242,7 +6246,6 @@ class Video extends Component {
             invitationClick={this.invitationClick}
             customerFaceClick={this.customerFaceClick}
             ocrClick={this.ocrClick}
-            paperOcrClick={this.paperOcrClick}
             switchExternal={this.switchExternal}
             inspection={this.inspection}
             toggleAsr={this.toggleAsr}
@@ -6627,7 +6630,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>
           ]}>
@@ -6653,7 +6656,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':''}>
@@ -6665,7 +6668,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'}>