react_hsbc_teller 2.0.47 → 2.0.49

package/packages/pages/video/video.jsx

@@ -26,12 +26,14 @@ 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 ipadMediaCloseAudio from '../../assets/mp3/ipad_media_close.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'
 import networkWeakAudio from '../../assets/mp3/networkweak.mp3'
 import PIPictureClosedAudio from '../../assets/mp3/pip_close.mp3'
+import screenSharedIntervalAudio from '../../assets/mp3/share_stop_audio.mp3'
 import errorPng from '../../assets/img/tooltips2_fail.png'
 import Modal from "antd/lib/modal";
 import 'antd/lib/modal/style'
@@ -61,7 +63,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.47'
+const SDK_VERISON = '2.0.49'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -82,6 +84,7 @@ const POINT_TYPE = {
   expDark: '曝光、背光',
   fcd: '人脸变化检测',
   padConnected: 'ipad已连接',
+  cancelShare: '取消投屏',
   conFail: '媒体流服务断开'
 }
 const RECORD_DEVICE_NAME = 'screen-capture-recorder'
@@ -528,6 +531,7 @@ class Video extends Component {
     console.log(JSON.parse(window.sessionStorage.getItem('sigData')));
     // eslint-disable-next-line no-undef
     const config_param = {};
+    config_param.autoUploadLog = true;
     config_param.workspaceId = this.state.workSpaceId;
     config_param.uid = this.props.tellerAccount;
     config_param.biz_name = this.state.bizName; // 'demo'
@@ -745,7 +749,7 @@ class Video extends Component {
           enable: true,
           xPosition: 16 * SCALE, // x 轴位置
           yPosition: 8 * SCALE, // y 轴位置
-          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.state.salesBranchCode || ''} ${this.state.branchName || ''} ${this.state.financialOffice || ''}`,
+          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
           fontSize: 16 * SCALE, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
@@ -788,7 +792,7 @@ class Video extends Component {
           enable: true,
           xPosition: 16, // x 轴位置
           yPosition: 8, // y 轴位置
-          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.state.salesBranchCode || ''} ${this.state.branchName || ''} ${this.state.financialOffice || ''}`,
+          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
           fontSize: 16, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
@@ -1803,6 +1807,8 @@ class Video extends Component {
               })
             } else {
               if (document.getElementById('video20').name) {
+                this.saveLog('unPublish share, reason: receive stop whiteboard message 1218')
+                console.log('unPublish share, reason: receive stop whiteboard message 1218')
                 this.test_controller.UnPublish(document.getElementById('video20').name)
                 if(this.state.drawCanvasInterval) clearInterval(this.state.drawCanvasInterval)
               }
@@ -1816,12 +1822,12 @@ class Video extends Component {
         }
 
       } else if (Mival.typeId == 1219) {
-        // 传入分行信息
-        if (Mival.sessionId == this.state.sessionId && this.props.recordMode == 2) {
-          this.state.salesBranchCode = Mival.salesBranchCode;
-          this.state.financialOffice = Mival.financialOffice;
-          this.state.branchName = Mival.salesBranchName;
-        }
+        // 旧逻辑废弃。现在无论什么模式均为sdk外部传入
+        // if (Mival.sessionId == this.state.sessionId && this.props.recordMode == 2) {
+        //   this.state.salesBranchCode = Mival.salesBranchCode;
+        //   this.state.financialOffice = Mival.financialOffice;
+        //   this.state.branchName = Mival.salesBranchName;
+        // }
       } else if (Mival.typeId == 3100) {
         if(Mival.data.sessionId == this.state.sessionId) {
           muteJson.set(Mival.data.userId, JSON.stringify(Mival)) 
@@ -1936,22 +1942,47 @@ class Video extends Component {
         }
       } else if (Mival.typeId == 10020) {
         // 录制中断（模拟测试）
-        // this.messageClick('双录异常中断，请重新开启', 'error')
-        // this.setState({
-        //   isRecordingeErrorModalVisible: true,
-        //   businessRecordId: '',
-        // })
-        // // 循环播放录制中断语音
-        // clearTimeout(this.recordLoopPlayTimer)
-        // this.recordLoopPlay = () => {
-        //   console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
-        //   if(!this.state.businessRecordId && document.getElementById("publish_video1")){
-        //     let audio = new Audio(recordErrorAudio)
-        //     audio.play()
-        //     this.recordLoopPlayTimer = setTimeout(this.recordLoopPlay, 3000);
-        //   }
-        // }
-        // setTimeout(this.recordLoopPlay, 0);
+        const recordId = Mival.recordId;
+      
+      // if (this.state.businessRecordId == recordId) {
+      //   // 双录录制中断
+      //   this.messageClick('双录异常中断，请重新开启', 'error')
+      //   this.setState({
+      //     isRecordingeErrorModalVisible: true,
+      //     businessRecordId: '',
+      //   })
+      //   this.saveLog(`dual recording crash, recordId=${recordId}`);
+      //   // 循环播放录制中断语音
+      //   clearTimeout(this.recordLoopPlayTimer)
+      //   this.recordLoopPlay = () => {
+      //     console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
+      //     if(!this.state.businessRecordId && document.getElementById("publish_streamId1")){
+      //       let audio = new Audio(recordErrorAudio)
+      //       audio.play()
+      //       this.recordLoopPlayTimer = setTimeout(this.recordLoopPlay, 3000);
+      //     }
+      //   }
+      //   setTimeout(this.recordLoopPlay, 0);
+      // } else if (this.state.ipadRecordId == recordId) {
+      //   // ipad录制中断
+      //   this.messageClick('双录异常中断，请重新开启', 'error')
+      //   this.setState({
+      //     isRecordingeErrorModalVisible: true,
+      //     ipadRecordId: '',
+      //   })
+      //   this.saveLog(`ipad dual recording crash, recordId=${recordId}`);
+      //   // 循环播放录制中断语音
+      //   clearTimeout(this.recordLoopPlayTimer)
+      //   this.recordLoopPlay = () => {
+      //     console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
+      //     if(!this.state.ipadRecordId && document.getElementById("publish_streamId1")){
+      //       let audio = new Audio(recordErrorAudio)
+      //       audio.play()
+      //       this.recordLoopPlayTimer = setTimeout(this.recordLoopPlay, 3000);
+      //     }
+      //   }
+      //   setTimeout(this.recordLoopPlay, 0);
+      // }
 
       } else if (Mival.typeId == 33001 && this.state.sessionId == Mival.data.sessionId) {
         if (Mival.type == 1) {
@@ -2363,6 +2394,7 @@ class Video extends Component {
         } else if (sid == this.state.publishScreenSid) {
           this.state.isScreenSwitching = false
           this.setSharedScreenState(false)
+          this.setSharedScreenTimer(false)
           if (code == 5007 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
             this.saveVideoPoint('conFail', `RM投屏媒体链路断开, err_code=${code}`)
             playAudioTip();
@@ -2507,15 +2539,19 @@ class Video extends Component {
             if ( stream.getVideoTracks()[0] instanceof BrowserCaptureMediaStreamTrack) {
               console.log('tab共享')
               this.saveLog('Share type = tab')
+              this.state.lastShareType = 'share'
             } else if (stream.getVideoTracks()[0] instanceof MediaStreamTrack && stream.getVideoTracks()[0].label.includes('screen')) {
               console.log('屏幕共享')
               this.saveLog('Share type = screen')
+              this.state.lastShareType = 'share'
             } else if (stream.getVideoTracks()[0].label.includes('window')){
               console.log('窗口共享')
               this.saveLog('Share type = window')
+              this.state.lastShareType = 'share'
             } else if (stream.getVideoTracks()[0] instanceof CanvasCaptureMediaStreamTrack){
               console.log('白板共享')
               this.saveLog('Share type = whiteboard')
+              this.state.lastShareType = 'whiteboard'
             }
           } catch (err) {
             console.log('不支持此浏览器记录投屏类型日志')
@@ -2568,6 +2604,7 @@ class Video extends Component {
       if (sid == document.getElementById('video20').name) {
         this.state.publishScreenSid = document.getElementById('video20').name
         this.setSharedScreenState(true)
+        this.setSharedScreenTimer(true)
         this.saveLog('Share success')
         this.sendMessage({
           'typeId': 2030,
@@ -2639,6 +2676,7 @@ class Video extends Component {
       } else {
         this.messageClick('投屏失败请重新投屏', 'error')
         this.setSharedScreenState(false)
+        this.setSharedScreenTimer(false)
         this.saveLog('Share fail, code=' + err_code)
       }
 
@@ -2898,6 +2936,7 @@ class Video extends Component {
         })
         this.state.isSharedScreen = false
         this.setSharedScreenState(false)
+        this.setSharedScreenTimer(false)
         this.saveLog('Stop share')
         this.setState({
 
@@ -2958,6 +2997,41 @@ class Video extends Component {
     // 推送“取消发布”给与会者
     this.test_controller.OnUnPublish = (feed) => {
       console.log('取消发布者', feed)
+
+      // ipad取消发布提醒
+      if (feed.uid.includes(IPAD_SUFFIX) && this.state.businessId){
+        // ipad单独处理，双录过程中ipad如果取消发布，要提示+循环播报直到ipad重新入会
+        this.setState({
+          IpadLeaveErrorModalVisible: true,
+          IpadErrorWording: 'iPad 媒体流异常，请重新扫码或输入会议号入会',
+          ipadTag: '',
+        })
+        // 循环播放ipad退出语音
+        clearTimeout(this.ipadLeavePlayTimer)
+        this.ipadMediaClosePlay = () => {
+          if(!this.state.ipadTag && document.getElementById("publish_streamId1")){
+            if (this.ipadLeaveAudio) this.ipadLeaveAudio.pause()
+              setTimeout(() => {
+                this.ipadLeaveAudio = new Audio(ipadMediaCloseAudio)
+                this.ipadLeaveAudio.play()
+              }, 800); // 防止退出房间时重音
+            this.ipadLeavePlayTimer = setTimeout(this.ipadMediaClosePlay, 3000);
+          }
+        }
+        setTimeout(this.ipadMediaClosePlay, 0);
+      } else if (feed.uid.includes(IPAD_SUFFIX)) {
+        // 非双录下ipad离开提示iPad已断开
+        this.setState({
+          ipadTag: '',
+        })
+        this.messageClick(('iPad 媒体流异常，请调整'), 'error')
+        this.saveLog('iPad media close')
+        if (this.props.isOpenSound) {
+          let audio = new Audio(ipadMediaCloseAudio)
+          audio.play()
+        }
+      }
+
       for (let i = 0; i < this.state.roomCustomerList.length; i++) {
         if (this.state.roomCustomerList[i].feedId == feed.feedId) {
           this.state.roomCustomerList.splice(i, 1)
@@ -3014,18 +3088,21 @@ class Video extends Component {
         // ipad单独处理，双录过程中ipad如果离开，要提示+循环播报直到ipad重新入会
         this.setState({
           IpadLeaveErrorModalVisible: true,
+          IpadErrorWording: 'iPad 摄像头异常退出，请扫码或输入会议号入会',
           ipadTag: '',
         })
         // 循环播放ipad退出语音
         clearTimeout(this.ipadLeavePlayTimer)
         this.ipadLeavePlay = () => {
           if(!this.state.ipadTag && document.getElementById("publish_streamId1")){
-            let audio = new Audio(IpadLeaveAudio)
-            audio.play()
+            if (this.ipadLeaveAudio) this.ipadLeaveAudio.pause()
+            this.ipadLeaveAudio = new Audio(IpadLeaveAudio)
+            this.ipadLeaveAudio.play()
             this.ipadLeavePlayTimer = setTimeout(this.ipadLeavePlay, 3000);
           }
         }
         setTimeout(this.ipadLeavePlay, 0);
+        this.saveLog('iPad leave room during recording')
         return
       } else if (participant.includes(IPAD_SUFFIX)) {
         // 非双录下ipad离开提示iPad已断开
@@ -3265,7 +3342,7 @@ class Video extends Component {
 
       // 如果在业务双录中，需要重新开启；如果是full录制出错，则不用处理
       if (this.state.businessRecordId == recordId) {
-        // 录制中断
+        // 双录录制中断
         this.messageClick('双录异常中断，请重新开启', 'error')
         this.setState({
           isRecordingeErrorModalVisible: true,
@@ -3283,6 +3360,25 @@ class Video extends Component {
           }
         }
         setTimeout(this.recordLoopPlay, 0);
+      } else if (this.state.ipadRecordId == recordId) {
+        // ipad录制中断
+        this.messageClick('双录异常中断，请重新开启', 'error')
+        this.setState({
+          isRecordingeErrorModalVisible: true,
+          ipadRecordId: '',
+        })
+        this.saveLog(`ipad dual recording crash, recordId=${recordId}`);
+        // 循环播放录制中断语音
+        clearTimeout(this.recordLoopPlayTimer)
+        this.recordLoopPlay = () => {
+          console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
+          if(!this.state.ipadRecordId && document.getElementById("publish_streamId1")){
+            let audio = new Audio(recordErrorAudio)
+            audio.play()
+            this.recordLoopPlayTimer = setTimeout(this.recordLoopPlay, 3000);
+          }
+        }
+        setTimeout(this.recordLoopPlay, 0);
       }
     };
     // 停止浏览器录制成功回调
@@ -3374,6 +3470,7 @@ class Video extends Component {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
           this.setSharedScreenState(true)
+          this.setSharedScreenTimer(true)
           this.saveLog('Share changed')
         }
       }
@@ -3392,10 +3489,13 @@ class Video extends Component {
         })
         this.messageClick('切换摄像头或麦克风失败，请先检查设备', 'error')
       } else if (this.state.screenName == '切换共享') {
+        this.saveLog('unPublish share, reason: trigger OnChangeMediaStreamFailed')
+        console.log('unPublish share, reason: trigger OnChangeMediaStreamFailed')
         this.test_controller.UnPublish(document.getElementById('video20').name)
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setSharedScreenState(false)
+        this.setSharedScreenTimer(false)
         this.saveLog('Share fail, code=' + code)
         this.setState({
           screenName: '共享模式'
@@ -3530,6 +3630,8 @@ class Video extends Component {
         this.state.isScreenSwitching = false
       } else {
         if (!streamShare) {
+          this.saveLog('unPublish share, reason: trigger OnDesktopDisplayClosed, manually click stop or stream onended')
+          console.log('unPublish share, reason: trigger OnDesktopDisplayClosed, manually click stop or stream onended')
           document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
         } else {
           console.log('白板')
@@ -3537,6 +3639,7 @@ class Video extends Component {
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setSharedScreenState(false)
+        this.setSharedScreenTimer(false)
         this.setState({
           screenName: '共享模式'
         });
@@ -3760,9 +3863,14 @@ class Video extends Component {
     clearTimeout(this.ipadLeavePlayTimer)
     clearTimeout(this.ipadLowPowerPlayTimer)
     clearTimeout(this.mediaErrorPlayTimer)
+    clearTimeout(this.screenSharedTimer)
     clearInterval(this.state.drawCanvasInterval)
     clearInterval(this.state.faceDetectionTimer);
     clearInterval(this.state.imageDetectionTimer);
+    this.removeVideoEvent(['video20', 'video21', 'publish_video1'])
+    for(let i=1;i<=12;i++){
+      this.removeVideoEvent(['video'+ i])
+    }
   }
   finishSession = () => {
     // clearInterval(this.state.OnVolumeAnalyserMap.get(sid))
@@ -3996,6 +4104,27 @@ class Video extends Component {
         hasOcr: 0,
       })
     }
+    this.videoErrorEvent = (event) => {
+      console.log(event)
+      console.log(`video load ${event.type || 'error'}: sid=${event.target.name}, domid=${event.target.id}`)
+      this.saveLog(`video load ${event.type || 'error'}: sid=${event.target.name}, domid=${event.target.id}`)
+    }
+    this.bindVideoEvent = (domArr) => {
+      domArr.forEach((domId) => {
+        document.getElementById(domId).addEventListener("error", this.videoErrorEvent);
+        document.getElementById(domId).addEventListener("emptied", this.videoErrorEvent);
+        document.getElementById(domId).addEventListener("stalled", this.videoErrorEvent);
+        document.getElementById(domId).addEventListener("suspend", this.videoErrorEvent);
+      })
+    }
+    this.removeVideoEvent = (domArr) => {
+      domArr.forEach((domId) => {
+        document.getElementById(domId).removeEventListener("error", this.videoErrorEvent);
+        document.getElementById(domId).removeEventListener("emptied", this.videoErrorEvent);
+        document.getElementById(domId).removeEventListener("stalled", this.videoErrorEvent);
+        document.getElementById(domId).removeEventListener("suspend", this.videoErrorEvent);
+      })
+    }
     this.setState({
       videoList: arr
     }, () => {
@@ -4009,7 +4138,9 @@ class Video extends Component {
           // console.log(arrItem.videoName)
 
         });
+        this.bindVideoEvent(['video'+ i])
       }
+      this.bindVideoEvent(['video20', 'video21', 'publish_video1'])
     })
     if (this.props.sessionId) {
       this.getRoomStatus({
@@ -4044,6 +4175,12 @@ class Video extends Component {
     let that = this;
     this.asr_controller.onConnectError = () => {
       this.messageClick('违禁词检测服务连接失败', 'error')
+      this.saveLog('DR_ASR_FAILURE');
+    }
+    this.asr_controller.onAsrError = (info) => {
+      // this.messageClick('违禁词检测服务连接失败', 'error')
+      console.log(`ASR fail event, status=${info.status}, msg=${info.message}, taskId=${info.taskId}`);
+      this.saveLog(`ASR fail event, status=${info.status}, msg=${info.message}, taskId=${info.taskId}`);
     }
 
     this.asr_controller.onConnectOK = () => {
@@ -4212,6 +4349,26 @@ class Video extends Component {
       }
     }
   }
+  setSharedScreenTimer = (state) => {
+      // 设置定时，如果x秒内没有重新开启投屏 则弹出提示
+      if (!this.props.screenSharedInterval || typeof this.props.screenSharedInterval != 'number') return;
+      if (state) {
+        clearTimeout(this.screenSharedTimer)
+      } else {
+        clearTimeout(this.screenSharedTimer)
+        this.screenSharedTimer = setTimeout(() => {
+          if (!document.getElementById('video20').name) {
+            this.setState({
+              screenSharedModalVisible: true
+            })
+            let audio = new Audio(screenSharedIntervalAudio)
+            audio.play()
+          } else {
+            console.log('screenSharedTimer触发时已经在投屏')
+          }
+        }, this.props.screenSharedInterval * 1000)
+      }
+  }
   isFileSuccuse = () => {
     if (!this.state.sessionId || !this.state.sessionType || !this.state.imStatus) {
       this.messageClick('当前程序异常请先退出重开', 'error')
@@ -4262,6 +4419,10 @@ class Video extends Component {
   };
   sharedScreen = () => {
     console.log('投屏', this.state.tabTitles.find(el => el.value == 'staffScreen'))
+    if (this.state.shareLock) {
+      console.log('发布共享点击太快了')
+      return;
+    }
     if (this.isFileSuccuse()) {
       if (!this.state.tabTitles.find(el => el.value == 'staffScreen')) {
         const publish_config = {};
@@ -4270,7 +4431,10 @@ class Video extends Component {
           streamShare = ''
         }
         if (this.state.isSharedScreen) {
+          this.saveLog('unPublish share, reason: change screen content')
+          console.log('unPublish share, reason: change screen content')
           this.test_controller.UnPublish(document.getElementById('video20').name)
+          this.state.shareLock = true;
           setTimeout(() => {
           publish_config.media_type = 1
           publish_config.publish_device = 2
@@ -4283,7 +4447,18 @@ class Video extends Component {
           publish_config.publish_streamId_id = 'subscribe_streamId20'
           publish_config.publish_tag = 'projectionWhiteboard'
           this.test_controller.Publish(publish_config)
+          setTimeout(() => { this.state.shareLock = false; }, 500);
           }, 300);
+          this.setState({
+            screenName: '切换共享',
+            isPDF: false
+          })
+          this.tabTitlesClick(
+            {
+              value: 'RMScreen',
+              name: '共享内容'
+            }, 'add'
+          )
           // const publish_config = {}
           // publish_config.media_type = 1
           // publish_config.publish_device = 2
@@ -4298,7 +4473,10 @@ class Video extends Component {
           // this.state.isScreenSwitching = true
         } else {
           if (document.getElementById('video20').name) {
+            this.saveLog('unPublish share, reason: change screen content')
+            console.log('unPublish share, reason: change screen content')
             this.test_controller.UnPublish(document.getElementById('video20').name)
+            this.state.shareLock = true;
             setTimeout(() => {
               publish_config.media_type = 1
               publish_config.publish_device = 2
@@ -4311,7 +4489,8 @@ class Video extends Component {
               publish_config.publish_streamId_id = 'subscribe_streamId20'
               publish_config.publish_tag = 'projectionWhiteboard'
               this.test_controller.Publish(publish_config)
-            }, 300);
+              setTimeout(() => { this.state.shareLock = false; }, 500); // 这个延迟用于防止跳出弹窗后仍可以点击共享按钮，大于debounce300即可
+            }, 300);// 这个延迟用于跟UnPublish 产生时差，防止标签未被释放
             // publish_config.media_type = 1;
             // publish_config.publish_device = 2;
             // publish_config.video_profile_type = 1
@@ -4465,7 +4644,8 @@ class Video extends Component {
       this.pictureInPicture()
     }
     this.saveLog('Start business recording')
-    this.enableServerRecording(this.state.businessId)
+    if (!this.state.businessRecordId) this.enableServerRecording(this.state.businessId)
+    if (!this.state.ipadRecordId && this.state.ipadTag) this.enableIpadRecording(this.state.businessId)
     clearTimeout(this.recordLoopPlayTimer)
   }
   handleOkLowPowerConfirm = () => {
@@ -4476,6 +4656,44 @@ class Video extends Component {
       'userId': this.props.tellerAccount
     })
   }
+  // 取消投屏确认
+  handleOkShareConfirm = () => {
+    this.setState({
+      screenSharedModalVisible: false
+    })
+    if (this.state.lastShareType == 'whiteboard') {
+      this.switchExternal()
+    } else {
+      this.sharedScreen()
+    }
+    this.saveLog('Shared overlay click confirm')
+  }
+  handleOkShareCancel = () => {
+    this.setState({
+      screenSharedModalVisible: false,
+      screenSharedSecondaryModalVisible: true
+    })
+    this.saveLog('Shared overlay click cancel')
+  }
+  // 二次取消投屏确认
+  handleOkSecondaryShareConfirm = () => {
+    this.setState({
+      screenSharedSecondaryModalVisible: false
+    })
+    if (this.state.lastShareType == 'whiteboard') {
+      this.switchExternal()
+    } else {
+      this.sharedScreen()
+    }
+    this.saveLog('Shared secondary overlay click confirm')
+  }
+  handleOkSecondaryShareCancel = () => {
+    this.setState({
+      screenSharedSecondaryModalVisible: false
+    })
+    this.saveLog('Shared secondary overlay click cancel')
+    this.saveVideoPoint('cancelShare', 'RM二次确认取消投屏')
+  }
   handleOkMediaErrorConfirm = () => {
     // 刷新重试
     clearTimeout(this.mediaErrorPlayTimer)
@@ -5538,12 +5756,18 @@ class Video extends Component {
           //单击停止共享按钮后，触发这个事件
           streamShare = ''
           if (document.getElementById('video20').name && !this.state.isSharedScreen) {
+            console.log('unPublish share, reason: click stop sharing whiteboard or stream onended')
+            that.saveLog('unPublish share, reason: click stop sharing whiteboard or stream onended')
             that.test_controller.UnPublish(document.getElementById('video20').name)
           }
         }
 
         // 关闭当前共享屏幕
-        document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
+        if (document.getElementById('video20') && document.getElementById('video20').name) {
+          console.log('unPublish share, reason: going to share whiteboard, shared screen needs to be stopped')
+          that.saveLog('unPublish share, reason: going to share whiteboard, shared screen needs to be stopped')
+          that.test_controller.UnPublish(document.getElementById('video20').name)
+        }
         that.state.isSharedScreen = false
         that.state.isScreenSwitching = false
         // that.setSharedScreenState(false)
@@ -5556,6 +5780,9 @@ class Video extends Component {
         console.log("Unable to acquire screen capture", error);
         console.log('取消签署')
         that.saveLog('Manual cancel share')
+        if (!document.getElementById('video20').name) {
+          that.setSharedScreenTimer(false)
+        }
       });
   }
   publishRecorderDevice = () => {
@@ -5640,6 +5867,8 @@ class Video extends Component {
           //单击停止共享按钮后，触发这个事件
           streamRecord = ''
           if (document.getElementById('record_video').name) {
+            that.saveLog('unPublish share, reason: click stop recording all screen or stream onended')
+            console.log('unPublish share, reason: click stop recording all screen or stream onended')
             that.test_controller.UnPublish(document.getElementById('record_video').name)
           }
         }
@@ -5671,6 +5900,7 @@ class Video extends Component {
           }
         }
         this.navigatorClick()
+        clearTimeout(this.screenSharedTimer)
 
       } else {
         this.messageClick('internal staff正在共享屏幕，请先关闭', 'error')
@@ -6913,6 +7143,24 @@ class Video extends Component {
           ]}>
             <div className='endModal'>双录异常中断，请重新开启</div>
           </Modal>
+          {/* 投屏间隔过长确认 */}
+          <Modal closable={false} centered={true} visible={this.state.screenSharedModalVisible} maskClosable={false} footer={[
+            <div key='end'>
+              <Button className="modelButtonCancel" onClick={this.handleOkShareCancel}>取消操作</Button>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkShareConfirm}>确认共享</Button>
+            </div>
+          ]}>
+            <div className='endModal' style={{paddingBottom: '20px'}}>当前系统未共享屏幕、未共享声音，请确认是否需要开启共享操作？</div>
+          </Modal>
+          {/* 投屏间隔过长二次确认 */}
+          <Modal closable={false} centered={true} visible={this.state.screenSharedSecondaryModalVisible} maskClosable={false} footer={[
+            <div key='end'>
+              <Button className="modelButtonCancel" onClick={this.handleOkSecondaryShareCancel}>取消操作</Button>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSecondaryShareConfirm}>确认共享</Button>
+            </div>
+          ]}>
+            <div className='endModal' style={{paddingBottom: '20px'}}>取消操作按钮将无法开启共享屏幕、共享声音，请再次确认</div>
+          </Modal>
           {/* ipad低电量确认 */}
           <Modal closable={false} centered={true} visible={this.state.ipadLowPowerErrorModalVisible} maskClosable={false} footer={[
             <div key='end'>
@@ -6927,7 +7175,7 @@ class Video extends Component {
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkIpadLeaveConfirm}>确定</Button>
             </div>
           ]}>
-            <div className='ipadModal'>iPad 摄像头异常退出，请扫码或输入会议号入会</div>
+            <div className='ipadModal'>{this.state.IpadErrorWording}</div>
             <div className='QRCode center'>
               <QRCode
                 value={JSON.stringify({
@@ -7439,6 +7687,7 @@ Video.defaultProps = {
   whetherNeedAsr: false, // 是否在双录时开启违禁词检测
   faceDetectInterval: 6, // 人脸检测间隔（秒）
   lightDetectInterval: 6, // 背光检测间隔（秒）
+  screenSharedInterval: 0, // 取消投屏提示间隔（秒）, 0不启用
   lightSensitivity: 1, // 光线敏感度系数，默认1
   userSide: 2,
   meetingDuration: null, // 会议时长，单位小时

package/packages/utils/asrController.js

@@ -68,6 +68,9 @@ export default class MyAsrController {
   onConnectError(data) {
     console.log('连接错误');
   }
+  onAsrError(data) {
+    console.log('服务端返回错误');
+  }
 
   initWebSocket() {
     console.log("初始化weosocket");
@@ -196,6 +199,16 @@ export default class MyAsrController {
     } else if ( ret.header.name === 'TranscriptionCompleted') {
       console.log('服务端已停止了语音转写', ret);
     } 
+
+    if (ret.header.status != 20000000) {
+      this.onAsrError({
+        status: ret.header.status,
+        message: ret.header.status_text,
+        taskId: ret.header.task_id,
+      });
+    } else {
+      // console.log('status返回正常')
+    }
   }
 
   websocketSend(Data) { // 数据发送