react_hsbc_teller 2.0.26 → 2.0.28

package/package.json

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

package/packages/demo/demo.js

@@ -33,7 +33,7 @@ roomId
     // resourcePath: 'https://counter-web.leimondata.cn:7199',
     // resourcePath:'http://121.196.19.70:8027/',
     roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws',
-    baseURL:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuulsit/api/leimon-counter-api',
+    baseURL:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
     resourcePath:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
     prohibitPrompt: '无客户',
   titleBackground: '#40a9ff',
@@ -192,6 +192,10 @@ userExit =(val)=>{
             
           })
     }
+    componentDidCatch(error, info) {
+        console.log('componentDidCatch')
+        console.error(error, info)
+    }
   render() {
     return (
       <div className="test">

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.26'
+const SDK_VERISON = '2.0.28'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -139,6 +139,7 @@ function clearStreamRemain() {
     beautyDiv.beauty_canvas = null;
   }
   if (!(beautyDiv.beauty_player == null || beautyDiv.beauty_player == undefined)) {
+    console.log('beautyDiv destroy')
     beautyDiv.beauty_player.destroy();
     beautyDiv.beauty_player = null;
   }
@@ -612,15 +613,16 @@ class Video extends Component {
   // 开启录制
   enableServerRecording = (record_business_id) => {
     const that = this
+    const SCALE = 1.5
     this.rateAll().then((res) => {
       console.log('退出房间者', res)
       let list = [
         {
           tag: 'projectionWhiteboard',
           xPosition: 0,
-          yPosition: 175,
-          width: 960,
-          height: 540
+          yPosition: 175 * SCALE,
+          width: 1280,
+          height: 720
         },
         // {
         //   tag: 'VIDEO_SOURCE_SCREEN_ONE',
@@ -640,50 +642,50 @@ class Video extends Component {
           tag: 'tag1',
           xPosition: 0,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer1',
-          xPosition: 213,
+          xPosition: 213 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer2',
-          xPosition: 426,
+          xPosition: 426 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer3',
-          xPosition: 639,
+          xPosition: 639 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer4',
-          xPosition: 852,
+          xPosition: 852 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer5',
-          xPosition: 1065,
+          xPosition: 1065 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         {
           tag: 'customer6',
-          xPosition: 1278,
+          xPosition: 1278 * SCALE,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 213 * SCALE,
+          height: 175 * SCALE
         },
         // {
         //   tag: 'sharedScreen', // 一期暂时不需要录制
@@ -697,18 +699,18 @@ class Video extends Component {
         res.map((item) => {
           list.push({
             tag: item.tag,
-            xPosition: item.xaxis,
-            yPosition: item.yaxis,
-            width: item.width,
-            height: item.height
+            xPosition: (item.xaxis * SCALE),
+            yPosition: (item.yaxis * SCALE),
+            width: (item.width * SCALE),
+            height: (item.height * SCALE)
           })
         }) :
         list.push({
           tag: 'VIDEO_SOURCE_SCREEN',
-          xPosition: 960,
-          yPosition: 535,
-          width: 320,
-          height: 180
+          xPosition: 960 * SCALE,
+          yPosition: 535 * SCALE,
+          width: 320 * SCALE,
+          height: 180 * SCALE
         })
       // list.push({
       //   tag: 'VIDEO_SOURCE_SCREEN_19_9',
@@ -719,8 +721,8 @@ class Video extends Component {
       // })
       const filePath = 'recordId_' + new Date().valueOf();
       const recordParam = {};
-      recordParam.width = 1280;
-      recordParam.height = 720;
+      recordParam.width = 1280 * SCALE;
+      recordParam.height = 720 * SCALE;
       recordParam.recordTotalStream = 0;
       recordParam.startTimeout = 10;
       recordParam.splitType = 0;
@@ -732,10 +734,10 @@ class Video extends Component {
           type: 2, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
           id: 2, // ⽔印 ID
           enable: true,
-          xPosition: 640, // x 轴位置
-          yPosition: 10, // y 轴位置
+          xPosition: 640 * SCALE, // x 轴位置
+          yPosition: 10 * SCALE, // y 轴位置
           text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
-          fontSize: 16, // 字体⼤⼩
+          fontSize: 16 * SCALE, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
         {
@@ -743,10 +745,10 @@ class Video extends Component {
           type: 1, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
           id: 1, // ⽔印 ID
           enable: true,
-          xPosition: 1080, // x 轴位置
-          yPosition: 10, // y 轴位置
+          xPosition: 1080 * SCALE, // x 轴位置
+          yPosition: 10 * SCALE, // y 轴位置
           text: '', // ⽔印⽂字
-          fontSize: 16, // 字体⼤⼩
+          fontSize: 16 * SCALE, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
       ];
@@ -1652,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', '客户人脸离框');
@@ -1660,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', '客户端背光、曝光过度');
@@ -1668,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,
@@ -2870,7 +2884,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,
@@ -3117,6 +3131,7 @@ class Video extends Component {
           isRecordingeErrorModalVisible: true,
           businessRecordId: '',
         })
+        this.saveLog(`dual recording crash, recordId=${recordId}`);
         // 循环播放录制中断语音
         clearTimeout(this.recordLoopPlay)
         this.recordLoopPlay = () => {
@@ -3566,6 +3581,11 @@ class Video extends Component {
       }
     }
   }
+  componentDidCatch(error, info) {
+    console.log('componentDidCatch')
+    console.error(error, info)
+  }
+
   componentWillUnmount() {
     this.saveLog('Exit meeting')
     if (this.test_controller && this.state.sessionType) {
@@ -3868,7 +3888,7 @@ class Video extends Component {
     })
     this.asr_controller = new MyAsrController({
       token: this.state.asrToken,
-      appkey: this.state.asrAppKey,
+      appKey: this.state.asrAppKey,
       url: this.state.asrServerUrl,
       recorder: this.state.recorder
     })
@@ -4285,7 +4305,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})
@@ -5697,7 +5717,7 @@ class Video extends Component {
     this.setState({
       isModalVisibleEnvironment: false,
     })
-    if (!this.state.isPictureInPicture && this.props.recordMode != 2) {
+    if (!this.state.isPictureInPicture) {
       this.pictureInPicture()
     }
   }
@@ -6655,15 +6675,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={[

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;

package/packages/utils/asrController.js

@@ -37,8 +37,9 @@ let websocket_audio2txt_complete_time_end = 100;  //websocket 语音转文本
 
 export default class MyAsrController {
   constructor(headers) {
+    console.log('MyAsrController', headers, headers.appKey)
     this.token = headers.token || 'default';
-    this.appKey = headers.appKey || 'E6DAPlpMun5L2dJ7';
+    this.appKey = headers.appKey;
     this.url = headers.url;
 
     //初始化录音实例
@@ -97,7 +98,11 @@ export default class MyAsrController {
   }
   
   Disconnect() {
-    this.recorderInstance.stop();
+    try { 
+      this.recorderInstance.stop();
+    } catch(err){
+      console.log(err)
+    }
     clearInterval(this.interval);
     this.websocketStopTranscription()
   }