react_hsbc_teller 2.0.44 → 2.0.46

package/package.json

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

package/packages/pages/video/video.jsx

@@ -60,7 +60,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.44'
+const SDK_VERISON = '2.0.46'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -2336,9 +2336,14 @@ class Video extends Component {
         if (sid == this.state.publishSid) {
           this.saveLog('Audio and video close notification，' + code)
           this.roomCallBack(2, '音视频异常关闭', 8)
-        } else {
+        } else if (sid == this.state.publishScreenSid) {
           this.state.isScreenSwitching = false
           this.setSharedScreenState(false)
+          if (code == 5012) {
+            this.saveLog('Manual cancel share'); // 点了取消，拒绝系统授权
+          } else {
+            this.saveLog('System error stop share, code=' + code);
+          }
         }
       }
     };
@@ -2533,6 +2538,7 @@ class Video extends Component {
       console.log('发布媒体流成功', sid)
       this.state.sessionType = true
       if (sid == document.getElementById('video20').name) {
+        this.state.publishScreenSid = document.getElementById('video20').name
         this.setSharedScreenState(true)
         this.saveLog('Share success')
         this.sendMessage({
@@ -2605,7 +2611,7 @@ class Video extends Component {
       } else {
         this.messageClick('投屏失败请重新投屏', 'error')
         this.setSharedScreenState(false)
-        this.saveLog('Share fail')
+        this.saveLog('Share fail, code=' + err_code)
       }
 
     };
@@ -3362,7 +3368,7 @@ class Video extends Component {
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setSharedScreenState(false)
-        this.saveLog('Share fail')
+        this.saveLog('Share fail, code=' + code)
         this.setState({
           screenName: '共享模式'
         });
@@ -5510,6 +5516,7 @@ class Video extends Component {
       }, error => {
         console.log("Unable to acquire screen capture", error);
         console.log('取消签署')
+        that.saveLog('Manual cancel share')
       });
   }
   publishRecorderDevice = () => {
@@ -5796,9 +5803,16 @@ class Video extends Component {
       networkStatus: '未知', // 网络状态 （已连接/未连接）
       cameraResult: this.state.cameraList.length>0 ? '合格': '不合格', // 摄像头检测
       microResult: this.state.microphoneList.length>0 ? '合格': '不合格', // 麦克风检测
+      speakerResult: this.state.speakerList.length>0 ? '合格': '不合格',
       lightResult: this.state.envInfo? this.state.envInfo.lightResult : '未知'
     }
      
+    // 扬声器检测
+    const detectSpeaker =  this.props.speakerNames instanceof Array && this.props.speakerNames.length > 0;
+    if (detectSpeaker) {
+      envInfo.speakerResult = (this.state.speakerList.length >0 &&
+        this.props.speakerNames.find(el => (this.state.speakerList[0].actionname).includes(el)))? '合格' : '不合格';
+    } 
     if (navigator) {
       // 电量检测
       navigator.getBattery().then(function(battery) {
@@ -6506,6 +6520,7 @@ class Video extends Component {
                             this.state.envInfo.batteryResult=='合格' &&
                             (this.state.envInfo.cameraResult=='合格' || this.props.recordMode == 2) &&
                             this.state.envInfo.microResult=='合格' &&
+                            this.state.envInfo.speakerResult=='合格' &&
                             (this.state.envInfo.lightResult=='合格' || this.props.recordMode == 2 ) &&
                             (this.state.ipadTag || this.props.recordMode != 2)
 
@@ -6808,7 +6823,7 @@ class Video extends Component {
             ocrHandleVisibleChange={this.ocrHandleVisibleChange}
             voice={this.voice}
             cameraClick={this.cameraClick}
-            sharedScreen={this.sharedScreen}
+            sharedScreen={()=> {this.saveLog('Click share button');this.sharedScreen();}}
             endSession={this.endSession}
             facialRecognition={this.facialRecognition}
             pictureInPicture={this.pictureInPicture}
@@ -6816,7 +6831,7 @@ class Video extends Component {
             invitationClick={this.invitationClick}
             customerFaceClick={this.customerFaceClick}
             ocrClick={this.ocrClick}
-            switchExternal={this.switchExternal}
+            switchExternal={()=> {this.saveLog('Click sign button');this.switchExternal();}}
             inspection={this.inspection}
             toggleAsr={this.toggleAsr}
             envDetection={this.showEnvDetection}
@@ -7281,6 +7296,19 @@ class Video extends Component {
                   {this.state.cameraList.length == 0 ? <p className="envClass">获取不到设备，请检查电脑“设置”中的麦克风权限是否开启，并重启浏览器再试</p> : null}
                 </div>
               </Panel>
+              <Panel header={<span>扬声器设备 - {this.state.envInfo.speakerResult} {this.state.envInfo.speakerResult=='不合格'? <img src={IconFail} />: <img src={IconSuccess} />}</span>} key="4" className={this.state.envInfo.speakerResult=='不合格'? 'panel-error':''}>
+                <div>
+                  {
+                    this.state.speakerList.map((item, index) => {
+                      return <div key={index} className="envClass">
+                          {item.actionname}{'（当前设备）'}
+                      </div>
+                    })
+                  }
+                  {this.state.speakerList.length == 0 ? <p className="envClass">获取不到设备，请检查电脑“设置”中的扬声器权限是否开启，并重启浏览器再试</p> : null}
+                  {(this.state.speakerList.length > 0 && this.state.envInfo.speakerResult=='不合格') ? <p className="envClass" style={{marginTop: '3px'}}>未使用外放扬声器，请检查电脑“设置”中的媒体设备，并刷新或重启浏览器再试</p> : null}
+                </div>
+              </Panel>
               {
                 this.props.recordMode == 2 && 
                 <Panel header={<span>双录iPad设备 - {this.state.ipadTag? '合格':'未开启'} {this.state.ipadTag? <img src={IconSuccess} />: <img src={IconFail} />}</span>} key="6" className={this.state.ipadTag? '':'panel-error'}>
@@ -7346,6 +7374,7 @@ Video.defaultProps = {
   menus: ['BOARD', 'SHARE', 'FRIES', 'OCR', 'PAPER_OCR', 'INVITE', 'PIP', 'BEAUTY', 'GRAFFITI', 'BACKGROUND'],
   customLeaveRoom: '客户离开房间',
   sensitiveWords: ['保本保息', '无风险'],
+  // speakerNames: ['扬声器'], // null或不传，则不强制使用扬声器设备；若传入有效数组，则每项代表允许的设备名称如"xxx Speaker Device"，逻辑为包含，不需要全等。
   meetingInfo: {
     title: '--',
     host: '--',