react_hsbc_teller 0.8.2 → 0.8.3

package/package.json

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

package/packages/pages/video/video.jsx

@@ -3,7 +3,7 @@
 /* eslint-disable eqeqeq */
 import React, { Component, useState } from 'react';
 import API from '../../api/api';
-import { initWebSocket, joinRoom } from '../../common/websocket';
+import { initWebSocket, joinRoom, disconnect } from '../../common/websocket';
 import './video.less'
 import Header from '../header/header.jsx'
 import Foot from '../foot/foot.jsx'
@@ -188,7 +188,7 @@ class Video extends Component {
         sessionType: false
       })
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       } else {
         this.props.createRoomCallback({
           type: 2,
@@ -228,9 +228,9 @@ class Video extends Component {
     } catch (err) {
       console.error(err);
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       } else {
-        this.roomCallBack(2, '签名失败',-8)
+        this.roomCallBack(2, '签名失败',8)
       }
       
     }
@@ -387,7 +387,7 @@ class Video extends Component {
 
     } catch (err) {
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       }
       console.error(err);
     }
@@ -409,7 +409,7 @@ class Video extends Component {
     } catch (err) {
       console.error(err);
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       }
     }
   };
@@ -582,11 +582,7 @@ class Video extends Component {
     }
   };
   endSessionValue = () => {
-    if(this.state.sessionType) {
-      this.test_controller.LeaveRoom()
-    } else {
       this.finishSession()
-    }
     
   };
   // 画中画
