react_hsbc_teller 1.5.6 → 1.5.9

package/package.json

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

package/packages/pages/video/video.jsx

@@ -2245,7 +2245,8 @@ class Video extends Component {
             console.log(array, newArray, this.state.roomCustomerList);
               this.state.roomCustomerList = newArray
             let config_param
-            if (itemOne.tag == 'VIDEO_SOURCE_SCREEN') {
+            if (rateList.indexOf(itemOne.tag) > -1) {
+            // itemOne.tag == 'VIDEO_SOURCE_SCREEN'
               config_param = {
                 subscribe_video_id: 'video21',
                 subscribe_audio_id: 'audio21',
@@ -2634,9 +2635,9 @@ class Video extends Component {
           screenName: '共享模式'
         });
         this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
+        // if (this.state.isPictureInPicture) {
+        //   document.exitPictureInPicture()
+        // }
 
       }
     };
@@ -2993,9 +2994,9 @@ class Video extends Component {
         });
         console.log(pictureInPictureVideo)
         this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
+        // if (this.state.isPictureInPicture) {
+        //   document.exitPictureInPicture()
+        // }
       }
     };
     // 服务端录制初始化成功
@@ -3133,9 +3134,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()
       // }
@@ -3209,6 +3210,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: '共享模式',
@@ -3216,9 +3220,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,
@@ -3511,6 +3513,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
@@ -3522,6 +3525,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);
@@ -3530,6 +3534,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
@@ -4079,14 +4084,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)* 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)* 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
     canvas.width = 960;
     canvas.height = 540;
     
@@ -4098,6 +4107,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)'
@@ -4134,10 +4144,10 @@ class Video extends Component {
     navigator.mediaDevices.getDisplayMedia({
       video: true,
       preferCurrentTab:true,
-      video: {
-        width: 1280,
-        height: 720
-      }
+      // video: {
+      //   width: document.body.clientWidth,
+      //   height: document.body.clientHeight
+      // }
   })
   .then((stream) => {
     if(streamShare) {
@@ -4145,12 +4155,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 ()=>{
@@ -4182,9 +4192,9 @@ class Video extends Component {
           screenName: '共享模式'
         });
         this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
-        }
+        // if (this.state.isPictureInPicture) {
+        //   document.exitPictureInPicture()
+        // }
       }
     }
     
@@ -4375,7 +4385,8 @@ class Video extends Component {
   sendNotification = () =>{
     console.log(this.props.shareMask,this.state.shareMaskState)
     this.state.shareMaskState = this.props.shareMask
-    // setTimeout(() => {
+    // 加延迟是因为在关闭的时候可以看到部分rm的操作
+    setTimeout(() => {
       callNimIM('sendCustomCmdMsg', {
         customId: this.state.imRoomId,
         content: JSON.stringify({
@@ -4384,7 +4395,7 @@ class Video extends Component {
           'type': this.state.shareMaskState ? 1 : 2
         })
       });
-    // },100)
+    },100)
     
   }
   componentDidUpdate(prevProps){