react_hsbc_teller 1.5.7 → 1.6.0

package/package.json

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

package/packages/demo/demo.js

@@ -161,6 +161,9 @@ createRoomCallback=(data)=>{
 joinRoomCallback=(data)=>{
     console.log('joinRoomCallback', data)
 }
+userExit =(val)=>{
+        console.log(val)
+    }
   render() {
     return (
       <div className="test">
@@ -192,6 +195,7 @@ joinRoomCallback=(data)=>{
                             createRoomCallback={this.createRoomCallback}
                             joinRoomCallback={this.joinRoomCallback}
                             imgCallback={this.imgCallback}
+                            userExit={this.userExit}
                             >
                                 
                                 <Pdf></Pdf>

package/packages/pages/video/video.jsx

@@ -2635,9 +2635,9 @@ class Video extends Component {
           screenName: '共享模式'
         });
         this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
+        // if (this.state.isPictureInPicture) {
+        //   document.exitPictureInPicture()
+        // }
 
       }
     };
@@ -2789,12 +2789,20 @@ class Video extends Component {
       console.log('退出房间者', participant, exitType)
       this.appGetUsernameClick(participant).then((res)=>{
         console.log('退出房间者',res)
-        let data = res? res : '客户'
-        console.log(data)
-        this.messageClick(( data + '已退出会议'),'error')
-        // let audio = document.createElement('audio') //生成一个audio元素 
-        // audio.src = 'http://mp3.9ku.com/hot/2005/05-19/65937.mp3' //音乐的路径 
-        // audio.play()
+let data = res? res.username ? res.username : '客户' : '客户'
+console.log(data)
+this.messageClick(( data + '已退出会议'),'error')
+if(res.userType == 1) {
+ // 2--坐席  1--客户
+this.props.userExit({
+userId: participant,
+userType:'1'
+})
+}
+        // console.log('退出房间者',res)
+        // let data = res? res : '客户'
+        // console.log(data)
+        // this.messageClick(( data + '已退出会议'),'error')
       })
       
     };
@@ -2994,9 +3002,9 @@ class Video extends Component {
         });
         console.log(pictureInPictureVideo)
         this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
+        // if (this.state.isPictureInPicture) {
+        //   document.exitPictureInPicture()
+        // }
       }
     };
     // 服务端录制初始化成功
@@ -3134,9 +3142,9 @@ class Video extends Component {
           });
           console.log(pictureInPictureVideo)
           this.tabTitlesClick('RMScreen', 'delect')
-          if (this.state.isPictureInPicture) {
-            document.exitPictureInPicture()
-          }
+          // if (this.state.isPictureInPicture) {
+          //   document.exitPictureInPicture()
+          // }
           // if (!this.state.laveRoomSharedScreen && this.state.isSharedScreen) {
           //   this.sharedScreen()
       // }
@@ -3210,6 +3218,9 @@ class Video extends Component {
       clearInterval(value)
     })
     this.timer && clearInterval(this.timer);
