react_hsbc_teller 1.1.8 → 1.1.9

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -47,9 +47,6 @@ export default class foot extends Component {
       inspection = ()=>{
           this.props.inspection()
       }
-      screenSwitching =()=>{
-          this.props.screenSwitching()
-      }
       switchExternal=()=>{
         this.props.switchExternal()
     }
@@ -164,14 +161,6 @@ export default class foot extends Component {
                         </div>
                     </div>
                     </div>
-                    {/* <div className='footHover' onClick={this.screenSwitching.bind(this)}>
-                    <div className="one">
-                        <img className="imgClass" src={require("../../assets/img/inspection.png").default} alt="" />
-                        <div className="text">
-                            切换投屏
-                        </div>
-                    </div>
-                    </div> */}
                 </div>
                 {defaultList}
                 

package/packages/pages/video/video.jsx

@@ -173,11 +173,13 @@ class Video extends Component {
       publish_config.publish_tag = 'tag1'
       this.test_controller.Publish(publish_config)
       // eslint-disable-next-line no-undef
-      if(this.state.imStatus) {
+      setTimeout(() => {
+      if(this.state.imStatus && !this.state.imJoinRoom) {
         joinRoom((this.props.tellerAccount + '@' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname), this.state.imRoomId)
           this.state.imJoinRoom =true
         console.log('加入IM房间')
       }
+    })
       this.props.createRoomCallback({
         type: 1,
         errorManage: '',
@@ -1071,7 +1073,10 @@ class Video extends Component {
               noVideoTwelve: true
             })
           }
-          this.pictureInPicture('Refresh')
+          if(this.state.isPictureInPicture) {
+            this.pictureInPicture('Refresh')
+          }
+          
         }
       }
       else if (Mival.typeId == 3003) {
@@ -1147,7 +1152,9 @@ class Video extends Component {
               noVideoTwelve: false
             })
           }
-          this.pictureInPicture('Refresh')
+          if(this.state.isPictureInPicture) {
+            this.pictureInPicture('Refresh')
+          }
         }
       }
       else if (Mival.typeId == 1220) {
@@ -1366,10 +1373,10 @@ class Video extends Component {
     window.IMOpenfire = msg =>{
       console.log('im登录', msg)
       if(msg.status == 'error') {
-        this.state.sessionType = false
+        this.state.imStatus = false
         this.roomCallBack(2, 'im建立连接失败',5)
       } else if (msg.status == 'success') {
-        this.state.imStatus = msg
+        this.state.imStatus = true
         setTimeout(() => {
           if(this.state.imRoomId && !this.state.imJoinRoom) {
             joinRoom((this.props.tellerAccount + '@' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname), this.state.imRoomId)
@@ -1380,7 +1387,7 @@ class Video extends Component {
       } else if (msg.status == 'close') {
         if(!this.state.manualClose) {
           this.timer && clearInterval(this.timer);
-          this.state.sessionType = false
+          this.state.imStatus = false
           console.log('IMOpenfireclose')
           this.roomCallBack(2, '账号重复登录',9)
           
@@ -1562,7 +1569,11 @@ class Video extends Component {
     this.test_controller.OnMediaClose = (code, sid) => {
       console.log(code, sid)
       if(code == 5003 || code == 5004 || code == 5005|| code == 5007|| code == 5009|| code == 5010 || code == 5011|| code == 5012) {
+        if(sid == document.getElementById('publish_video1').name) {
         this.roomCallBack(2, '音视频异常关闭',8)
+        } else {
+          this.state.isScreenSwitching = false
+        }
       }
     };
     // 加入房间成功
@@ -1616,7 +1627,7 @@ class Video extends Component {
             'tellerId': this.props.tellerAccount
           })
         });
-        if(this.state.screenName == '取消共享') {
+        if(this.state.screenName == '切换共享') {
           this.state.isSharedScreen = true
         this.state.isScreenSwitching = false
         }
@@ -1629,7 +1640,7 @@ class Video extends Component {
         this.enterRoom()
         this.timer = setInterval(
           () => {
-            if(!this.state.voiceStatue) {
+            if(!this.state.voiceStatue && this.state.analyserHeight.get(sid).toFixed(2) > 0) {
               callNimIM('sendCustomCmdMsg', {
                 customId: this.state.imRoomId,
                 content: JSON.stringify({
@@ -1651,8 +1662,13 @@ class Video extends Component {
     // 发布媒体流失败
     this.test_controller.OnPublishFailed = (sid, err_code, err_msg) => {
       console.log('发布媒体流失败', sid, err_code, err_msg)
-      this.state.sessionType = false
-      this.roomCallBack(2, '发布失败',4)
+      if(sid == document.getElementById('publish_video1').name) {
+        this.state.sessionType = false
+        this.roomCallBack(2, '发布失败',4)
+      } else {
+        this.messageClick('投屏失败请重新投屏','error')
+      }
+      
     };
     // 订阅媒体流成功
     this.test_controller.OnSubscribeSucc = (feed, sid) => {
@@ -2076,78 +2092,92 @@ class Video extends Component {
       if (!document.getElementById("video1").name) {
         this.setState({
           videoOneName: '',
-          voiceVideoOne: false
+          voiceVideoOne: false,
+          noVideoOne: false
         })
       }
       if (!document.getElementById("video2").name) {
         this.setState({
           videoTwoName: '',
-          voiceVideoTwo: false
+          voiceVideoTwo: false,
+          noVideoTwo: false
         })
       }
       if (!document.getElementById("video3").name) {
         this.setState({
           videoThreeName: '',
-          voiceVideoThree: false
+          voiceVideoThree: false,
+          noVideoThree: false
         })
       }
       if (!document.getElementById("video4").name) {
         this.setState({
           videoFourName: '',
           voiceVideoFour: false,
+          noVideoFour: false
         })
       }
       if (!document.getElementById("video5").name) {
         this.setState({
           videoFiveName: '',
-          voiceVideoFive: false
+          voiceVideoFive: false,
+          noVideoFive: false
         })
       }
       if (!document.getElementById("video6").name) {
         this.setState({
           videoSixName: '',
-          voiceVideoSix: false
+          voiceVideoSix: false,
+          noVideoSix: false
         })
       }
 
       if (!document.getElementById("video7").name) {
         this.setState({
           videoSevenName: '',
-          voiceVideoSeven: false
+          voiceVideoSeven: false,
+          noVideoSeven: false
         })
       }
       if (!document.getElementById("video8").name) {
         this.setState({
           videoEightName: '',
-          voiceVideoEight: false
+          voiceVideoEight: false,
+          noVideoEight: false
         })
       }
       if (!document.getElementById("video9").name) {
         this.setState({
           videoNineName: '',
-          voiceVideoNine: false
+          voiceVideoNine: false,
+          noVideoNine: false
         })
       }
       if (!document.getElementById("video10").name) {
         this.setState({
           videoTenName: '',
-          voiceVideoTen: false
+          voiceVideoTen: false,
+          noVideoTen: false
         })
       }
       if (!document.getElementById("video11").name) {
         this.setState({
           videoElevenName: '',
-          voiceVideoEleven: false
+          voiceVideoEleven: false,
+          noVideoEleven: false
         })
       }
       if (!document.getElementById("video12").name) {
         this.setState({
           videoTwelveName: '',
-          voiceVideoTwelve: false
+          voiceVideoTwelve: false,
+          noVideoTwelve: false
         })
       }
       this.state.analyserData.delete(sid)
-      this.pictureInPicture('Refresh')
+      if(this.state.isPictureInPicture) {
+        this.pictureInPicture('Refresh')
+      }
     };
     // 推送“取消发布”给与会者
     this.test_controller.OnUnPublish = (feed) => {
@@ -2342,7 +2372,7 @@ class Video extends Component {
         })
       }
       if (sid == document.getElementById('video20').name) {
-        if(this.state.screenName == '取消共享') {
+        if(this.state.screenName == '切换共享') {
           this.state.isSharedScreen = true
         this.state.isScreenSwitching = false
         }
@@ -2360,7 +2390,19 @@ class Video extends Component {
           loading: false
       })
       this.messageClick('切换摄像头或麦克风失败，请先检查设备','error')
-    }
+    } else if(this.state.screenName == '切换共享') {
+        this.test_controller.UnPublish(document.getElementById('video20').name)
+        this.state.isSharedScreen = false
+        this.state.isScreenSwitching = false
+        this.setState({
+          screenName: '共享模式'
+        });
+        console.log(pictureInPictureVideo)
+        this.tabTitlesClick('RMScreen', 'delect')
+        if (this.state.isPictureInPicture) {
+          document.exitPictureInPicture()
+        }
+      }
     };
     // 服务端录制初始化成功
     this.test_controller.OnInitRemoteRecordSucc = (
@@ -2371,20 +2413,20 @@ class Video extends Component {
     };
     this.test_controller.OnVolumeAnalyser = (sid, analyser) => {
       clearInterval(this.state.OnVolumeAnalyserMap.get(sid))
-      let publish_sid = document.getElementById('publish_video1').name || document.getElementById('publish_streamId1').name;
-      let subscribe_sid1 = document.getElementById('video1').name || document.getElementById('audio1').name;
-      let subscribe_sid2 = document.getElementById('video2').name || document.getElementById('audio2').name;
-      let subscribe_sid3 = document.getElementById('video3').name || document.getElementById('audio3').name;
-      let subscribe_sid4 = document.getElementById('video4').name || document.getElementById('audio4').name;
-      let subscribe_sid5 = document.getElementById('video5').name || document.getElementById('audio5').name;
-      let subscribe_sid6 = document.getElementById('video6').name || document.getElementById('audio6').name;
-
-      let subscribe_sid7 = document.getElementById('video7').name || document.getElementById('audio7').name;
-      let subscribe_sid8 = document.getElementById('video8').name || document.getElementById('audio8').name;
-      let subscribe_sid9 = document.getElementById('video9').name || document.getElementById('audio9').name;
-      let subscribe_sid10 = document.getElementById('video10').name || document.getElementById('audio10').name;
-      let subscribe_sid11 = document.getElementById('video11').name || document.getElementById('audio11').name;
-      let subscribe_sid12 = document.getElementById('video12').name || document.getElementById('audio12').name;
+      let publish_sid = (document.getElementById('publish_video1') ? document.getElementById('publish_video1').name : '') || (document.getElementById('publish_streamId1') ? document.getElementById('publish_streamId1').name : '');
+      let subscribe_sid1 = (document.getElementById('video1') ? document.getElementById('video1').name : '') || (document.getElementById('audio1') ? document.getElementById('audio1').name : '');
+      let subscribe_sid2 = (document.getElementById('video2') ? document.getElementById('video2').name : '') || (document.getElementById('audio2') ? document.getElementById('audio2').name : '');
+      let subscribe_sid3 =(document.getElementById('video3') ? document.getElementById('video3').name : '') || (document.getElementById('audio3') ? document.getElementById('audio3').name : '');
+      let subscribe_sid4 = (document.getElementById('video4') ? document.getElementById('video4').name : '') || (document.getElementById('audio4') ? document.getElementById('audio4').name : '');
+      let subscribe_sid5 = (document.getElementById('video5') ? document.getElementById('video5').name : '') || (document.getElementById('audio5') ? document.getElementById('audio5').name : '');
+      let subscribe_sid6 = (document.getElementById('video6') ? document.getElementById('video6').name : '') || (document.getElementById('audio6') ? document.getElementById('audio6').name : '');
+
+      let subscribe_sid7 = (document.getElementById('video7') ? document.getElementById('video7').name : '') || (document.getElementById('audio7') ? document.getElementById('audio7').name : '');
+      let subscribe_sid8 = (document.getElementById('video8') ? document.getElementById('video8').name : '') || (document.getElementById('audio8') ? document.getElementById('audio8').name : '');
+      let subscribe_sid9 = (document.getElementById('video9') ? document.getElementById('video9').name : '') || (document.getElementById('audio9') ? document.getElementById('audio9').name : '');
+      let subscribe_sid10 = (document.getElementById('video10') ? document.getElementById('video10').name : '') || (document.getElementById('audio10') ? document.getElementById('audio10').name : '');
+      let subscribe_sid11 = (document.getElementById('video11') ? document.getElementById('video11').name : '') || (document.getElementById('audio11') ? document.getElementById('audio11').name : '');
+      let subscribe_sid12 = (document.getElementById('video12') ? document.getElementById('video12').name : '') || (document.getElementById('audio12') ? document.getElementById('audio12').name : '');
 
       let volumeView;
       switch (sid) {
@@ -2451,7 +2493,7 @@ class Video extends Component {
       }
 
       for (var i = 0; i < 40; i++) {
-        let energy = (dataArray[step * i] / 256.0) * 80;
+        let energy = (dataArray[step * i] / 256.0) * 100;
         ctx.beginPath();
         ctx.fillStyle = this.props.voiceColor;
         const { x1, y1, x2, y2 } = drawArea
@@ -2461,7 +2503,7 @@ class Video extends Component {
         let startY = y1 - height  // 绘制起始点y
         ctx.fillRect(startX, startY, width, height)
         if(document.getElementById('publish_video1').name == sid) {
-          this.state.analyserHeight.set(sid,energy/80)
+          this.state.analyserHeight.set(sid,energy/25)
             this.state.analyserHeight = this.state.analyserHeight
         }
 
@@ -2482,9 +2524,32 @@ class Video extends Component {
       if(this.state.isScreenSwitching) {
         this.state.isScreenSwitching = false
       } else {
-        if (!this.state.laveRoomSharedScreen && this.state.isSharedScreen) {
-          this.sharedScreen()
+                // if (this.state.isWhiteboard) {
+        //   publish_config.publish_device = 4
+        //   publish_config.media_type = 1
+        //   publish_config.sid = document.getElementById('video20').name
+        //   publish_config.part_of_screen_id = 'touBoxItem'
+        //   publish_config.video_profile_type = 5
+        //   this.test_controller.ChangeMediaStream(publish_config);
+        //   this.setState({
+        //     isPDF: true,
+        //   })
+        // } else {
+          document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
+        // }
+        this.state.isSharedScreen = false
+        this.state.isScreenSwitching = false
+        this.setState({
+          screenName: '共享模式'
+        });
+        console.log(pictureInPictureVideo)
+        this.tabTitlesClick('RMScreen', 'delect')
+        if (this.state.isPictureInPicture) {
+          document.exitPictureInPicture()
         }
+        // if (!this.state.laveRoomSharedScreen && this.state.isSharedScreen) {
+        //   this.sharedScreen()
+        // }
       }
         
       
@@ -2559,6 +2624,10 @@ class Video extends Component {
     }
   }
   finishSession = () => {
+    // clearInterval(this.state.OnVolumeAnalyserMap.get(sid))
+    this.state.OnVolumeAnalyserMap.forEach((value,key,map)=>{
+      clearInterval(value)
+    })
     this.timer && clearInterval(this.timer);
     if(this.state.isSharedScreen) {
       this.setState({
@@ -2787,7 +2856,7 @@ class Video extends Component {
   }
   };
   isFileSuccuse = () => {
-    if (!this.state.sessionId || this.state.isSuspend || !this.state.sessionType) {
+    if (!this.state.sessionId || !this.state.sessionType || !this.state.imStatus) {
       this.messageClick('当前程序异常请先退出重开','error')
       return false
     } else {
@@ -2844,9 +2913,13 @@ class Video extends Component {
       }
     }
   };
-  screenSwitching=()=>{
+  sharedScreen = () => {
+    console.log('投屏')
     if (this.isFileSuccuse()) {
       const publish_config = {};
+      if(streamShare) {
+        streamShare.getTracks().forEach(track => track.stop());
+      }
       if (this.state.isSharedScreen) {
         const publish_config = {}
         publish_config.media_type = 1
@@ -2859,40 +2932,6 @@ class Video extends Component {
         publish_config.sid = document.getElementById('video20').name
         this.test_controller.ChangeMediaStream(publish_config)
         this.state.isScreenSwitching = true
-      }
-    }
-  }
-  sharedScreen = () => {
-    console.log('投屏')
-    if (this.isFileSuccuse()) {
-      const publish_config = {};
-      if(streamShare) {
-        streamShare.getTracks().forEach(track => track.stop());
-      }
-      if (this.state.isSharedScreen) {
-        // if (this.state.isWhiteboard) {
-        //   publish_config.publish_device = 4
-        //   publish_config.media_type = 1
-        //   publish_config.sid = document.getElementById('video20').name
-        //   publish_config.part_of_screen_id = 'touBoxItem'
-        //   publish_config.video_profile_type = 5
-        //   this.test_controller.ChangeMediaStream(publish_config);
-        //   this.setState({
-        //     isPDF: true,
-        //   })
-        // } else {
-          this.test_controller.UnPublish(document.getElementById('video20').name)
-        // }
-        this.state.isSharedScreen = false
-        this.state.isScreenSwitching = false
-        this.setState({
-          screenName: '共享模式'
-        });
-        console.log(pictureInPictureVideo)
-        this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
       } else {
         if (document.getElementById('video20').name) {
           publish_config.media_type = 1;
@@ -2919,7 +2958,7 @@ class Video extends Component {
         // this.state.isSharedScreen = true
         // this.state.isScreenSwitching = false
         this.setState({
-          screenName: '取消共享',
+          screenName: '切换共享',
           isPDF: false
         })
         this.tabTitlesClick(
@@ -3258,7 +3297,9 @@ class Video extends Component {
           videoTwelveName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户12'
         })
       }
-      this.pictureInPicture('Refresh')
+      if(this.state.isPictureInPicture) {
+        this.pictureInPicture('Refresh')
+      }
     } catch (err) {
       if(err.status == 502 || err.status== 404) {
         this.roomCallBack(2, '连接服务器失败','SYS-02')
@@ -4065,7 +4106,6 @@ class Video extends Component {
             ocrClick={this.ocrClick}
             switchExternal={this.switchExternalAge}
             inspection={this.inspection}
-            screenSwitching={this.screenSwitching}
           ></Foot>
           <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
             onCancel={this.handleCancel}>