react_hsbc_teller 0.7.3 → 0.7.4

package/package.json

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

package/packages/pages/video/video.jsx

@@ -37,6 +37,7 @@ class Video extends Component {
   cancel = axios.CancelToken.source()
   signCanvas = React.createRef();
   state = {
+    sessionType: true,
     isWhiteboard: false,
     isSelect: '',
     loading: false,
@@ -48,6 +49,7 @@ class Video extends Component {
     employeeNumber: '',
     employeeName: '',
     isModalVisibleInvitation: false,
+    linkData: '',
     roomCustomerList: [],
     facialImg: '',
     isModalVisibleFacial: false,
@@ -162,6 +164,9 @@ class Video extends Component {
       })
     } catch (err) {
       console.error(err);
+      this.setState({
+        sessionType: false
+      })
       this.props.createRoomCallback({
         type: 2,
         errorManage: '保存房间信息失败',
@@ -539,7 +544,12 @@ class Video extends Component {
     }
   };
   endSessionValue = () => {
-    this.test_controller.LeaveRoom()
+    if(this.state.sessionType) {
+      this.test_controller.LeaveRoom()
+    } else {
+      this.finishSession()
+    }
+    
   };
   // 画中画
   pictureInPicture = () => {
@@ -681,7 +691,7 @@ class Video extends Component {
             for (let k = 0; k < str.length; k++){
               // console.log(str.substring(0,k+1))
               // console.log(cobj.measureText(str.substring(0,k+1)).width)
-                  if (cobj.measureText(str.substring(0,k+1)).width>240){
+                  if (cobj.measureText(str.substring(0,k+1)).width>210){
                     str = str.substring(0,k-2)
                     str += '...'
                     break;
@@ -1080,6 +1090,9 @@ class Video extends Component {
     window.IMOpenfire = msg =>{
       console.log('im登录', msg)
       if(!msg) {
+        this.setState({
+          sessionType: false
+        })
         this.roomCallBack(2, 'im建立连接失败',-7)
       } else {
         this.setState({
@@ -1185,7 +1198,7 @@ class Video extends Component {
         microphoneList: objList1,
         speakerList: [objList2[0]]
       })
-      if (!this.state.appId) {
+      if (!this.state.appId && this.state.sessionType) {
         this.mpaasSig(data);
         this.setState({
           cameraValue: obj[0].actionid,
@@ -1201,6 +1214,9 @@ class Video extends Component {
     // 获取设备失败
     this.test_controller.OnGetDevicesFailed = (code, msg) => {
       console.log('获取设备失败', code, msg)
+      this.setState({
+        sessionType: false
+      })
       this.messageClick('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头','error')
       this.roomCallBack(2, '获取设备失败',-1)
     };
@@ -1211,6 +1227,9 @@ class Video extends Component {
     };
     this.test_controller.OnConnectFailed = (code, msg) => {
       console.log('建立连接失败', code, msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '连接失败',-2)
     };
     // 断开连接回调
@@ -1225,6 +1244,9 @@ class Video extends Component {
     // 初始化房间失败
     this.test_controller.OnInitRoomConfigFail = (err_code, err_msg) => {
       console.log('初始化房间失败', err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '初始化失败',-3)
     };
     // 初始化成功回调
@@ -1251,6 +1273,9 @@ class Video extends Component {
     // 创建房间失败
     this.test_controller.OnCreateRoomFailed = (err_code, err_msg) => {
       console.log('创建房间失败', err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '创建房间失败',-4)
     };
     // 初始化⾳视频成功
@@ -1273,6 +1298,9 @@ class Video extends Component {
     // 加入房间失败
     this.test_controller.OnJoinRoomFailed = (err_code, err_msg) => {
       console.log('加入房间失败', err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '加入失败',-5)
     };
     // 发布媒体流成功
@@ -1293,6 +1321,9 @@ class Video extends Component {
     // 发布媒体流失败
     this.test_controller.OnPublishFailed = (sid, err_code, err_msg) => {
       console.log('发布媒体流失败', sid, err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '发布失败',-6)
     };
     // 订阅媒体流成功
@@ -1844,6 +1875,7 @@ class Video extends Component {
       exitType
     ) => {
       console.log('退出房间者', participant, exitType)
+      this.messageClick(this.props.customLeaveRoom,'error')
     };
     // 弱网回调
     this.test_controller.OnNetworkWeak = (bpsSend, bpsRecv, sid) => {
@@ -2154,7 +2186,7 @@ class Video extends Component {
   finishSession = async () => {
 
 
-    if (this.state.roomCustomerList.length == 0) {
+    if (this.state.roomCustomerList.length == 0 && this.state.sessionType) {
       try {
         let result = await API.finishSession({
           sessionId: this.state.sessionId,
@@ -2168,7 +2200,8 @@ class Video extends Component {
       isWhiteboard: false,
       isPictureInPicture: false,
       imStatus: false,
-      imJoinRoom: false
+      imJoinRoom: false,
+      sessionType: true
     });
     this.props.onLeaveRoom({
       code: LEAVE_TYPE.TELLER_EXIT,
@@ -2205,8 +2238,12 @@ class Video extends Component {
     axios.get(this.props.resourcePath + "/beauty/beauty.js")
     .then(response => this.addToScriptClick()).catch(function (error) {
       console.log(error);
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '创建房间失败',-4)
       
+      
   })
     
   }
@@ -2601,7 +2638,8 @@ class Video extends Component {
       isModalVisibleInvitation: true,
       employeeNumber: '',
       employeeName: '',
-      employeeError: ''
+      employeeError: '',
+      linkData: ''
     })
 
   }
@@ -2798,6 +2836,11 @@ class Video extends Component {
           employeeName: result.data.staffName,
           employeeError: result.data.staffName ? '' : '查无此人',
         })
+        if(result.data.staffName){
+          this.setState({
+            linkData:encodeURIComponent('https://wp-staff-gateway.wealth-platform.uat.ali.cloud.cn.hsbc/meeting-ui/OHB/CN/HSBC?chnlID=OHB&locale=zh_CN&chnlCC=CN&chnlGMC=HSBC&targetFunc=supervisorMeeting&sourceFunc=rmMeeting&appointmentID='+ this.props.businessNumber + '&staffID='+this.state.employeeNumber+'&staffName='+result.data.staffName)
+          })
+        }
       } else {
         this.messageClick('查询失败','error')
       }
@@ -3511,7 +3554,12 @@ class Video extends Component {
           <Modal className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
              <div key='invitation'>
             <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>
-            <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInvitation}>确定</Button>
+            {
+              this.state.employeeName &&<Button className='modelButtonOk'type="primary" danger onClick={this.handleOkInvitation}>确定</Button>
+            }
+            {
+              !this.state.employeeName &&<Button className='modelButtonCancelOne' type="primary" danger >确定</Button>
+            }
             </div>
           ]}>
             <div>
@@ -3523,6 +3571,9 @@ class Video extends Component {
               <div className="invitationDiv">
               <span className="modalSpan">&nbsp;&nbsp;&nbsp;姓名：</span><span>{this.state.employeeName}</span>
               </div>
+              <div className='linkClass'>
+                <span>{this.state.linkData}</span>
+              </div>
             </div>
             {
               this.state.employeeError && <div className='errorClassInvitation'>
@@ -3588,6 +3639,7 @@ Video.defaultProps = {
   fontSize: '14',
   fontFamily: 'auto',
   menus: ['SHARE', 'FRIES', 'OCR', 'INVITE', 'PIP'],
+  customLeaveRoom: '客户离开房间',
   meetingInfo: {
     title: '测试',
     host: 'wmz',

package/packages/pages/video/video.less

@@ -312,6 +312,15 @@
   border: 1px #5C5C5C solid!important;
   border-spacing: 20px!important;
 }
+.modelButtonCancelOne{
+  width: 100px!important;
+  height: 40px!important;
+  font-size: 16px!important;
+  color: #5C5C5C!important;
+  border: 1px #5C5C5C solid!important;
+  border-spacing: 20px!important;
+  background: #d9d9d9!important;
+}
 .modelButtonOk{
   width: 100px!important;
   height: 40px!important;
@@ -434,4 +443,9 @@
       width: 18px;
     height: 18px;
     }
+}
+.linkClass{
+  margin: 20px 40px;
+  font-size: 14px;
+  word-break: break-all;
 }