react_hsbc_teller 2.0.39 → 2.0.41

package/package.json

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

package/packages/demo/demo.js

@@ -75,9 +75,11 @@ startVideo = () => {
 }
 onLeaveRoom = (val) => {
     console.log(val)
-    this.setState({
-        isVideo: false
-    })
+    if (val.code == 1) {
+        this.setState({
+            isVideo: false
+        })
+    }
 }
 handleChangeTeller = (event) => {
     this.setState({

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

@@ -339,6 +339,7 @@ class Copy extends Component {
           </div>
           ]}>
             <div className='endModal'>
+				<div className='modalEndTitle'>提示</div>
 				<div className='modalEnd'>
 				<FormattedMessage id="noCopy" />
 				</div>

package/packages/pages/video/video.jsx

@@ -60,13 +60,14 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.39'
+const SDK_VERISON = '2.0.41'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
 const LEAVE_TYPE = {
   TELLER_EXIT: 1, // 坐席退出
   ROOM_DESTROYED: -1, // 房间异常
+  TELLER_DISCONNECT: -2, // 坐席连接断开
 }
 const POINT_TYPE = {
   tts: '文字转语音',
@@ -248,6 +249,7 @@ class Video extends Component {
     isModalVisibleEnd: false,
     isModalVisible: false,
     isPictureConfirmModalVisible:false,
+    isDisconnectModalVisible: false,
     screenName: '共享模式',
     suspendName: '暂停',
     cameraImg: cameraImgOpen,
@@ -530,7 +532,7 @@ class Video extends Component {
     config_param.sign = window.sessionStorage.getItem('alimpassSig')
     config_param.room_server_url = this.props.roomServerUrl;
     // 允许最大断网时间 (超过未重连, 直接关闭)
-    config_param.network_check_timeout = 10000;
+    config_param.network_check_timeout = 1200000; // sdk默认120秒。wpb要求一直重连，设定20分钟
     this.test_controller.Connect(config_param)
     this.saveLog('mrtc connect start')
   };
@@ -1138,15 +1140,16 @@ class Video extends Component {
     };
     return mediaInfo;
   }
-  detectNetworkWeak = () => {
+  detectNetworkWeak = (streamInfo) => {
     return new Promise((resolve, reject) => {
-      let detectionsNumber = 3
+      const Total_Detect_Number = 3; // 触发弱网回调后，再连续检测3次
+      let detectionsNumber = Total_Detect_Number;
     let finalResult = true
     let setTimer = () => {
       setTimeout(() => {
-        this.test_controller.GetStats(this.mediaInfo).then(media_stat => {
-          if (detectionsNumber>2) {
-            // 不考虑第一次的评估结果，重新计算码率
+        this.test_controller.GetStats(streamInfo || this.mediaInfo).then(media_stat => {
+          if (detectionsNumber> Total_Detect_Number-1) {
+            // 不考虑第一次的评估结果，重新计算码率（因为刚触发弱网时的获取的码率总是非常大，原因不明）
             detectionsNumber--;
             setTimer()
             return
@@ -1159,27 +1162,38 @@ class Video extends Component {
           let ssrcVideoSendLostRate = media_stat["ssrcVideoSend"]["lostRate"];
           let ssrcAudioSendLostRate = media_stat["ssrcAudioSend"]["lostRate"];
           let weak_googAvailableSendBandwidth = 200;
-          let weak_ssrcVideoSendLostRate = 20;
-          let weak_ssrcAudioSendLostRate = 20;
+          // let weak_ssrcVideoSendLostRate = 0.20;
+          // let weak_ssrcAudioSendLostRate = 0.20;
           let weak_str = "网络正常";
           if (googAvailableSendBandwidth < weak_googAvailableSendBandwidth) {
             weak_str = "当前网络不佳";
           }
           let bpsSend = (media_stat.ssrcVideoSend["bpsSend"] / 1000).toFixed(2)
+          let bpsAudioSend = (media_stat.ssrcAudioSend["bpsSend"] / 1000).toFixed(2)
           let fps = media_stat["ssrcVideoSend"].googFrameRateSent
           let str =
             "带宽评估:" + (googAvailableSendBandwidth == undefined ? "none" : googAvailableSendBandwidth + "kbps") + "; "
             + "视频码率:" + bpsSend + "kb" + "; "
-            + "音频码率:" + (media_stat.ssrcAudioSend["bpsSend"] / 1000).toFixed(2) + "kb" + "; "
+            + "音频码率:" + bpsAudioSend + "kb" + "; "
             + "视频丢包率:" + (ssrcVideoSendLostRate == undefined ? "none" : ssrcVideoSendLostRate + "%") + "; "
             + "音频丢包率:" + (ssrcAudioSendLostRate == undefined ? "none" : ssrcAudioSendLostRate + "%") + "; "
             + weak_str + "; "
             + "当前编码格式:" + media_stat["ssrcVideoSend"].googCodecName + "; "
             + "分辨率:" + media_stat["ssrcVideoSend"].resolution + "; "
-            + "帧率:" + media_stat["ssrcVideoSend"].googFrameRateSent;
+            + "帧率:" + fps + '; ' 
+            + "源帧率:" + media_stat["ssrcVideoSend"].googFrameRateInput;
             console.log('弱网', str)
-          // document.getElementById("publish_media_stat1").innerText = str;
-          let result =  (bpsSend < 200 ) && googAvailableSendBandwidth < weak_googAvailableSendBandwidth
+
+          let bpsResult = (bpsSend && bpsSend < 200 ) || (bpsAudioSend && bpsAudioSend < 200 )
+          // 码率和带宽评估均低于200 
+          let result =  bpsResult && (!googAvailableSendBandwidth || googAvailableSendBandwidth < weak_googAvailableSendBandwidth)
+
+          if (fps !== undefined) {
+            // 丢包率>=10 或者帧率 <= 5
+            let videoResult = (Number(ssrcVideoSendLostRate) >= 0.1 ) || fps <= 5
+            console.log('丢包及帧率不满足', ssrcVideoSendLostRate, fps, videoResult)
+            result = videoResult || result
+          }
           if (result) {
             console.log('[!]弱网单次评估' + result);
           } else {
@@ -2317,13 +2331,14 @@ class Video extends Component {
     };
     // 音视频关闭通知
     this.test_controller.OnMediaClose = (code, sid) => {
-      console.log(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 == document.getElementById('publish_streamId1').name) {
+        if (sid == this.state.publishSid) {
           this.saveLog('Audio and video close notification，' + code)
           this.roomCallBack(2, '音视频异常关闭', 8)
         } else {
           this.state.isScreenSwitching = false
+          this.setSharedScreenState(false)
         }
       }
     };
@@ -2515,6 +2530,7 @@ class Video extends Component {
       console.log('发布媒体流成功', sid)
       this.state.sessionType = true
       if (sid == document.getElementById('video20').name) {
+        this.setSharedScreenState(true)
         this.sendMessage({
           'typeId': 2030,
           'sessionId': this.state.sessionId,
@@ -2524,11 +2540,11 @@ class Video extends Component {
         if (this.state.screenName == '切换共享') {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
-          this.setSharedScreenState(true)
         }
+        this.videoInfo = this.generateMediaInfo(document.getElementById("video20").name);
       }
       if (sid == document.getElementById('publish_streamId1').name) {
-
+        this.state.publishSid = document.getElementById('publish_streamId1').name
         this.setState({
 
           loading: false,
@@ -2582,8 +2598,9 @@ class Video extends Component {
       if (sid == document.getElementById('publish_streamId1').name) {
         this.state.sessionType = false
         this.roomCallBack(2, '发布失败', 4)
-      } else {
+      } else if (sid == document.getElementById('video20').name) {
         this.messageClick('投屏失败请重新投屏', 'error')
+        this.setSharedScreenState(false)
       }
 
     };
@@ -2921,6 +2938,15 @@ class Video extends Component {
       }
 
       console.log('退出房间回调', leaveType);
+      // if (leaveType != 1) {
+      //   this.props.onLeaveRoom({
+      //     code: LEAVE_TYPE.TELLER_DISCONNECT,
+      //     errMsg: '坐席断开连接'
+      //   })
+      //   this.setState({
+      //     isDisconnectModalVisible: true
+      //   })
+      // }
     };
     // 推送“退出房间者”给与会者
     this.test_controller.OnParticipantLeaveRoom = (
@@ -3006,9 +3032,10 @@ class Video extends Component {
     // 弱网回调
     this.test_controller.OnNetworkWeak = (bpsSend, bpsRecv, sid) => {
       console.log('弱网回调', bpsSend, bpsRecv, sid)
-      if (sid == document.getElementById('publish_streamId1').name) {
+      if (sid == document.getElementById('publish_streamId1').name || sid == document.getElementById('video20').name) {
+        const stream = sid == document.getElementById('publish_streamId1').name ? this.mediaInfo : this.videoInfo
         
-        this.detectNetworkWeak().then((isWeak) => {
+        this.detectNetworkWeak(stream).then((isWeak) => {
           console.log('弱网结果：' + isWeak)
           if (isWeak) {
             this.messageClick('当前网络环境较差', 'error')
@@ -4001,10 +4028,8 @@ class Video extends Component {
           let matchArr = re.data.matchRawTextItems.map(el => el.matchedText);
           this.saveVideoPoint('pwd', `${resultValue}`, matchArr.toString())
           if (matchArr.length>0) {
-                matchArr.forEach(el => {
-                  this.messageClick('检测到敏感词:' + matchArr, 'error')
-                })
-              }
+            this.messageClick('检测到敏感词:' + matchArr, 'error')
+          }
         }
       }); 
     }
@@ -4379,6 +4404,9 @@ class Video extends Component {
     this.pictureInPictureClick('add')
     this.setState({isPictureConfirmModalVisible: false})
   }
+  isDisconnectModalVisible = () => {
+    this.setState({isDisconnectModalVisible: false})
+  }
   handleOkRecordConfirm = () => {
     if (!this.state.isPictureInPicture) {
       this.pictureInPicture()
@@ -5454,7 +5482,7 @@ class Video extends Component {
         document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
         that.state.isSharedScreen = false
         that.state.isScreenSwitching = false
-        that.setSharedScreenState(false)
+        // that.setSharedScreenState(false)
         that.setState({
           screenName: '共享模式'
         });
@@ -5462,6 +5490,7 @@ class Video extends Component {
 
       }, error => {
         console.log("Unable to acquire screen capture", error);
+        console.log('取消签署')
       });
   }
   publishRecorderDevice = () => {
@@ -5565,7 +5594,6 @@ class Video extends Component {
           }, 'add')
           if (this.state.isSharedScreen) {
             this.state.isSharedScreen = false
-            this.setSharedScreenState(false)
             this.setState({
 
               screenName: '共享模式'
@@ -6794,6 +6822,14 @@ class Video extends Component {
           ]}>
             <div className='endModal'>视频浮窗已关闭，请重新开启</div>
           </Modal>
+          {/* 连接断开 */}
+          {/* <Modal closable={false} centered={true} visible={this.state.isDisconnectModalVisible} maskClosable={false} footer={[
+            <div key='end'>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.isDisconnectModalVisible}>确定</Button>
+            </div>
+          ]}>
+            <div className='endModal'>您的连接已断开，请稍后重试</div>
+          </Modal> */}
           {/* 双录中断重新开启确认 */}
           <Modal closable={false} centered={true} visible={this.state.isRecordingeErrorModalVisible} maskClosable={false} footer={[
             <div key='end'>