react_hsbc_teller 2.0.37 → 2.0.39

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -119,7 +119,7 @@ export default class foot extends Component {
                       <div className="one">
                           <img className="imgClass" src={require("../../assets/img/switchExternal.png").default} alt="" />
                           <div className="text">
-                          远程签署
+                            {this.props.recordMode == 1?'远程':''}签署 
                           </div>
                       </div>
                       </div>

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.37'
+const SDK_VERISON = '2.0.39'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -78,7 +78,8 @@ const POINT_TYPE = {
   wnd:	"弱网",
   mute:  "静音",
   expDark: '曝光、背光',
-  fcd: '人脸变化检测'
+  fcd: '人脸变化检测',
+  padConnected: 'ipad已连接'
 }
 const RECORD_DEVICE_NAME = 'screen-capture-recorder'
 // const RECORD_DEVICE_NAME = 'Full HD webcam'
@@ -1522,7 +1523,7 @@ class Video extends Component {
       pictureInPictureVideo.style.display = 'block';
       pictureInPictureVideo.play();
       this.state.isPictureInPicture = true
-      clearTimeout(this.loopPlay)
+      clearTimeout(this.loopPlayTimer)
     });
 
     pictureInPictureVideo.addEventListener('leavepictureinpicture', (event) => {
@@ -1533,7 +1534,7 @@ class Video extends Component {
       worker.postMessage(false);
       this.state.isPictureInPicture = false
 
-      clearTimeout(this.loopPlay)
+      clearTimeout(this.loopPlayTimer)
       // 画中画循环播放逻辑
       if (document.hidden && this.state.businessRecordId) {
         this.setState({
@@ -1544,7 +1545,7 @@ class Video extends Component {
           if(!this.state.isPictureInPicture && document.getElementById("publish_streamId1")){
             let audio = new Audio(PIPictureClosedAudio)
             audio.play()
-            setTimeout(this.loopPlay, 3000);
+            this.loopPlayTimer = setTimeout(this.loopPlay, 3000);
           }
         }
         setTimeout(this.loopPlay, 0);
@@ -1710,12 +1711,13 @@ class Video extends Component {
           ipadLowPowerErrorModalVisible: true,
         })
         // 循环播放ipad低电量
-        clearTimeout(this.ipadLowPowerPlay)
+        clearTimeout(this.ipadLowPowerPlayTimer)
         this.ipadLowPowerPlay = () => {
           if(this.state.ipadLowPowerErrorModalVisible){
-            let audio = new Audio(IpadLowPowerAudio)
-            audio.play()
-            setTimeout(this.ipadLowPowerPlay, 3000);
+            if (this.lowPowerAudio) this.lowPowerAudio.pause()
+            this.lowPowerAudio = new Audio(IpadLowPowerAudio)
+            this.lowPowerAudio.play()
+            this.ipadLowPowerPlayTimer = setTimeout(this.ipadLowPowerPlay, 3000);
           }
         }
         setTimeout(this.ipadLowPowerPlay, 0);
@@ -1737,7 +1739,7 @@ class Video extends Component {
       else if (Mival.typeId == 5007) { // ipad充电状态
         if (Mival.type == '1') { // 1充电 2不在充电
           this.setState({ ipadLowPowerErrorModalVisible: false})
-          clearTimeout(this.ipadLowPowerPlay)
+          clearTimeout(this.ipadLowPowerPlayTimer)
         } 
       }
       else if (Mival.typeId == 1220) {
@@ -1924,13 +1926,13 @@ class Video extends Component {
         //   businessRecordId: '',
         // })
         // // 循环播放录制中断语音
-        // clearTimeout(this.recordLoopPlay)
+        // clearTimeout(this.recordLoopPlayTimer)
         // this.recordLoopPlay = () => {
         //   console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
         //   if(!this.state.businessRecordId && document.getElementById("publish_video1")){
         //     let audio = new Audio(recordErrorAudio)
         //     audio.play()
-        //     setTimeout(this.recordLoopPlay, 3000);
+        //     this.recordLoopPlayTimer = setTimeout(this.recordLoopPlay, 3000);
         //   }
         // }
         // setTimeout(this.recordLoopPlay, 0);
@@ -2706,6 +2708,10 @@ class Video extends Component {
       console.log('新加⼊房间者', participant);
       this.saveLog('mrtc someone joined room, userId=' + participant)
       this.state.isCustomer = true
+
+      if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
+        this.saveVideoPoint('padConnected', 'ipad已连接');
+      }
     };
     // 推送“有新发布”给与会者
     this.test_controller.OnNewPublish = (feed) => {
@@ -2938,13 +2944,13 @@ class Video extends Component {
           IpadLeaveErrorModalVisible: true,
           ipadTag: '',
         })
-        // 循环播放录制中断语音
-        clearTimeout(this.ipadLeavePlay)
+        // 循环播放ipad退出语音
+        clearTimeout(this.ipadLeavePlayTimer)
         this.ipadLeavePlay = () => {
           if(!this.state.ipadTag && document.getElementById("publish_streamId1")){
             let audio = new Audio(IpadLeaveAudio)
             audio.play()
-            setTimeout(this.ipadLeavePlay, 3000);
+            this.ipadLeavePlayTimer = setTimeout(this.ipadLeavePlay, 3000);
           }
         }
         setTimeout(this.ipadLeavePlay, 0);
@@ -3194,13 +3200,13 @@ class Video extends Component {
         })
         this.saveLog(`dual recording crash, recordId=${recordId}`);
         // 循环播放录制中断语音
-        clearTimeout(this.recordLoopPlay)
+        clearTimeout(this.recordLoopPlayTimer)
         this.recordLoopPlay = () => {
           console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
           if(!this.state.businessRecordId && document.getElementById("publish_streamId1")){
             let audio = new Audio(recordErrorAudio)
             audio.play()
-            setTimeout(this.recordLoopPlay, 3000);
+            this.recordLoopPlayTimer = setTimeout(this.recordLoopPlay, 3000);
           }
         }
         setTimeout(this.recordLoopPlay, 0);
@@ -3674,10 +3680,10 @@ class Video extends Component {
     worker.postMessage(false);
     worker.terminate();
     message.destroy()
-    clearTimeout(this.loopPlay)
-    clearTimeout(this.recordLoopPlay)
-    clearTimeout(this.ipadLeavePlay)
-    clearTimeout(this.ipadLowPowerPlay)
+    clearTimeout(this.loopPlayTimer)
+    clearTimeout(this.recordLoopPlayTimer)
+    clearTimeout(this.ipadLeavePlayTimer)
+    clearTimeout(this.ipadLowPowerPlayTimer)
     clearInterval(this.state.drawCanvasInterval)
     clearInterval(this.state.faceDetectionTimer);
     clearInterval(this.state.imageDetectionTimer);
@@ -4379,6 +4385,7 @@ class Video extends Component {
     }
     this.saveLog('Start business recording')
     this.enableServerRecording(this.state.businessId)
+    clearTimeout(this.recordLoopPlayTimer)
   }
   handleOkLowPowerConfirm = () => {
     // 通知ipad，获取是否在充电的状态
@@ -4393,7 +4400,7 @@ class Video extends Component {
     if (!this.state.ipadTag) {
       this.messageClick('未检测到iPad，请重新加入后再试', 'error')
     } else {
-      clearTimeout(this.ipadLeavePlay)
+      clearTimeout(this.ipadLeavePlayTimer)
       this.setState({IpadLeaveErrorModalVisible: false})
     }
   }
@@ -6570,9 +6577,12 @@ class Video extends Component {
                               {otherAttendeesList}
                             </li>
                           }
+                          {
+                            this.props.recordMode != 2 &&
                           <li>
                             请注意，若会议中需要客户出示证件，请客户使用手机的后置摄像头展示证件，由客户经理拍摄证件照片以完成客户身份核实。客户可点击会议主页面上的”切换摄像头“按钮切换手机摄像头
                           </li>
+                          }
 
                         </ul>
                       </div>
@@ -6587,7 +6597,7 @@ class Video extends Component {
                             size={110} //二维码的宽高尺寸
                             fgColor="#000000"  //二维码的颜色
                         />
-                        <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+                        <div className='sessionDiv' style={{marginTop: '20px'}}><span>会议号码</span><div className='num'>{this.state.sessionId}</div></div>
                       </div> : null}
                     </div>
                   }
@@ -6818,7 +6828,7 @@ class Video extends Component {
                 size={120} //二维码的宽高尺寸
                 fgColor="#000000"  //二维码的颜色
             />
-            <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+            <div className='sessionDiv'><span>会议号码</span><div className='num'>{this.state.sessionId}</div></div>
             </div>
           </Modal>
           {/* 是否退出会议*/}
@@ -7216,8 +7226,8 @@ class Video extends Component {
               </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'}>
-                  <p className="envClass">{this.state.ipadTag? 'iPad设备已加入':'未检测到iPad设备，请扫码或输入会议号入会'}</p> 
+                <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'}>
+                  <p className="envClass">{this.state.ipadTag? 'iPad设备已加入':'请使用双录iPAD扫描以下会议二维码或输入会议号，开启双录'}</p> 
                   <div className='QRCode flex' style={{display: this.state.ipadTag? 'none':''}}>
                   <QRCode
                       value={JSON.stringify({
@@ -7229,7 +7239,7 @@ class Video extends Component {
                       size={100}
                       fgColor="#000000" 
                   />
-                  <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+                  <div className='sessionDiv'><span>会议号码</span><div className='num'>{this.state.sessionId}</div></div>
                   </div>
                 </Panel>
               }

package/packages/pages/video/video.less

@@ -466,7 +466,7 @@
 }
 .ipadCode{
   margin-top: 16px;
-  margin-bottom: 20px;
+  margin-bottom: 16px;
   margin-left: 30px;
   position: relative;
 }
@@ -668,7 +668,7 @@ display: inline-flex;
   display: flex;
   flex-direction: column;
   align-items: center;
-  .sessionDiv{
+  .num{
     background: #DB0011;
     border-radius: 20px;
     padding: 0 15px;
@@ -676,14 +676,26 @@ display: inline-flex;
     line-height: 40px;
     height: 40px;
     color: white;
-    margin-top: 20px;
+    margin-top: 5px;
+  }
+  .sessionDiv{
+    display: flex;
+    flex-direction: column;
+    span{
+      margin-bottom: 3px;
+      font-size: 16px;
+      font-weight: bold;
+      text-align: center;
+    }
   }
   &.flex{
     position: initial;
     flex-direction: row;
     .sessionDiv{
       margin-left: 20px;
-      margin-top: 0;
+    }
+    .num{
+      margin-top: 0px;
       font-weight: 500;
       font-size: 1rem;
     }
@@ -693,8 +705,8 @@ display: inline-flex;
     .ipadCode{
       margin-left: 0px;
     }
-    .sessionDiv{
-      margin-top: 0;
+    .num{
+      margin-top: 0px;
       font-weight: 500;
       font-size: 1rem;
       margin-bottom: 0.5rem;