react_hsbc_teller 1.3.0 → 1.3.1

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -94,7 +94,7 @@ export default class foot extends Component {
                       <div className="one">
                           <img className="imgClass" src={require("../../assets/img/switchExternal.png").default} alt="" />
                           <div className="text">
-                              白板
+                          远程签署
                           </div>
                       </div>
                       </div>

package/packages/pages/foot/foot.less

@@ -10,7 +10,7 @@ width: 100%;
 }
 .total{
     display: inline-flex;
-    width: 33%;
+    width: 25%;
     height: 100%;
   align-items: center;
 //   margin: 10px 0;
@@ -46,9 +46,11 @@ line-height: 11px;
 }
 .totalTwo{
     justify-content: center;
+    width: 50%;
 }
 .totalThree{
     // margin-top: 10px;
+    width: 25%;
     justify-content: flex-end;
 }
 .buttonClass{

package/packages/pages/video/video.jsx

@@ -852,6 +852,7 @@ class Video extends Component {
   endSessionValue = () => {
     if(streamShare) {
       streamShare.getTracks().forEach(track => track.stop());
+      streamShare=''
     }
       this.finishSession()
     
@@ -1439,6 +1440,7 @@ class Video extends Component {
           } else if (Mival.type == 2) {
             if(streamShare) {
               streamShare.getTracks().forEach(track => track.stop());
+              streamShare = ''
             }
             this.tabTitlesClick('RMWhiteboard', 'delect')
             if (this.state.isSharedScreen) {
@@ -3042,36 +3044,31 @@ class Video extends Component {
     // 停止共享
     this.test_controller.OnDesktopDisplayClosed = () => {
       console.log('OnDesktopDisplayClosed', this.state.isSharedScreen ,this.state.laveRoomSharedScreen)
-      if(this.state.isScreenSwitching) {
-        this.state.isScreenSwitching = false
+     
+        if(this.state.isScreenSwitching) {
+          this.state.isScreenSwitching = false
+        } else {
+          if(!streamShare) {
+            document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
       } else {
-                // if (this.state.isWhiteboard) {
-        //   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);
-        //   this.setState({
-        //     isPDF: true,
-        //   })
-      // } else {
-          document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
+        console.log('白板')
+      }
+          this.state.isSharedScreen = false
+          this.state.isScreenSwitching = false
+          this.setState({
+            screenName: '共享模式'
+          });
+          console.log(pictureInPictureVideo)
+          this.tabTitlesClick('RMScreen', 'delect')
+          if (this.state.isPictureInPicture) {
+            document.exitPictureInPicture()
+          }
+          // if (!this.state.laveRoomSharedScreen && this.state.isSharedScreen) {
+          //   this.sharedScreen()
       // }
-        this.state.isSharedScreen = false
-        this.state.isScreenSwitching = false
-        this.setState({
-          screenName: '共享模式'
-        });
-        console.log(pictureInPictureVideo)
-        this.tabTitlesClick('RMScreen', 'delect')
-        if (this.state.isPictureInPicture) {
-          document.exitPictureInPicture()
         }
-        // if (!this.state.laveRoomSharedScreen && this.state.isSharedScreen) {
-        //   this.sharedScreen()
-    // }
-      }
+     
+
         
       
     };
@@ -3455,6 +3452,7 @@ class Video extends Component {
         const publish_config = {};
         if(streamShare) {
           streamShare.getTracks().forEach(track => track.stop());
+          streamShare = ''
         }
         if (this.state.isSharedScreen) {
           const publish_config = {}
@@ -4065,6 +4063,7 @@ class Video extends Component {
   .then((stream) => {
     if(streamShare) {
       streamShare.getTracks().forEach(track => track.stop());
+      streamShare = ''
     }
     videoMedia.srcObject = stream;
     stream.getVideoTracks()[0].applyConstraints({
@@ -4074,6 +4073,7 @@ class Video extends Component {
     streamShare = stream
     stream.getVideoTracks()[0].onended = async ()=>{
       //单击停止共享按钮后，触发这个事件
+      streamShare = ''
       if(document.getElementById('video20').name&&!this.state.isSharedScreen) {
         that.test_controller.UnPublish(document.getElementById('video20').name)
       }