react_hsbc_teller 2.0.43 → 2.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "2.0.43",
+  "version": "2.0.45",
   "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.43'
+const SDK_VERISON = '2.0.45'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -85,6 +85,7 @@ const POINT_TYPE = {
 const RECORD_DEVICE_NAME = 'screen-capture-recorder'
 // const RECORD_DEVICE_NAME = 'Full HD webcam'
 const IPAD_SUFFIX = '_ipad'
+const H5_SUFFIX = '_h5'
 let media_status = 0
 let pictureInPictureVideo
 let mix_stream
@@ -1405,6 +1406,7 @@ class Video extends Component {
         let microphoneSize = 50
         var img = document.getElementById("icon_huatong");
         var img1 = document.getElementById("icon_huatong_close");
+        if (!this.state.listVideoPicture[i].title.includes(IPAD_SUFFIX)) {
         if (this.state.listVideoPicture[i].mute) {
           cobj.drawImage(img1, 10, 360 * (i + 1) - 60 + baseStartHeight, microphoneSize, microphoneSize);
         } else {
@@ -1451,9 +1453,7 @@ class Video extends Component {
               // requestAnimationFrame(aou.bind(this, analyser)) 
             )
           }
-
-
-
+        }
         }
 
         // 绘制消息
@@ -2339,6 +2339,11 @@ class Video extends Component {
         } else {
           this.state.isScreenSwitching = false
           this.setSharedScreenState(false)
+          if (code == 5012) {
+            this.saveLog('Manual cancel share'); // 点了取消，拒绝系统授权
+          } else {
+            this.saveLog('System error stop share');
+          }
         }
       }
     };
@@ -2465,7 +2470,7 @@ class Video extends Component {
         return newStream
       }
 
-      if (publish_tag == 'projectionWhiteboard' && publish_device == 2) {
+      if (publish_tag == 'projectionWhiteboard' && (publish_device == 2 || publish_device == 5)) {
         let newStream1 = stream;
         if (stream.getVideoTracks()[0]) {
           try {
@@ -2480,7 +2485,10 @@ class Video extends Component {
             } else if (stream.getVideoTracks()[0].label.includes('window')){
               console.log('窗口共享')
               this.saveLog('Share type = window')
-            } 
+            } else if (stream.getVideoTracks()[0] instanceof CanvasCaptureMediaStreamTrack){
+              console.log('白板共享')
+              this.saveLog('Share type = whiteboard')
+            }
           } catch (err) {
             console.log('不支持此浏览器记录投屏类型日志')
             console.log(navigator.userAgent)
@@ -2531,6 +2539,7 @@ class Video extends Component {
       this.state.sessionType = true
       if (sid == document.getElementById('video20').name) {
         this.setSharedScreenState(true)
+        this.saveLog('Share success')
         this.sendMessage({
           'typeId': 2030,
           'sessionId': this.state.sessionId,
@@ -2598,9 +2607,10 @@ class Video extends Component {
       if (sid == document.getElementById('publish_streamId1').name) {
         this.state.sessionType = false
         this.roomCallBack(2, '发布失败', 4)
-      } else if (sid == document.getElementById('video20').name) {
+      } else {
         this.messageClick('投屏失败请重新投屏', 'error')
         this.setSharedScreenState(false)
+        this.saveLog('Share fail')
       }
 
     };
@@ -2729,6 +2739,12 @@ class Video extends Component {
       if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
         this.saveVideoPoint('padConnected', 'ipad已连接');
       }
+      if (participant.includes(H5_SUFFIX)){
+        this.messageClick('客户端已就绪，可进行签署', 'error')
+        if (typeof this.props.h5JoinCallback === 'function'){
+          this.props.h5JoinCallback()
+        }
+      }
     };
     // 推送“有新发布”给与会者
     this.test_controller.OnNewPublish = (feed) => {
@@ -2853,6 +2869,7 @@ class Video extends Component {
         })
         this.state.isSharedScreen = false
         this.setSharedScreenState(false)
+        this.saveLog('Stop share')
         this.setState({
 
           screenName: '共享模式'
@@ -3328,6 +3345,7 @@ class Video extends Component {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
           this.setSharedScreenState(true)
+          this.saveLog('Share changed')
         }
       }
     };
@@ -3349,6 +3367,7 @@ class Video extends Component {
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setSharedScreenState(false)
+        this.saveLog('Share fail')
         this.setState({
           screenName: '共享模式'
         });
@@ -5496,6 +5515,7 @@ class Video extends Component {
       }, error => {
         console.log("Unable to acquire screen capture", error);
         console.log('取消签署')
+        that.saveLog('Manual cancel share')
       });
   }
   publishRecorderDevice = () => {
@@ -5782,9 +5802,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) {
@@ -6492,6 +6519,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)
 
@@ -6754,6 +6782,7 @@ class Video extends Component {
                     <label style={{ display: 'none' }} id={'feedId'+(item.idIndex)} type="text" />
                     
                     <div onClick={this.muteOpposite.bind(this, 'video'+(item.idIndex))} style={{ display: (item.videoName) ? '' : 'none'}} className={`customerTitle titleSamlle`}>
+                    { item.videoName.includes(IPAD_SUFFIX) ? <span style={{paddingLeft: '8px'}}> </span>:<>
                     {
                       item.mute && <img
                         alt=""
@@ -6762,7 +6791,7 @@ class Video extends Component {
                       />
                     }
                     <canvas style={{ display: (item.videoName && !item.mute) ? '' : 'none',width: '25px',height:'25px',marginTop: '4px' }} className="canvasClassOne" id={"subscribe_volumeView"+(item.idIndex)} width="40" height="70"></canvas>
-
+                    </>}
                       <div className='titleName' style={{ color: this.props.titleColor,fontSize: this.props.fontSize + 'px',fontFamily : this.props.fontFamily}}>
                         {item.videoName}
                       </div>
@@ -6793,7 +6822,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}
@@ -6801,7 +6830,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}
@@ -7266,6 +7295,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'}>
@@ -7331,6 +7373,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: '--',