react_hsbc_teller 2.0.27 → 2.0.29

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -213,14 +213,14 @@ export default class foot extends Component {
                         </div>
                     </div>
                     </div>
-                    <div className='footHover' onClick={this.toggleAsr.bind(this)}>
+                    {/* <div className='footHover' onClick={this.toggleAsr.bind(this)}>
                     <div className="one">
                         <img className="imgClass" src={require("../../assets/img/icon_asr.png").default} alt="" />
                         <div className="text">
                             ASR检测
                         </div>
                     </div>
-                    </div>
+                    </div> */}
                 </div>
                 {defaultList}
                 

package/packages/pages/multiModule/components/copy/copyTwo.jsx

@@ -376,6 +376,7 @@ class Copy extends Component {
 		}
 	  }
 	  mouseUp=(ev)=> {
+			if (!this.state.isDown) return;
 		ev.preventDefault();
 		let { ctx, stageInfo } = this.state
 			let canvas = this.refs.canvas1;
@@ -611,6 +612,7 @@ class Copy extends Component {
 							onMouseDown={this.mouseDown}
 							onMouseMove={this.mouseMove}
 							onMouseUp={this.mouseUp}
+							onMouseLeave={() => { this.state.isDown = false }}
 							></canvas>
 	
 					</div>
@@ -624,6 +626,7 @@ class Copy extends Component {
 							onMouseDown={this.mouseDown}
 							onMouseMove={this.mouseMove}
 							onMouseUp={this.mouseUp}
+							onMouseLeave={() => { this.state.isDown = false }}
 							></canvas>
 					</div>
 				</div>

package/packages/pages/multiModule/components/copy/copy_en.jsx

@@ -151,6 +151,7 @@ class Copy extends Component {
 		}
 	  }
 	  mouseUp=(ev)=> {
+			if (!this.state.isDown) return;
 		ev.preventDefault();
 		const obj = {
 			x: ev.pageX,
@@ -322,6 +323,7 @@ class Copy extends Component {
 							onMouseDown={this.mouseDown}
 							onMouseMove={this.mouseMove}
 							onMouseUp={this.mouseUp}
+							onMouseLeave={() => { this.state.isDown = false }}
 							></canvas>
 					</div>
 					<div className="btnsEN footEN">

package/packages/pages/multiModule/components/copy/risk.jsx

@@ -171,6 +171,7 @@ class Risk extends Component {
 		}
 	  }
 	  mouseUp=(ev)=> {
+			if (!this.state.isDown) return;
 		ev.preventDefault();
 		const obj = {
 			x: ev.pageX,
@@ -241,6 +242,7 @@ class Risk extends Component {
 							onMouseDown={this.mouseDown}
 							onMouseMove={this.mouseMove}
 							onMouseUp={this.mouseUp}
+							onMouseLeave={() => { this.state.isDown = false }}
 							></canvas>
 							{
 								// !this.state.isSignOk && <div className="signHere"><FormattedMessage id="spaceAccording" /></div>

package/packages/pages/multiModule/components/copy/risk.less

@@ -65,7 +65,7 @@
         // left: 50%;
         // top: 35%;
         // transform: translate(-50%,-50%);
-        // flex:1;
+        flex: none;
     }
     .signHere{
         font-size: 30px;

package/packages/pages/multiModule/components/sign/signMy.jsx

@@ -184,6 +184,7 @@ class Sign extends Component {
 		}
 	  }
 	  mouseUp=(ev)=> {
+			if (!this.state.isDown) return;
 		ev.preventDefault();
 		const obj = {
 			x: ev.pageX,
@@ -253,6 +254,7 @@ class Sign extends Component {
 							onMouseDown={this.mouseDown}
 							onMouseMove={this.mouseMove}
 							onMouseUp={this.mouseUp}
+							onMouseLeave={() => { this.state.isDown = false }}
 							></canvas>
 							{
 					!this.state.isSignOk && <div className="signHere"><FormattedMessage id="plzSign" /></div>

package/packages/pages/multiModule/components/sign/signMy.less

@@ -60,7 +60,7 @@
         border:1.5px dashed  #646464;
         margin: auto;
         position: relative;
-        // flex:1;
+        flex: none;
 
         .canvasF{
             z-index: 10;

package/packages/pages/sign/signMy.jsx

@@ -163,6 +163,7 @@ class Sign extends Component {
 		}
 	  }
 	  mouseUp=(ev)=> {
+			if (!this.state.isDown) return;
 		ev.preventDefault();
 		const obj = {
 			x: ev.pageX,
@@ -195,6 +196,7 @@ class Sign extends Component {
 							onMouseDown={this.mouseDown}
 							onMouseMove={this.mouseMove}
 							onMouseUp={this.mouseUp}
+							onMouseLeave={() => { this.state.isDown = false }}
 							></canvas>
 							              <div className='signButton'>
                 {

package/packages/pages/video/video.jsx

@@ -58,7 +58,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.27'
+const SDK_VERISON = '2.0.29'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -1654,7 +1654,11 @@ class Video extends Component {
       else if (Mival.typeId == 5001) { // 客户端离框
         let TITLE = '客户'
         if (Mival.data && Mival.data.userId) {
-          TITLE = this.getUserTitle(Mival.data.userId)
+          if (Mival.data.userId.includes(IPAD_SUFFIX)) {
+            TITLE = ''
+          } else {
+            TITLE = this.getUserTitle(Mival.data.userId)
+          }
         }
         this.messageClick(TITLE+'人脸已离框', 'error', Mival.data.userId)
         // this.saveVideoPoint('ffd', '客户人脸离框');
@@ -1662,7 +1666,11 @@ class Video extends Component {
       else if (Mival.typeId == 5002) { // 客户端背光
         let TITLE = '客户'
         if (Mival.data && Mival.data.userId) {
-          TITLE = this.getUserTitle(Mival.data.userId)
+          if (Mival.data.userId.includes(IPAD_SUFFIX)) {
+            TITLE = ''
+          } else {
+            TITLE = this.getUserTitle(Mival.data.userId)
+          }
         }
         this.messageClick(TITLE+'背光、曝光过度', 'error', Mival.data.userId)
         // this.saveVideoPoint('env', '客户端背光、曝光过度');
@@ -1670,13 +1678,17 @@ class Video extends Component {
       else if (Mival.typeId == 5003) { // 客户端弱网
         let TITLE = '客户'
         if (Mival.data && Mival.data.userId) {
-          TITLE = this.getUserTitle(Mival.data.userId)
+          if (Mival.data.userId.includes(IPAD_SUFFIX)) {
+            TITLE = 'iPad'
+          } else {
+            TITLE = this.getUserTitle(Mival.data.userId)
+          }
         }
         this.messageClick(TITLE+'当前网络较弱', 'error', Mival.data.userId)
         // this.saveVideoPoint('wnd', '客户端弱网');
       }
       else if (Mival.typeId == 5004) { // ipad低电量
-        this.messageClick('IPAD电量过低', 'error', Mival.data.userId)
+        this.messageClick('iPad电量过低', 'error', Mival.data.userId)
         
         this.setState({
           ipadLowPowerErrorModalVisible: true,
@@ -1699,6 +1711,9 @@ class Video extends Component {
         }
         this.messageClick(TITLE+'人脸数量发生变化', 'error', Mival.data.userId)
       }
+      else if (Mival.typeId == 5006) { // 内网pib检测到敏感词
+        this.messageClick(Mival.content, 'error', Mival.data.userId)
+      }
       else if (Mival.typeId == 1220) {
         // 一炒多的图片  1214
         if (Mival.sessionId == this.state.sessionId) {
@@ -2581,6 +2596,10 @@ class Video extends Component {
                 console.log('过滤订阅的tag:', itemOne.tag)
                 return
               }
+              if (itemOne.mediaSource == 'VIDEO_SOURCE_CAMERA' && item.uid.includes(IPAD_SUFFIX)) {
+                this.state.ipadTag = itemOne.tag;
+                console.log('ipadTag:', itemOne.tag)
+              }
               let array = this.state.roomCustomerList;
               let newArray = [...array];
               newArray.push({
@@ -2872,7 +2891,7 @@ class Video extends Component {
 
       if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
         // ipad单独处理，不需要加入和退出的提示。但双录过程中ipad如果离开，要提示+循环播报直到ipad重新入会
-        console.log('ipad退出房间', participant)
+        console.log('iPad退出房间', participant)
         
         this.setState({
           IpadLeaveErrorModalVisible: true,
@@ -2889,6 +2908,10 @@ class Video extends Component {
         }
         setTimeout(this.ipadLeavePlay, 0);
         return
+      } else if (participant.includes(IPAD_SUFFIX)) {
+        this.setState({
+          ipadTag: '',
+        })
       }
       
 
@@ -3119,6 +3142,7 @@ class Video extends Component {
           isRecordingeErrorModalVisible: true,
           businessRecordId: '',
         })
+        this.saveLog(`dual recording crash, recordId=${recordId}`);
         // 循环播放录制中断语音
         clearTimeout(this.recordLoopPlay)
         this.recordLoopPlay = () => {
@@ -4292,7 +4316,7 @@ class Video extends Component {
   handleOkIpadLeaveConfirm = () => {
     // 检测ipad是否入会
     if (!this.state.ipadTag) {
-      this.messageClick('未检测到IPAD，请重新加入后再试', 'error')
+      this.messageClick('未检测到iPad，请重新加入后再试', 'error')
     } else {
       clearTimeout(this.ipadLeavePlay)
       this.setState({IpadLeaveErrorModalVisible: false})
@@ -6316,7 +6340,8 @@ class Video extends Component {
                             this.state.envInfo.batteryResult=='合格' &&
                             (this.state.envInfo.cameraResult=='合格' || this.props.recordMode == 2) &&
                             this.state.envInfo.microResult=='合格' &&
-                            (this.state.envInfo.lightResult=='合格' || this.props.recordMode == 2 )
+                            (this.state.envInfo.lightResult=='合格' || this.props.recordMode == 2 ) &&
+                            (this.state.ipadTag || this.props.recordMode != 2)
 
     const sectionStyle = this.state.tabTitles.length > 0 ? {
       zIndex: '-1',
@@ -6662,15 +6687,25 @@ class Video extends Component {
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkLowPowerConfirm}>确定</Button>
             </div>
           ]}>
-            <div className='endModal'>IPAD电量过低，请检查</div>
+            <div className='endModal'>iPad电量过低，请检查</div>
           </Modal>
           {/* 双录中ipad退出确认 */}
-          <Modal closable={false} centered={true} visible={this.state.IpadLeaveErrorModalVisible} maskClosable={false} footer={[
+          <Modal closable={false} centered={true} visible={this.state.IpadLeaveErrorModalVisible} maskClosable={false}  width={320} footer={[
             <div key='end'>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkIpadLeaveConfirm}>确定</Button>
             </div>
           ]}>
-            <div className='endModal'>IPAD异常退出，请重新加入</div>
+            <div className='ipadModal'>iPad 摄像头异常退出，请扫码重新加入会议</div>
+              <QRCode
+                value={JSON.stringify({
+                  sessionId:this.state.sessionId,
+                  staffId: this.props.tellerAccount,
+                  staffName: this.props.staffName
+                })}  //value参数为生成二维码的链接
+                className="ipadCode"
+                size={120} //二维码的宽高尺寸
+                fgColor="#000000"  //二维码的颜色
+            />
           </Modal>
           {/* 是否退出会议*/}
           <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} maskClosable={false} footer={[
@@ -7065,6 +7100,22 @@ class Video extends Component {
                   {this.state.cameraList.length == 0 ? <p className="envClass">获取不到设备，请检查电脑“设置”中的麦克风权限是否开启，并重启浏览器再试</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'}>
+                  <p className="envClass">{this.state.ipadTag? 'iPad设备已加入':'未检测到iPad设备，请扫码加入会议'}</p> 
+                  <QRCode
+                      value={JSON.stringify({
+                        sessionId: this.state.sessionId,
+                        staffId: this.props.tellerAccount,
+                        staffName: this.props.staffName
+                      })}
+                      style={{marginTop: '8px', marginLeft: '20px', display: this.state.ipadTag? 'none':'block'}}
+                      size={100}
+                      fgColor="#000000" 
+                  />
+                </Panel>
+              }
               {
                 this.props.recordMode != 2 && 
               <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'}>

package/packages/pages/video/video.less

@@ -454,6 +454,23 @@
     padding: 56px 30px 0px 30px;
     color: #333333;
 }
+.ipadModal{
+  font-size: 16px;
+  padding: 36px 30px 0px 30px;
+  color: #333333;
+}
+.ipadModal .ant-modal-body{
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+.ipadCode{
+  margin-top: 16px;
+  margin-bottom: 20px;
+  transform: translateX(-50%);
+  left: 50%;
+  position: relative;
+}
 .inspection{
   font-size: 16px;
   margin: 20px 50px;