react_hsbc_teller 0.8.3 → 0.8.7

package/package.json

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

package/packages/api/api.js

@@ -1,6 +1,27 @@
 import Server from './server';
 
 class API extends Server{
+  
+  async enterRoom(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/enterRoom', params); 
+      console.log(result)
+      if(result && (result.data instanceof Object) && result.code === 200){
+        return result||[];
+      }else{
+        let err = {
+          tip: '服务异常',
+          response: result,
+          data: params,
+          // url: 'https://api.cangdu.org/shopro/data/products',
+        }
+        throw err;
+      }
+    }catch(err){
+      throw err;
+    }
+  }
   async sendEmail(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{
@@ -24,7 +45,7 @@ class API extends Server{
   async appGetUsername(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{
-      let result = await this.axios('get', '/app/getUsername?userId=' + params.userId, params); 
+      let result = await this.axios('get', '/app/getUsername?userId=' + params.userId+ '&sessionId=' + params.sessionId, params); 
       console.log(result)
       if(result && (result.data instanceof Object) && result.code === 200){
         return result||[];

package/packages/pages/video/video.jsx

@@ -162,6 +162,15 @@ class Video extends Component {
         sessionId: result.sessionId,
         loading: false,
       });
+      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)
       // eslint-disable-next-line no-undef
       if(this.state.imStatus) {
         joinRoom((this.props.tellerAccount + '@' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname), this.state.imRoomId)
@@ -230,7 +239,7 @@ class Video extends Component {
       if(err.status == 502 || err.status== 404) {
         this.roomCallBack(2, '连接服务器失败','SYS-02')
       } else {
-        this.roomCallBack(2, '签名失败',8)
+        this.roomCallBack(2, '签名失败',6)
       }
       
     }
@@ -256,7 +265,7 @@ class Video extends Component {
   // 初始化视频
   ConnectMRTC = () => {
     const config_param = {};
-    config_param.auto_publish_subscribe = 2;
+    config_param.auto_publish_subscribe = 4;
     config_param.media_type = 1;
     config_param.publish_device = 1;
     config_param.video_profile_type = '3';
@@ -615,7 +624,7 @@ class Video extends Component {
     if (document.getElementById('publish_video1').name) {
       list.push({
         name: 'publish_video1',
-        title: this.props.meetingInfo.host ? this.props.meetingInfo.host : '坐席',
+        title: this.props.meetingInfo.host ? this.props.meetingInfo.host : '客户经理1',
         voice: 'voiceStatue',
         noVideo: false
       })
@@ -1330,7 +1339,7 @@ class Video extends Component {
         this.setState({
           sessionType: false
         })
-        this.roomCallBack(2, 'im建立连接失败',7)
+        this.roomCallBack(2, 'im建立连接失败',5)
       } else {
         this.setState({
           imStatus: msg
@@ -1514,7 +1523,7 @@ class Video extends Component {
       this.setState({
         sessionType: false
       })
-      this.roomCallBack(2, '创建房间失败',4)
+      this.roomCallBack(2, '创建房间失败',7)
     };
     // 初始化⾳视频成功
     this.test_controller.OnMediaCallSucc = (sid) => {
@@ -1547,7 +1556,14 @@ class Video extends Component {
         sessionId: '',
         imRoomId: ''
       });
-      this.addToScript()
+      
+      this.test_controller.Disconnect()
+      let data = {
+        account: this.props.tellerAccount,
+        type: '2',
+        sigType: 1
+      };
+      this.mpaasSig(data);
     };
     // 发布媒体流成功
     this.test_controller.OnPublishSucc = (sid) => {
@@ -1567,6 +1583,7 @@ class Video extends Component {
         });
       } 
       if(sid == document.getElementById('publish_video1').name) {
+        this.enterRoom()
         this.timer = setInterval(
           () => {
             if(!this.state.voiceStatue) {
@@ -1594,7 +1611,7 @@ class Video extends Component {
       this.setState({
         sessionType: false
       })
-      this.roomCallBack(2, '发布失败',6)
+      this.roomCallBack(2, '发布失败',4)
     };
     // 订阅媒体流成功
     this.test_controller.OnSubscribeSucc = (feed, sid) => {
@@ -2441,6 +2458,23 @@ class Video extends Component {
       }
     }
   }
+  enterRoom = async () =>{
+    try {
+      let result = await API.enterRoom({
+        appAccount: this.props.tellerAccount,
+        sessionId: this.state.sessionId,
+        username: this.props.meetingInfo.host == '--' ? '' : this.props.meetingInfo.host,
+        type: '2'
+      });
+      console.log(result);
+      this.appGetUsername(document.getElementById('publish_video1').name)
+    } catch (err) {
+      console.error(err);
+      if(err.status == 502 || err.status== 404) {
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
+      }
+    }
+  }
   contrastFaceVerify = async data => {
     console.log(data);
     try {
@@ -2467,20 +2501,16 @@ class Video extends Component {
       }
     }
   };
-  finishSession = async () => {
-
-
+  componentWillUnmount() {
     if (this.state.roomCustomerList.length == 0 && this.state.sessionType) {
-      try {
-        let result = await API.finishSession({
-          sessionId: this.state.sessionId,
-          tellerId: this.props.tellerAccount
-        });
-      } catch (err) {
-        if(err.status == 502 || err.status== 404) {
-          this.roomCallBack(2, '连接服务器失败','SYS-02')
-        }
-      }
+      this.finishSessionClick()
+    }
+    if (this.test_controller&&this.state.sessionType) {
+      this.test_controller.LeaveRoom()
+      this.test_controller.Disconnect()
+    }
+    if(this.state.imStatus) {
+      disconnect();
     }
     this.setState({
       isCustomer: false,
@@ -2490,17 +2520,47 @@ class Video extends Component {
       imJoinRoom: false,
       sessionType: false
     });
-    this.props.onLeaveRoom({
-      code: LEAVE_TYPE.TELLER_EXIT,
-      errMsg: '坐席退出'
-    })
-    if(this.state.sessionType) {
-      this.test_controller.LeaveRoom()
-      this.test_controller.Disconnect()
-      disconnect();
+    this.setState = (state, callback) => {
+      return
+    }
+    this.cancel = ''
+    this.timer && clearInterval(this.timer);
+  }
+  finishSessionClick= async () => {
+    try {
+      let result = await API.finishSession({
+        sessionId: this.state.sessionId,
+        tellerId: this.props.tellerAccount
+      });
+    } catch (err) {
+    }
+  }
+  finishSession = () => {
+    
+    
+    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')
+        if (this.state.isPictureInPicture) {
+          document.exitPictureInPicture()
+        }
+      this.props.onLeaveRoom({
+        code: LEAVE_TYPE.TELLER_EXIT,
+        errMsg: '坐席退出'
+      })
+    } else {
+      this.props.onLeaveRoom({
+        code: LEAVE_TYPE.TELLER_EXIT,
+        errMsg: '坐席退出'
+      })
     }
     
-
   }
   getRoomStatus = async data => {
     try {
@@ -2548,13 +2608,15 @@ class Video extends Component {
     this.setState({
       loading: true,
     })
+    const that = this
     axios.get(this.props.resourcePath + "/beauty/beauty.js")
     .then(response => this.addToScriptClick()).catch(function (error) {
       console.log(error);
-      this.setState({
-        sessionType: false
+      that.setState({
+        sessionType: false,
+        loading: false
       })
-      this.roomCallBack(2, '加载资源失败','SYS-01')
+      that.roomCallBack(2, '加载资源失败','SYS-01')
       
       
   })
@@ -2624,13 +2686,6 @@ class Video extends Component {
       }
     }
   }
-  componentWillUnmount() {
-    this.setState = (state, callback) => {
-      return
-    }
-    this.cancel = ''
-    this.timer && clearInterval(this.timer);
-  }
   componentWillMount() {
     if (this.props.sessionId) {
       this.getRoomStatus({
@@ -3026,6 +3081,7 @@ class Video extends Component {
     })
   }
   componentWillReceiveProps(props) {
+    console.log('componentWillReceiveProps',props)
     this.setState({
       channelId: props.roomId,
       rtoken: props.mtoken,
@@ -3070,9 +3126,13 @@ class Video extends Component {
     if (document.getElementById('video12').name == sid) {
       userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).uid
     }
+    if (document.getElementById('publish_video1').name == sid) {
+      userId = this.props.tellerAccount
+    }
     try {
       let result = await API.appGetUsername({
-        userId: userId
+        userId: userId,
+        sessionId: this.state.sessionId
       });
       console.log(result)
       let data
@@ -3081,6 +3141,11 @@ class Video extends Component {
       } else {
         this.messageClick('查询失败','error')
       }
+      if (document.getElementById('publish_video1').name == sid) {
+        this.setState({
+          titleNameRm: data
+        })
+      }
       if (document.getElementById('video1').name == sid) {
 
         this.setState({
@@ -3472,7 +3537,7 @@ class Video extends Component {
                     />
                   }
                   <canvas style={{ display: (!this.state.voiceStatue) ? '' : 'none',width: '25px',height:'25px',marginTop: '4px' }} className="canvasClass" id="publish_volumeView" width="40" height="70"></canvas>
-                    <div className='titleName' style={{ color: this.props.titleColor, fontSize: this.props.fontSize + 'px', fontFamily: this.props.fontFamily }}>{this.props.meetingInfo.host ? this.props.meetingInfo.host : '坐席'}</div>
+                    <div className='titleName' style={{ color: this.props.titleColor, fontSize: this.props.fontSize + 'px', fontFamily: this.props.fontFamily }}>{this.state.titleNameRm}</div>
                   </div>
                 </div>
 
@@ -3959,6 +4024,10 @@ class Video extends Component {
   }
 }
 Video.defaultProps = {
+  mtoken: "26364ded9b83",
+roomId: "645157287240850",
+imRoomId: "Fwua8kGB6@conference.openfire2.leimondata.cn",
+sessionId: "Fwua8kGB6",
   tellerAccount: 't001',
   businessNumber: '123',
   callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',

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>,