react_hsbc_teller 1.1.2 → 1.1.3

package/package.json

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

package/packages/demo/demo.js

@@ -4,17 +4,17 @@ import Pdf from './pdf.js'
 
 class Demo extends Component {
   state = {
-    // mtoken: "182f46eea982",
-    // roomId: "646380817934933",
-    // imRoomId: "E9IYrsxUY@conference.openfire2.leimondata.cn",
-    // sessionId: "E9IYrsxUY",
+    // imRoomId: "9K9ea1vOM@conference.ls-im-xmpp.chinawp.dev.ali.cloud.cn.hsbc",
+    // sessionId: "9K9ea1vOM",
+    // mtoken: "d4e648858b03",
+    // roomId: "645110140224386",
     roomId: '',
     mtoken: '',
     imRoomId: '',
     sessionId: '',
     isVideo: false,
     tellerAccount: '00000000',
-    callbackUrl: 'http://182.92.184.31:8720/hsbc/callback',
+    callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
     businessNumber: '',
     lang: 'zh',
     roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',

package/packages/pages/video/video.jsx

@@ -1533,7 +1533,7 @@ class Video extends Component {
     // 音视频关闭通知
     this.test_controller.OnMediaClose = (code, sid) => {
       console.log(code, sid)
-      if((code == 5004 || code == 5007) && document.getElementById('publish_video1').name == sid) {
+      if(code == 5004 || code == 5007) {
         this.roomCallBack(2, '媒体链路连接异常/超时',8)
       }
     };
@@ -3287,23 +3287,25 @@ class Video extends Component {
     }
 
     const 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 = document.getElementById("whiteboardDIV").getBoundingClientRect().left;
-    const h = document.getElementById("whiteboardDIV").getBoundingClientRect().top
+    const left = document.getElementById("whiteboardDIV").getBoundingClientRect().left;
+    const right = document.getElementById("whiteboardDIV").getBoundingClientRect().right
+    const top = document.getElementById("whiteboardDIV").getBoundingClientRect().top
+    const bottom = document.getElementById("whiteboardDIV").getBoundingClientRect().bottom
+    const width = right - left + 10
+    const height = bottom - top - 33
     canvas.width = width;
     canvas.height = height;
-    videoMedia.addEventListener('play', (event) =>{
+  videoMedia.addEventListener('play', (event) =>{
       var $this = this; //cache
-      console.log('333111',!$this.paused,!$this.ended)
+      console.log('addEventListener',!$this.paused,!$this.ended)
       loop()
       function loop() {
           if (!$this.paused && !$this.ended) {
-            cobj.drawImage(videoMedia, w, h, width, height, 0, 0,width, height,);
-              setTimeout(loop, 1000 / 10); // drawing at 30fps
+            cobj.drawImage(videoMedia, left-10, top, width, height, 0, 0,width, height,);
+            setTimeout(loop, 1000 / 10); // drawing at 30fps
           }
       }
       
@@ -3331,7 +3333,8 @@ class Video extends Component {
       }
   }, 0);
     navigator.mediaDevices.getDisplayMedia({
-      video: true
+      video: true,
+      preferCurrentTab:true,
   })
   .then((stream) => {
     videoMedia.srcObject = stream;
@@ -3367,22 +3370,24 @@ class Video extends Component {
           document.exitPictureInPicture()
         }
       }
-      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 = document.getElementById("whiteboardDIV").getBoundingClientRect().left;
-      const h = document.getElementById("whiteboardDIV").getBoundingClientRect().top
+      const left = document.getElementById("whiteboardDIV").getBoundingClientRect().left;
+      const right = document.getElementById("whiteboardDIV").getBoundingClientRect().right
+      const top = document.getElementById("whiteboardDIV").getBoundingClientRect().top
+      const bottom = document.getElementById("whiteboardDIV").getBoundingClientRect().bottom
+      const width = right - left + 10
+      const height = bottom - top - 33
       canvas.width = width;
       canvas.height = height;
       videoMedia.addEventListener('play', (event) =>{
         var $this = this; //cache
-        console.log('333111',!$this.paused,!$this.ended)
+        console.log('addEventListener',!$this.paused,!$this.ended)
         loop()
         function loop() {
             if (!$this.paused && !$this.ended) {
-              cobj.drawImage(videoMedia, w, h, width, height, 0, 0,width, height,);
+              cobj.drawImage(videoMedia, left-10, top, width, height, 0, 0,width, height,);
                 setTimeout(loop, 1000 / 10); // drawing at 30fps
             }
         }
@@ -3411,7 +3416,8 @@ class Video extends Component {
         }
     }, 0);
       navigator.mediaDevices.getDisplayMedia({
-        video: true
+        video: true,
+        preferCurrentTab:true,
     })
     .then((stream) => {
       videoMedia.srcObject = stream;
@@ -3424,26 +3430,6 @@ class Video extends Component {
     }, 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')
 
@@ -3506,8 +3492,8 @@ class Video extends Component {
     var box=document.getElementById("whiteboardDIV");
        if(box){ //此处在加一层判断，更加严密，如果box存在的情况下获取
             this.state.whiteboardWidth = box.offsetWidth,
-            this.state.whiteboardHeight = box.offsetHeight,
-           console.log('whiteboardDIV', this.state.whiteboardHeight,this.state.whiteboardWidth)
+            this.state.whiteboardHeight = box.offsetHeight - 33,
+           console.log('whiteboardDIV', this.state.whiteboardHeight,box.clientHeight,this.state.whiteboardWidth)
        }
   }
   render() {