react_hsbc_teller 2.0.40 → 2.0.42

package/package.json

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

package/packages/pages/video/video.jsx

@@ -60,7 +60,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.40'
+const SDK_VERISON = '2.0.42'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -2338,6 +2338,7 @@ class Video extends Component {
           this.roomCallBack(2, '音视频异常关闭', 8)
         } else {
           this.state.isScreenSwitching = false
+          this.setSharedScreenState(false)
         }
       }
     };
@@ -2529,6 +2530,7 @@ class Video extends Component {
       console.log('发布媒体流成功', sid)
       this.state.sessionType = true
       if (sid == document.getElementById('video20').name) {
+        this.setSharedScreenState(true)
         this.sendMessage({
           'typeId': 2030,
           'sessionId': this.state.sessionId,
@@ -2538,7 +2540,6 @@ class Video extends Component {
         if (this.state.screenName == '切换共享') {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
-          this.setSharedScreenState(true)
         }
         this.videoInfo = this.generateMediaInfo(document.getElementById("video20").name);
       }
@@ -2597,8 +2598,9 @@ class Video extends Component {
       if (sid == document.getElementById('publish_streamId1').name) {
         this.state.sessionType = false
         this.roomCallBack(2, '发布失败', 4)
-      } else {
+      } else if (sid == document.getElementById('video20').name) {
         this.messageClick('投屏失败请重新投屏', 'error')
+        this.setSharedScreenState(false)
       }
 
     };
@@ -5447,6 +5449,7 @@ class Video extends Component {
     navigator.mediaDevices.getDisplayMedia({
       video: true,
       preferCurrentTab: true,
+      surfaceSwitching: "exclude"
       // audio: true
       // video: {
       //   width: document.body.clientWidth,
@@ -5480,7 +5483,7 @@ class Video extends Component {
         document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
         that.state.isSharedScreen = false
         that.state.isScreenSwitching = false
-        that.setSharedScreenState(false)
+        // that.setSharedScreenState(false)
         that.setState({
           screenName: '共享模式'
         });
@@ -5552,6 +5555,7 @@ class Video extends Component {
     navigator.mediaDevices.getDisplayMedia({
       video: true,
       preferCurrentTab: true,
+      surfaceSwitching: "exclude"
     })
       .then((stream) => {
         if (streamRecord) {
@@ -5592,7 +5596,6 @@ class Video extends Component {
           }, 'add')
           if (this.state.isSharedScreen) {
             this.state.isSharedScreen = false
-            this.setSharedScreenState(false)
             this.setState({
 
               screenName: '共享模式'