react_hsbc_teller 0.8.7 → 0.9.9

package/package.json

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

package/packages/common/websocket.js

@@ -250,5 +250,6 @@ function joinRoom(from, to) {
 export {
   initWebSocket,
   sendMessage,
+  disconnect,
   joinRoom
 }

package/packages/pages/video/video.jsx

@@ -41,6 +41,7 @@ class Video extends Component {
   cancel = axios.CancelToken.source()
   signCanvas = React.createRef();
   state = {
+    laveRoomSharedScreen: false,
     isJoinRoom: false,
     sessionType: false,
     isWhiteboard: false,
@@ -137,12 +138,6 @@ class Video extends Component {
   // eslint-disable-next-line no-undef
   test_controller = '';
 
-  componentDidMount() {
-    window.onbeforeunload = () => {
-      this.finishSession()
-    }
-  };
-
   /**
    * 创建房间成功后回调后台
    * @param  {JSON} data 数据类型
@@ -1540,6 +1535,15 @@ class Video extends Component {
     // 加入房间成功
     this.test_controller.OnJoinRoomSucc = () => {
       console.log('加入房间成功')
+      let publish_config = {}
+      publish_config.media_type = 1
+      publish_config.publish_device = 1
+      publish_config.need_volume_analyser = true
+      publish_config.video_profile_type = 3
+      publish_config.publish_video_id = 'publish_video1'
+      publish_config.publish_streamId_id = 'publish_streamId1'
+      publish_config.publish_tag = 'tag1'
+      this.test_controller.Publish(publish_config)
       this.roomCallBack(1, '',0)
     };
     // 加入房间失败
@@ -2453,9 +2457,24 @@ class Video extends Component {
     }
     // 停止共享
     this.test_controller.OnDesktopDisplayClosed = () => {
-      if (this.state.isSharedScreen) {
-        this.sharedScreen()
-      }
+      console.log('OnDesktopDisplayClosed', this.state.isSharedScreen ,this.state.laveRoomSharedScreen)
+      // if(this.state.laveRoomSharedScreen) {
+      //   if (this.state.roomCustomerList.length == 0 && this.state.sessionType) {
+      //     this.finishSessionClick()
+      //   }
+      //   if (this.test_controller&&this.state.sessionType) {
+      //     this.test_controller.LeaveRoom()
+      //     this.test_controller.Disconnect()
+      //   }
+      //   if(this.state.imStatus) {
+      //     disconnect();
+      //   }
+      // } else {
+        if (this.state.isSharedScreen) {
+          this.sharedScreen()
+        }
+      // }
+      
     }
   }
   enterRoom = async () =>{
@@ -2502,6 +2521,7 @@ class Video extends Component {
     }
   };
   componentWillUnmount() {
+    
     if (this.state.roomCustomerList.length == 0 && this.state.sessionType) {
       this.finishSessionClick()
     }
@@ -2512,19 +2532,13 @@ class Video extends Component {
     if(this.state.imStatus) {
       disconnect();
     }
-    this.setState({
-      isCustomer: false,
-      isWhiteboard: false,
-      isPictureInPicture: false,
-      imStatus: false,
-      imJoinRoom: false,
-      sessionType: false
-    });
+    
+  }
+  clearData=()=>{
     this.setState = (state, callback) => {
       return
     }
     this.cancel = ''
-    this.timer && clearInterval(this.timer);
   }
   finishSessionClick= async () => {
     try {
@@ -2536,20 +2550,19 @@ class Video extends Component {
     }
   }
   finishSession = () => {
-    
-    
+    this.timer && clearInterval(this.timer);
     if(this.state.isSharedScreen) {
-          this.test_controller.UnPublish(document.getElementById('video20').name)
-        this.setState({
-          publishDevic: 1,
-          isSharedScreen: false,
-          screenName: '投屏'
-        });
-        console.log(pictureInPictureVideo)
-        this.tabTitlesClick('RMScreen', 'delect')
+      this.setState({
+        publishDevic: 1,
+        isSharedScreen: false,
+        screenName: '投屏',
+        laveRoomSharedScreen: true
+      });
+        // this.test_controller.UnPublish(document.getElementById('video20').name)
         if (this.state.isPictureInPicture) {
           document.exitPictureInPicture()
         }
+        console.log('isSharedScreen', this.state.isSharedScreen)
       this.props.onLeaveRoom({
         code: LEAVE_TYPE.TELLER_EXIT,
         errMsg: '坐席退出'
@@ -2559,7 +2572,9 @@ class Video extends Component {
         code: LEAVE_TYPE.TELLER_EXIT,
         errMsg: '坐席退出'
       })
+
     }
+
     
   }
   getRoomStatus = async data => {

package/src/index.js

@@ -2,8 +2,8 @@ import React from "react";
 import ReactDOM from "react-dom";
 import "./index.less";
 import '@babel/polyfill';
-// import { HSBC } from "../lib/hsbc";
-import {HSBC} from "../packages";
+import { HSBC } from "../lib/hsbc";
+// import {HSBC} from "../packages";
 
 ReactDOM.render(
   <div className="hsbc"><HSBC></HSBC></div>,