react_hsbc_teller 1.1.3 → 1.1.4

package/package.json

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

package/packages/pages/video/video.jsx

@@ -30,6 +30,7 @@ const LEAVE_TYPE = {
 let pictureInPictureVideo
 let mix_stream
 let worker
+let streamShare
 message.config({
   getContainer: ()=>document.getElementById('allHSBC')
 })
@@ -157,11 +158,7 @@ class Video extends Component {
       });
       console.log(result);
       this.state.imRoomId = result.imRoomId,
-      this.state.sessionId = result.sessionId,
-      this.setState({
-
-        loading: false,
-      });
+      this.state.sessionId = result.sessionId;
       let publish_config = {}
       publish_config.media_type = 1
       publish_config.publish_device = 1
@@ -585,6 +582,9 @@ class Video extends Component {
     }
   };
   endSessionValue = () => {
+    if(streamShare) {
+      streamShare.getTracks().forEach(track => track.stop());
+    }
       this.finishSession()
     
   };
@@ -1588,6 +1588,10 @@ class Video extends Component {
         });
       } 
       if(sid == document.getElementById('publish_video1').name) {
+        this.setState({
+
+          loading: false,
+        });
         this.enterRoom()
         this.timer = setInterval(
           () => {
@@ -2838,6 +2842,9 @@ class Video extends Component {
     console.log('投屏')
     if (this.isFileSuccuse()) {
       const publish_config = {};
+      if(streamShare) {
+        streamShare.getTracks().forEach(track => track.stop());
+      }
       if (this.state.isSharedScreen) {
         // if (this.state.isWhiteboard) {
         //   publish_config.publish_device = 4
@@ -3338,6 +3345,7 @@ class Video extends Component {
   })
   .then((stream) => {
     videoMedia.srcObject = stream;
+    streamShare = stream
     stream.getVideoTracks()[0].onended = async ()=>{
       //单击停止共享按钮后，触发这个事件
       if(document.getElementById('video20').name && !this.state.isSharedScreen) {
@@ -3421,6 +3429,7 @@ class Video extends Component {
     })
     .then((stream) => {
       videoMedia.srcObject = stream;
+      streamShare = stream
       stream.getVideoTracks()[0].onended = async ()=>{
         //单击停止共享按钮后，触发这个事件
         if(document.getElementById('video20').name&&!this.state.isSharedScreen) {
@@ -3492,7 +3501,7 @@ class Video extends Component {
     var box=document.getElementById("whiteboardDIV");
        if(box){ //此处在加一层判断，更加严密，如果box存在的情况下获取
             this.state.whiteboardWidth = box.offsetWidth,
-            this.state.whiteboardHeight = box.offsetHeight - 33,
+            this.state.whiteboardHeight = box.offsetHeight  * 0.92,
            console.log('whiteboardDIV', this.state.whiteboardHeight,box.clientHeight,this.state.whiteboardWidth)
        }
   }
@@ -4169,7 +4178,7 @@ class Video extends Component {
               ></CanvasDraw>
             </div>
           </Modal>
-          <Modal title="设置视频设备" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
+          <Modal title="设置视频设备" width={650} closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
              <div key='inspection'>
             <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInspection}>确定</Button>
@@ -4184,7 +4193,7 @@ class Video extends Component {
                 this.state.speakerList.length > 0 &&
                  <span>
                    <div>扬声器：
-                     <span className='speakerTitle'>（请更改系统设置）</span>
+                     <span className='speakerTitle'>（此为默认选项。若需切换，请在平板电脑右下角任务栏中的Speaker设置中调整）</span>
                    </div>
               {speaker}
                  </span>