react_hsbc_teller 2.0.46 → 2.0.47

package/package.json

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

package/packages/demo/demo.js

@@ -5,18 +5,10 @@ import Pdf from './pdf.js'
 class Demo extends Component {
   state = {
     shareMask: false,
-    imRoomId
-    : 
-    "IZLZMoTxj@conference.ls-im-xmpp.chinawp.dev.ali.cloud.cn.hsbc",
-    sessionId
-    : 
-    "IZLZMoTxj",
-    mtoken
-: 
-"bc084d8a922f",
-roomId
-: 
-"663912632731275",
+    imRoomId: "",
+    sessionId: "",
+    mtoken: "",
+    roomId: "",
     // roomId: '',
     // mtoken: '',
     // imRoomId: '',

package/packages/pages/video/video.jsx

@@ -26,6 +26,7 @@ import ipadLeaveMeeting from '../../assets/mp3/ipad_leave_meeting.mp3'
 import recordErrorAudio from '../../assets/mp3/record_error.mp3'
 import IpadLeaveAudio from '../../assets/mp3/ipad_leave_error.mp3';
 import IpadLowPowerAudio from '../../assets/mp3/ipad_low_power.mp3'; 
+import MediaErrorAudio from '../../assets/mp3/media_error.mp3';
 import internalJoin from '../../assets/mp3/internalJoin.mp3'
 import internalLeft from '../../assets/mp3/internalLeft.mp3'
 import leftMetting from '../../assets/mp3/leftmeeting.mp3'
@@ -60,7 +61,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.46'
+const SDK_VERISON = '2.0.47'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -80,7 +81,8 @@ const POINT_TYPE = {
   mute:  "静音",
   expDark: '曝光、背光',
   fcd: '人脸变化检测',
-  padConnected: 'ipad已连接'
+  padConnected: 'ipad已连接',
+  conFail: '媒体流服务断开'
 }
 const RECORD_DEVICE_NAME = 'screen-capture-recorder'
 // const RECORD_DEVICE_NAME = 'Full HD webcam'
@@ -2329,6 +2331,24 @@ class Video extends Component {
       console.log('初始化音视频失败', err_code, err_msg)
       this.saveLog('OnMediaCallFail, code=' + err_code)
     };
+
+    const playAudioTip = () => {
+      this.messageClick('媒体流服务异常断开，请退出重试', 'error')
+      this.setState({
+        mediaErrorModalVisible: true,
+      })
+      // 循环播放提醒
+      clearTimeout(this.mediaErrorPlayTimer)
+      this.mediaErrorPlay = () => {
+        if(this.state.mediaErrorModalVisible){
+          if (this.mediaErrorAudio) this.mediaErrorAudio.pause()
+          this.mediaErrorAudio = new Audio(MediaErrorAudio)
+          this.mediaErrorAudio.play()
+          this.mediaErrorPlayTimer = setTimeout(this.mediaErrorPlay, 3000);
+        }
+      }
+      setTimeout(this.mediaErrorPlay, 0);
+    }
     // 音视频关闭通知
     this.test_controller.OnMediaClose = (code, sid) => {
       console.log('OnMediaClose',code, sid)
@@ -2336,9 +2356,17 @@ class Video extends Component {
         if (sid == this.state.publishSid) {
           this.saveLog('Audio and video close notification，' + code)
           this.roomCallBack(2, '音视频异常关闭', 8)
+          if (code == 5007 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
+            this.saveVideoPoint('conFail', `RM端媒体链路断开, err_code=${code}`)
+            playAudioTip();
+          }
         } else if (sid == this.state.publishScreenSid) {
           this.state.isScreenSwitching = false
           this.setSharedScreenState(false)
+          if (code == 5007 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
+            this.saveVideoPoint('conFail', `RM投屏媒体链路断开, err_code=${code}`)
+            playAudioTip();
+          }
           if (code == 5012) {
             this.saveLog('Manual cancel share'); // 点了取消，拒绝系统授权
           } else {
@@ -3731,6 +3759,7 @@ class Video extends Component {
     clearTimeout(this.recordLoopPlayTimer)
     clearTimeout(this.ipadLeavePlayTimer)
     clearTimeout(this.ipadLowPowerPlayTimer)
+    clearTimeout(this.mediaErrorPlayTimer)
     clearInterval(this.state.drawCanvasInterval)
     clearInterval(this.state.faceDetectionTimer);
     clearInterval(this.state.imageDetectionTimer);
@@ -4447,6 +4476,15 @@ class Video extends Component {
       'userId': this.props.tellerAccount
     })
   }
+  handleOkMediaErrorConfirm = () => {
+    // 刷新重试
+    clearTimeout(this.mediaErrorPlayTimer)
+    this.handleOkEnd()
+  }
+  handleCancelMediaError = () => {
+    clearTimeout(this.mediaErrorPlayTimer)
+    this.setState({ mediaErrorModalVisible: false })
+  }
   handleOkIpadLeaveConfirm = () => {
     // 检测ipad是否入会
     if (!this.state.ipadTag) {
@@ -5226,7 +5264,8 @@ class Video extends Component {
     try {
       let result = await API.appGetUsername({
         userId: userId,
-        sessionId: this.state.sessionId
+        sessionId: this.state.sessionId,
+        activityId: this.props.businessNumber
       });
       console.log(result)
 
@@ -6903,6 +6942,15 @@ class Video extends Component {
             <div className='sessionDiv'><span>会议号码</span><div className='num'>{this.state.sessionId}</div></div>
             </div>
           </Modal>
+          {/* 媒体流断开提示 */}
+          <Modal closable={false} centered={true} visible={this.state.mediaErrorModalVisible} maskClosable={false} footer={[
+            <div key='end'>
+              <Button className="modelButtonCancel" onClick={this.handleCancelMediaError}>取消</Button>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkMediaErrorConfirm}>确定</Button>
+            </div>
+          ]}>
+            <div className='endModal'>媒体流服务异常断开，请退出重试</div>
+          </Modal>
           {/* 是否退出会议*/}
           <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} maskClosable={false} footer={[
             <div key='end'>