@@ -722,7 +718,7 @@ class Video extends Component {
     canvas.height = height;
 
     interval = setInterval(() => {
-      // cobj.clearRect(0, 0, width, height);
+      cobj.clearRect(0, 0, width, height);
       for (let i = 0; i < list.length; i++) {
 
         let videoId = list[i].name;
@@ -892,7 +888,25 @@ class Video extends Component {
       loading: false,
     })
     if (this.state.sessionId) {
-      this.props.joinRoomCallback({
+      if(code == 'SYS-01' || code == 'SYS-02') {
+        this.props.joinRoomCallback({
+          type: type,
+          errorManage: manege,
+          errorCode: code,
+          data: {}
+        })
+      } else {
+        this.props.joinRoomCallback({
+          type: type,
+          errorManage: manege,
+          errorCode: 'Join-0' + code,
+          data: {}
+        })
+      }
+      
+    } else {
+      if(code == 'SYS-01' || code == 'SYS-02') {
+      this.props.createRoomCallback({
         type: type,
         errorManage: manege,
         errorCode: code,
@@ -902,10 +916,11 @@ class Video extends Component {
       this.props.createRoomCallback({
         type: type,
         errorManage: manege,
-        errorCode: code,
+        errorCode: 'Create-0' + code,
         data: {}
       })
     }
+    }
   }
   tabTitlesClick = (value, type) => {
     const { tabTitles } = this.state;
@@ -1315,7 +1330,7 @@ class Video extends Component {
         this.setState({
           sessionType: false
         })
-        this.roomCallBack(2, 'im建立连接失败',-7)
+        this.roomCallBack(2, 'im建立连接失败',7)
       } else {
         this.setState({
           imStatus: msg
@@ -1419,7 +1434,7 @@ class Video extends Component {
       this.setState({
         cameraList: objList,
         microphoneList: objList1,
-        speakerList: [objList2.length>0? objList2[0]: []]
+        speakerList: objList2.length>0? [objList2[0]]: []
       })
       if (!this.state.appId && !this.state.sessionType) {
         this.mpaasSig(data);
@@ -1441,7 +1456,7 @@ class Video extends Component {
         sessionType: false
       })
       this.messageClick('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头','error')
-      this.roomCallBack(2, '获取设备失败',-1)
+      this.roomCallBack(2, '获取设备失败',1)
     };
     // 建立连接成功
     this.test_controller.OnConnectOK = () => {
@@ -1453,7 +1468,7 @@ class Video extends Component {
       this.setState({
         sessionType: false
       })
-      this.roomCallBack(2, '连接失败',-2)
+      this.roomCallBack(2, '连接失败',2)
     };
     // 断开连接回调
     this.test_controller.OnConnectClose = (code, msg) => {
@@ -1470,7 +1485,7 @@ class Video extends Component {
       this.setState({
         sessionType: false
       })
-      this.roomCallBack(2, '初始化失败',-3)
+      this.roomCallBack(2, '初始化失败',3)
     };
     // 初始化成功回调
     this.test_controller.OnInitRoomConfigOK = () => {
@@ -1499,7 +1514,7 @@ class Video extends Component {
       this.setState({
         sessionType: false
       })
-      this.roomCallBack(2, '创建房间失败',-4)
+      this.roomCallBack(2, '创建房间失败',4)
     };
     // 初始化⾳视频成功
     this.test_controller.OnMediaCallSucc = (sid) => {
@@ -1521,11 +1536,18 @@ class Video extends Component {
     // 加入房间失败
     this.test_controller.OnJoinRoomFailed = (err_code, err_msg) => {
       console.log('加入房间失败', err_code, err_msg)
+      // this.setState({
+      //   sessionType: false,
+      //   isJoinRoom: true
+      // })
+      // this.roomCallBack(2, '加入失败',-5)
       this.setState({
-        sessionType: false,
-        isJoinRoom: true
-      })
-      this.roomCallBack(2, '加入失败',-5)
+        channelId: '',
+        rtoken: '',
+        sessionId: '',
+        imRoomId: ''
+      });
+      this.addToScript()
     };
     // 发布媒体流成功
     this.test_controller.OnPublishSucc = (sid) => {
@@ -1572,7 +1594,7 @@ class Video extends Component {
       this.setState({
         sessionType: false
       })
-      this.roomCallBack(2, '发布失败',-6)
+      this.roomCallBack(2, '发布失败',6)
     };
     // 订阅媒体流成功
     this.test_controller.OnSubscribeSucc = (feed, sid) => {
@@ -2119,9 +2141,6 @@ class Video extends Component {
     // 退出房间回调
     this.test_controller.OnLeaveRoom = (leaveType) => {
       console.log('退出房间回调', leaveType);
-      if(!this.state.isJoinRoom) {
-        this.finishSession()
-      }
       
     };
     // 推送“退出房间者”给与会者
@@ -2444,7 +2463,7 @@ class Video extends Component {
     } catch (err) {
       console.error(err);
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       }
     }
   };
@@ -2459,7 +2478,7 @@ class Video extends Component {
         });
       } catch (err) {
         if(err.status == 502 || err.status== 404) {
-          this.roomCallBack(2, '连接服务器失败',-11)
+          this.roomCallBack(2, '连接服务器失败','SYS-02')
         }
       }
     }
@@ -2475,6 +2494,12 @@ class Video extends Component {
       code: LEAVE_TYPE.TELLER_EXIT,
       errMsg: '坐席退出'
     })
+    if(this.state.sessionType) {
+      this.test_controller.LeaveRoom()
+      this.test_controller.Disconnect()
+      disconnect();
+    }
+    
 
   }
   getRoomStatus = async data => {
@@ -2529,7 +2554,7 @@ class Video extends Component {
       this.setState({
         sessionType: false
       })
-      this.roomCallBack(2, '加载资源失败',-10)
+      this.roomCallBack(2, '加载资源失败','SYS-01')
       
       
   })
@@ -2949,7 +2974,7 @@ class Video extends Component {
       }
     } catch (err) {
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       }
     }
   }
@@ -3111,7 +3136,7 @@ class Video extends Component {
       this.pictureInPicture('Refresh')
     } catch (err) {
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       }
     }
   }
@@ -3168,7 +3193,7 @@ class Video extends Component {
       }
     } catch (err) {
       if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败',-11)
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
       }
     }
   }