react_hsbc_teller 1.0.8 → 1.0.9

package/package.json

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

package/packages/pages/foot/foot.less

@@ -35,6 +35,7 @@ width: 100%;
     padding-bottom: 10px;
     text-align: center;
     max-width: 110px;
+    min-width: 80px;
 height: 11px;
 font-size: 14px;
 font-family: PingFangSC-Regular, PingFang SC;

package/packages/pages/video/video.jsx

@@ -2017,7 +2017,6 @@ class Video extends Component {
             'tellerId': this.props.tellerAccount
           })
         })
-        this.state.sessionType = false
         this.state.isSharedScreen = false
         this.setState({
           
@@ -3255,26 +3254,75 @@ class Video extends Component {
         value: 'RMWhiteboard',
         name: 'RM白板'
       }, 'add')
-      if (document.getElementById('video20').name) {
-        // 代表已经有了进行切流
-        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);
-      } else {
-
-        publish_config.media_type = 1
-        publish_config.publish_device = 4
-        publish_config.need_volume_analyser = true
-        publish_config.video_profile_type = 5
-        publish_config.part_of_screen_id = 'touBoxItem';
-        publish_config.publish_video_id = 'video20'
-        publish_config.publish_streamId_id = 'subscribe_streamId10'
-        publish_config.publish_tag = 'projectionWhiteboard'
-        this.test_controller.Publish(publish_config)
-      }
+      const width = this.state.whiteboardWidth;
+      const height = this.state.whiteboardHeight;
+      const canvas = document.createElement('canvas');
+      const videoMedia = document.getElementById('manedvideo');
+      const cobj = canvas.getContext('2d'); // 获取绘图环境
+      const w = window.screen.width;
+      const h = window.screen.height;
+      canvas.width = width;
+      canvas.height = height;
+      videoMedia.addEventListener('play', (event) =>{
+        var $this = this; //cache
+        console.log('333111',!$this.paused,!$this.ended)
+        loop()
+        function loop() {
+            if (!$this.paused && !$this.ended) {
+              cobj.drawImage(videoMedia, 0, 0, width, height, 0, 0,width, height,);
+                setTimeout(loop, 1000 / 10); // drawing at 30fps
+            }
+        }
+        
+        if (document.getElementById('video20').name) {
+          // 代表已经有了进行切流
+          publish_config.publish_device = 5
+          publish_config.media_type = 1
+          publish_config.sid = document.getElementById('video20').name
+          publish_config.stream = canvas.captureStream(10)
+          publish_config.video_profile_type = 5
+          this.test_controller.ChangeMediaStream(publish_config);
+        } else {
+  
+          publish_config.media_type = 1
+          publish_config.publish_device = 5
+          publish_config.need_volume_analyser = true
+          publish_config.video_profile_type = 5
+          publish_config.stream = canvas.captureStream(10)
+          publish_config.publish_video_id = 'video20'
+          publish_config.publish_streamId_id = 'subscribe_streamId10'
+          publish_config.publish_tag = 'projectionWhiteboard'
+          this.test_controller.Publish(publish_config)
+        }
+    }, 0);
+      navigator.mediaDevices.getDisplayMedia({
+        video: true
+    })
+    .then((stream) => {
+      videoMedia.srcObject = stream;
+    }, error => {
+        console.log("Unable to acquire screen capture", error);
+    });
+      // if (document.getElementById('video20').name) {
+      //   // 代表已经有了进行切流
+      //   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);
+      // } else {
+
+      //   publish_config.media_type = 1
+      //   publish_config.publish_device = 4
+      //   publish_config.need_volume_analyser = true
+      //   publish_config.video_profile_type = 5
+      //   publish_config.part_of_screen_id = 'touBoxItem';
+      //   publish_config.publish_video_id = 'video20'
+      //   publish_config.publish_streamId_id = 'subscribe_streamId10'
+      //   publish_config.publish_tag = 'projectionWhiteboard'
+      //   this.test_controller.Publish(publish_config)
+      // }
     } else {
       this.messageClick('当前已经切换RM白板','success')
 
@@ -3477,8 +3525,8 @@ class Video extends Component {
                 </div>
 
               </div>
-              {/* <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMWhiteboard') ? '' : 'none', }}> */}
-              <div className="videoDiv">
+              <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMWhiteboard') ? '' : 'none', }}>
+              {/* <div className="videoDiv"> */}
                 <div id="touBoxItem">
                   {pdfChildren}
                 </div>
@@ -4035,6 +4083,8 @@ class Video extends Component {
             </div>
           </Modal>
           <video className="mixedvideo" id="mixedvideo" autoPlay muted={true} width="0" height="0"></video>
+          <video className="mixedvideo" id="manedvideo" autoPlay width="0" height="0"></video>
+
         </Spin>
       </div>);
   }