react_hsbc_teller 1.1.5 → 1.1.6

package/package.json

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

package/packages/demo/demo.js

@@ -14,7 +14,7 @@ class Demo extends Component {
     sessionId: '',
     isVideo: false,
     tellerAccount: '00000000',
-    callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
+    callbackUrl: 'http://182.92.184.31:8720/hsbc/callback',
     businessNumber: '',
     lang: 'zh',
     roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',

package/packages/pages/video/video.jsx

@@ -726,6 +726,7 @@ class Video extends Component {
   workerClick=()=>{
     const canvas = document.createElement('canvas');
     const cobj = canvas.getContext('2d'); // 获取绘图环境
+    let microTimerMap = new Map()
     let blob = new Blob([
       `
       let timer;
@@ -842,6 +843,7 @@ class Video extends Component {
         aou(analyser)
         function aou(analyser){
           if(analyser) {
+            cancelAnimationFrame(microTimerMap.get(sid))
             let dataArray = new Uint8Array(analyser.frequencyBinCount);
             analyser.getByteFrequencyData(dataArray);
             let step = Math.round(dataArray.length / 60); //采样步长
@@ -865,7 +867,7 @@ class Video extends Component {
               let startY =  y1 - height  // 绘制起始点y
               cobj.fillRect(startX, startY, width, height )
             }
-            requestAnimationFrame(aou.bind(this, analyser));
+            microTimerMap.set(sid,requestAnimationFrame(aou.bind(this, analyser)) ) 
           }
 
 
@@ -1590,6 +1592,10 @@ class Video extends Component {
             'tellerId': this.props.tellerAccount
           })
         });
+        if(this.state.screenName == '取消共享') {
+          this.state.isSharedScreen = true
+        this.state.isScreenSwitching = false
+        }
       } 
       if(sid == document.getElementById('publish_video1').name) {
         this.setState({
@@ -2331,7 +2337,12 @@ class Video extends Component {
             loading: false
         })
       }
-      
+      if (sid == document.getElementById('video20').name) {
+        if(this.state.screenName == '取消共享') {
+          this.state.isSharedScreen = true
+        this.state.isScreenSwitching = false
+        }
+      }
     };
     // 切流失败通知
     this.test_controller.OnChangeMediaStreamFailed = (
@@ -2894,8 +2905,8 @@ class Video extends Component {
           publish_config.publish_tag = 'projectionWhiteboard'
           this.test_controller.Publish(publish_config)
         }
-        this.state.isSharedScreen = true
-        this.state.isScreenSwitching = false
+        // this.state.isSharedScreen = true
+        // this.state.isScreenSwitching = false
         this.setState({
           screenName: '取消共享',
           isPDF: false