react_hsbc_teller 2.0.68 → 2.0.70

package/package.json

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

package/packages/demo/demo.js

@@ -45,6 +45,16 @@ class Demo extends Component {
   audioinputNameList: ['默认值 - 外部麦克风 (Realtek(R) Audio)']
 }
 componentWillMount() {
+    if(window.localStorage.getItem('sessionId') && window.localStorage.getItem('sessionId') != 'null' && window.localStorage.getItem('sessionId') != 'undefined') {
+    this.setState({roomId: window.localStorage.getItem('roomId')});
+    this.setState({mtoken: window.localStorage.getItem('mtoken')});
+    this.setState({sessionId:window.localStorage.getItem('sessionId')});
+    this.setState({imRoomId: window.localStorage.getItem('imRoomId')});
+    this.setState({
+        isVideo: true
+    })
+    }
+
 }
 handleChangeRoomId = (event) => {
     this.setState({roomId: event.target.value});
@@ -73,6 +83,10 @@ onLeaveRoom = (val) => {
         this.setState({
             isVideo: false
         })
+            this.setState({roomId: ''});
+    this.setState({mtoken: ''});
+    this.setState({sessionId: ''});
+    this.setState({imRoomId: ''});
     }
 }
 handleChangeTeller = (event) => {

package/packages/pages/video/video.jsx

@@ -46,11 +46,13 @@ import IpadLeaveAudio from '../../assets/mp3/ipad_leave_error.mp3';
 import IpadLowPowerAudio from '../../assets/mp3/ipad_low_power.mp3'; 
 import ipadMediaCloseAudio from '../../assets/mp3/ipad_media_close.mp3'; 
 import MediaErrorAudio from '../../assets/mp3/media_error.mp3';
+import startMediaError from '../../assets/mp3/startMedia_error.mp3'
 import internalJoin from '../../assets/mp3/internalJoin.mp3'
 import internalLeft from '../../assets/mp3/internalLeft.mp3'
 import leftMetting from '../../assets/mp3/leftmeeting.mp3'
 import networkWeakAudio from '../../assets/mp3/networkweak.mp3'
 import PIPictureClosedAudio from '../../assets/mp3/pip_close.mp3'
+import connectErrorAudio from '../../assets/mp3/connect_error.mp3'
 import screenSharedIntervalAudio from '../../assets/mp3/share_stop_audio.mp3'
 import errorPng from '../../assets/img/tooltips2_fail.png'
 import styled from 'styled-components';
@@ -61,7 +63,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.68'
+const SDK_VERISON = '2.0.70'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -344,6 +346,9 @@ class Video extends Component {
     certificateValidityType: true,
     drawCanvasInterval: null,
     faceDetectionTimer: null, // 人脸检测定时器
+    mediaErrorModalMessage: '',
+    transcribeErrorModalVisible: false, // 双录异常
+    transcribeErrorCode: ''
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -763,6 +768,7 @@ class Video extends Component {
         },
       ];
       recordParam.tagPositions = list
+      // recordParam.tagFilter = 'customer1'
       console.log('recordParam', recordParam);
       that.test_controller.StartRemoteRecord(filePath, recordParam, record_business_id)
 
@@ -1577,7 +1583,7 @@ class Video extends Component {
     })
     this.saveLog('aborted code：' + code)
     if (this.state.sessionId) {
-      if (code == 'SYS-01' || code == 'SYS-02') {
+      if (code == 'SYS-01' || code == 'SYS-02' || String(code).includes('record-')) {
         this.props.joinRoomCallback({
           type: type,
           errorManage: manege,
@@ -1594,7 +1600,7 @@ class Video extends Component {
       }
 
     } else {
-      if (code == 'SYS-01' || code == 'SYS-02') {
+      if (code == 'SYS-01' || code == 'SYS-02' || String(code).includes('record-')) {
         this.props.createRoomCallback({
           type: type,
           errorManage: manege,
@@ -2297,7 +2303,7 @@ class Video extends Component {
       this.saveLog('Failed to get device, code='+code)
       this.state.sessionType = false
       this.messageClick('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头', 'error')
-      this.roomCallBack(2, '获取设备失败', 1)
+      this.roomCallBack(2, '获取设备失败', '1-' + code)
       this.showEnvDetection()
     };
     // 建立连接成功
@@ -2306,10 +2312,21 @@ class Video extends Component {
       this.ConnectMRTC()
     };
     this.test_controller.OnConnectFailed = (code, msg) => {
+      // -101：初始化超时-102/-1004：初始化失败  （MTC close） 30001: 信令连接失败  transcribeError
       console.log('建立连接失败', code, msg)
-      this.saveLog('Failed to establish connection，' + code)
-      this.state.sessionType = false
-      this.roomCallBack(2, '连接失败', 2)
+      if(code == 30001) {
+        this.setState({
+          transcribeErrorCode: 30001,
+          transcribeErrorModalVisible: true
+        })
+      } else {
+        
+        this.saveLog('Failed to establish connection，' + code)
+        this.messageClick('建立连接失败', 'error')
+        this.state.sessionType = false
+        this.roomCallBack(2, '连接失败', '2-'+code)
+      }
+      
     };
     // 断开连接回调
     this.test_controller.OnConnectClose = (code, msg) => {
@@ -2325,7 +2342,7 @@ class Video extends Component {
       console.log('初始化房间失败', err_code, err_msg)
       this.saveLog('Failed to initialize room，' + err_code)
       this.state.sessionType = false
-      this.roomCallBack(2, '初始化失败', 3)
+      this.roomCallBack(2, '初始化失败', '3-' + err_code)
     };
     // 初始化成功回调
     this.test_controller.OnInitRoomConfigOK = () => {
@@ -2357,7 +2374,7 @@ class Video extends Component {
       console.log('创建房间失败', err_code, err_msg)
       this.saveLog('Failed to create room，' + err_code)
       this.state.sessionType = false
-      this.roomCallBack(2, '创建房间失败', 7)
+      this.roomCallBack(2, '创建房间失败', '7-' + err_code)
     };
     // 初始化⾳视频成功
     this.test_controller.OnMediaCallSucc = (sid) => {
@@ -2370,8 +2387,13 @@ class Video extends Component {
       this.saveLog('OnMediaCallFail, code=' + err_code)
     };
 
-    const playAudioTip = () => {
-      this.messageClick('媒体流服务异常断开，请退出重试', 'error')
+    const playAudioTip = (code) => {
+      this.messageClick('媒体流服务异常断开，请刷新', 'error')
+      if(code == 5003) {
+        this.state.mediaErrorModalMessage = '媒体流服务异常，请刷新('+ code + ')'
+      } else {
+        this.state.mediaErrorModalMessage = '媒体流服务异常，请刷新('+ code + ')'
+      }
       this.setState({
         mediaErrorModalVisible: true,
       })
@@ -2380,7 +2402,11 @@ class Video extends Component {
       this.mediaErrorPlay = () => {
         if(this.state.mediaErrorModalVisible){
           if (this.mediaErrorAudio) this.mediaErrorAudio.pause()
-          this.mediaErrorAudio = new Audio(MediaErrorAudio)
+          if(code == 5003) {
+            this.mediaErrorAudio = new Audio(startMediaError)
+          } else {
+            this.mediaErrorAudio = new Audio(MediaErrorAudio)
+          }
           this.mediaErrorAudio.play()
           this.mediaErrorPlayTimer = setTimeout(this.mediaErrorPlay, 3000);
         }
@@ -2391,12 +2417,17 @@ class Video extends Component {
     this.test_controller.OnMediaClose = (code, sid) => {
       console.log('OnMediaClose',code, sid)
       if (code == 5003 || code == 5004 || code == 5005 || code == 5007 || code == 5009 || code == 5010 || code == 5011 || code == 5012) {
-        if (sid == this.state.publishSid) {
+        if (sid == this.state.publishSid) { 
           this.saveLog('Audio and video close notification，' + code)
-          this.roomCallBack(2, '音视频异常关闭', 8)
+          this.roomCallBack(2, '音视频异常关闭', '8-' + code)
           if (code == 5007 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
             this.saveVideoPoint('conFail', `RM端媒体链路断开, err_code=${code}`)
-            playAudioTip();
+            playAudioTip(code);
+          }
+          //5003：启动流失败（信令阶段）
+          if (code == 5003) {
+            this.saveVideoPoint('conFail', `RM端启动流失败, err_code=${code}`)
+            playAudioTip(code);
           }
         } else if (sid == this.state.publishScreenSid) {
           this.state.isScreenSwitching = false
@@ -2404,7 +2435,12 @@ class Video extends Component {
           this.setSharedScreenTimer(false)
           if (code == 5007 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
             this.saveVideoPoint('conFail', `RM投屏媒体链路断开, err_code=${code}`)
-            playAudioTip();
+            playAudioTip(code);
+          }
+          //5003：启动流失败（信令阶段）
+          if (code == 5003) {
+            this.saveVideoPoint('conFail', `RM投屏启动流失败, err_code=${code}`)
+            playAudioTip(code);
           }
           if (code == 5012) {
             this.saveLog('Manual cancel share'); // 点了取消，拒绝系统授权
@@ -2459,7 +2495,7 @@ class Video extends Component {
       //   sessionType: false,
       //   isJoinRoom: true
       // })
-      // this.roomCallBack(2, '加入失败',-5)
+      this.roomCallBack(2, '加入失败','5-' + err_code)
       this.state.channelId = '',
         this.state.rtoken = '',
         this.state.sessionId = '',
@@ -2679,7 +2715,11 @@ class Video extends Component {
       console.log('Publishing media stream failed，', sid, err_code, err_msg)
       if (sid == document.getElementById('publish_streamId1').name) {
         this.state.sessionType = false
-        this.roomCallBack(2, '发布失败', 4)
+        this.setState({
+          transcribeErrorCode: err_code,
+          transcribeErrorModalVisible: true
+        })
+        this.roomCallBack(2, '发布失败', '4-' + err_code)
       } else {
         this.messageClick('投屏失败请重新投屏', 'error')
         this.setSharedScreenState(false)
@@ -3233,6 +3273,7 @@ class Video extends Component {
         this.businessRecordCallback('1', false, record_third_id)
         this.saveLog('mrtc OnStartRemoteBusinessRecordFailed, code='+err_code + ',businessId=' + record_third_id)
       }
+      this.roomCallBack(2, '开始服务端录制失败', 'record-' + err_code)
     };
     // 结束服务端录制成功
     this.test_controller.OnStopRemoteRecordSucc = (recordId, record_third_id) => {
@@ -4706,7 +4747,11 @@ class Video extends Component {
   handleOkMediaErrorConfirm = () => {
     // 刷新重试
     clearTimeout(this.mediaErrorPlayTimer)
-    this.handleOkEnd()
+    location.reload(false);
+    // this.handleOkEnd()
+  }
+  handleOktranscribeErrorConfirm = () => {
+    location.reload(false);
   }
   handleCancelMediaError = () => {
     clearTimeout(this.mediaErrorPlayTimer)
@@ -7241,11 +7286,19 @@ class Video extends Component {
           {/* 媒体流断开提示 */}
           <Modal closable={false} centered={true} visible={this.state.mediaErrorModalVisible} maskClosable={false} footer={[
             <div key='end'>
-              <Button className="modelButtonCancel" onClick={this.handleCancelMediaError}>取消</Button>
+              {/* <Button className="modelButtonCancel" onClick={this.handleCancelMediaError}>取消</Button> */}
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkMediaErrorConfirm}>确定</Button>
             </div>
           ]}>
-            <div className='endModal'>媒体流服务异常断开，请退出重试</div>
+            <div className='endModal'>{this.state.mediaErrorModalMessage}</div>
+          </Modal>
+          {/* 30001(在信令链接失败回调中)/发布失败/音视频异常回调  相关事件印象双录失败提示 */}
+          <Modal closable={false} centered={true} visible={this.state.transcribeErrorModalVisible} maskClosable={false} footer={[
+            <div key='end'>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.handleOktranscribeErrorConfirm}>确定</Button>
+            </div>
+          ]}>
+            <div className='endModal'>{'系统异常请刷新('+ this.state.transcribeErrorCode + ')'}</div>
           </Modal>
           {/* 是否退出会议*/}
           <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} maskClosable={false} footer={[
@@ -7626,7 +7679,7 @@ class Video extends Component {
                     this.state.cameraList.map((item, index) => {
                       return <div key={index} className="envClass">
                           {/* <input type="radio" name="camere" value={item.actionid} style={{ float: 'left' }} checked={this.state.cameraValue == item.actionid} readOnly disabled /><i></i> */}
-                          {item.actionname}{this.state.cameraValue == item.actionid ? '（当前设备）' : ''}
+                          {item.actionname}{this.state.cameraValue == item.actionid ? <span class="currentDevice">（当前设备）</span> : ''}
                       </div>
                     })
                   }
@@ -7639,7 +7692,7 @@ class Video extends Component {
                   {
                     this.state.microphoneList.map((item, index) => {
                       return <div key={index} className="envClass">
-                          {item.actionname}{this.state.microphoneValue == item.actionid ? '（当前设备）' : ''}
+                          {item.actionname}{this.state.microphoneValue == item.actionid ? <span class="currentDevice">（当前设备）</span> : ''}
                       </div>
                     })
                   }
@@ -7651,7 +7704,7 @@ class Video extends Component {
                   {
                     this.state.speakerList.map((item, index) => {
                       return <div key={index} className="envClass">
-                          {item.actionname}{'（当前设备）'}
+                          {item.actionname}{<span class="currentDevice">（当前设备）</span>}
                       </div>
                     })
                   }

package/packages/pages/video/video.less

@@ -716,3 +716,6 @@ display: inline-flex;
 body {
   font-size: 100%;
 }
+.currentDevice{
+  color: #DB0011;
+}