+    if (this.state.isPictureInPicture) {
+      document.exitPictureInPicture()
+    }
     if(this.state.isSharedScreen) {
       this.setState({
         screenName: '共享模式',
@@ -3217,9 +3228,7 @@ class Video extends Component {
       this.state.isSharedScreen = false
       this.state.laveRoomSharedScreen = true
         // this.test_controller.UnPublish(document.getElementById('video20').name)
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
+        
         
       this.props.onLeaveRoom({
         code: LEAVE_TYPE.TELLER_EXIT,
@@ -3512,6 +3521,7 @@ class Video extends Component {
           // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
           publish_config.enableDesktopAudio=true
           publish_config.degradationType=2
+          publish_config.desktopStreamToCanvas=true
           publish_config.sid = document.getElementById('video20').name
           this.test_controller.ChangeMediaStream(publish_config)
           this.state.isScreenSwitching = true
@@ -3523,6 +3533,7 @@ class Video extends Component {
             // publish_config.video_profile_type=100
             // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
             publish_config.enableDesktopAudio=true
+            publish_config.desktopStreamToCanvas=true
             publish_config.degradationType=2
             publish_config.sid = document.getElementById('video20').name;
             this.test_controller.ChangeMediaStream(publish_config);
@@ -3531,6 +3542,7 @@ class Video extends Component {
             publish_config.publish_device = 2
             publish_config.need_volume_analyser = true
             publish_config.video_profile_type = 1
+            publish_config.desktopStreamToCanvas=true
             // publish_config.video_profile_type=100
             // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
             publish_config.enableDesktopAudio=true
@@ -3852,7 +3864,8 @@ class Video extends Component {
       console.log(result)
       
       if (result.code == 200) {
-        data = result.data.username ? result.data.username : ''
+        data = result.data ? result.data : ''
+        // data = result.data.username ? result.data.username : ''
       }
       return data
     }catch (err) {
@@ -4080,18 +4093,18 @@ class Video extends Component {
     let height = 0
     let x = 0
     let y = 0
-      // width = ((right - left)* window.screen.width / document.body.clientWidth) - 5
-      // height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 30
-      // x = (left * window.screen.width / document.body.clientWidth)
-      // y = (top* window.screen.width / document.body.clientWidth) + 8
+      width = ((right - left)* window.screen.width / document.body.clientWidth) - 5
+      height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 30
+      x = (left * window.screen.width / document.body.clientWidth)
+      y = (top* window.screen.width / document.body.clientWidth) + 8
       // width = ((right - left)* 1280 / document.body.clientWidth) - 5
       // height = ((bottom - top)* 1280 / document.body.clientWidth) - 30
       // x = (left* 1280 / document.body.clientWidth)
       // y = (top* 1280 / document.body.clientWidth) + 8
-      width = ((right - left)) - 5
-      height = ((bottom - top)) - 30
-      x = (left)
-      y = (top) + 8
+      // width = ((right - left)) - 5
+      // height = ((bottom - top)) - 30
+      // x = (left)
+      // y = (top) + 8
     canvas.width = 960;
     canvas.height = 540;
     
@@ -4103,6 +4116,7 @@ class Video extends Component {
       function loop() {
           if (!$this.paused && !$this.ended) {
             // if(!that.state.tabTitles.find(el=>el.value == 'customerScreen')) {
+              console.log('addEventListener',x, y, width, height)
               cobj.drawImage(videoMedia, x, y, width, height, 0, 0,960, 540);
             // } else {
             //   cobj.fillStyle = 'rgb(0 0 0)'
@@ -4139,10 +4153,10 @@ class Video extends Component {
     navigator.mediaDevices.getDisplayMedia({
       video: true,
       preferCurrentTab:true,
-      video: {
-        width: document.body.clientWidth,
-        height: document.body.clientHeight
-      }
+      // video: {
+      //   width: document.body.clientWidth,
+      //   height: document.body.clientHeight
+      // }
   })
   .then((stream) => {
     if(streamShare) {
@@ -4150,12 +4164,12 @@ class Video extends Component {
       streamShare = ''
     }
     videoMedia.srcObject = stream;
-      // stream.getVideoTracks()[0].applyConstraints({
-      //   width: 1280,
-      //   height: 720
-      //   // width: window.screen.width,
-      //   // height: window.screen.height
-      // })
+      stream.getVideoTracks()[0].applyConstraints({
+        // width: 1280,
+        // height: 720
+        width: window.screen.width,
+        height: window.screen.height
+      })
     
     streamShare = stream
     stream.getVideoTracks()[0].onended = async ()=>{
@@ -4187,9 +4201,9 @@ class Video extends Component {
           screenName: '共享模式'
         });
         this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
+        // if (this.state.isPictureInPicture) {
+        //   document.exitPictureInPicture()
+        // }
       }
     }