react_hsbc_teller 0.5.9 → 0.6.0

package/package.json

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

package/packages/pages/foot/foot.less

@@ -1,8 +1,9 @@
 .foot{
     background: #fff;
-height: 58px;
+height: 48px;
 display: inline-flex;
 width: 100%;
+margin: 10px 0;
 // position: absolute;
 //     bottom: 0;
 //     left: 0;

package/packages/pages/video/video.jsx

@@ -145,6 +145,7 @@ class Video extends Component {
       this.props.createRoomCallback({
         type: 1,
         errorManage: '',
+        errorCode: 0,
         data: {
           mtoken: this.state.rtoken,
           imRoomId: result.imRoomId,
@@ -157,6 +158,7 @@ class Video extends Component {
       this.props.createRoomCallback({
         type: 2,
         errorManage: '保存房间信息失败',
+        errorCode:-9,
         data: {}
       })
     }
@@ -182,7 +184,7 @@ class Video extends Component {
       }
     } catch (err) {
       console.error(err);
-      this.roomCallBack(2, '签名失败')
+      this.roomCallBack(2, '签名失败',-8)
     }
   };
   handleEdit = () => {
@@ -752,17 +754,19 @@ class Video extends Component {
       });
     }
   };
-  roomCallBack = (type, manege) => {
+  roomCallBack = (type, manege,code) => {
     if (this.state.sessionId) {
       this.props.joinRoomCallback({
         type: type,
         errorManage: manege,
+        errorCode: code,
         data: {}
       })
     } else {
       this.props.createRoomCallback({
         type: type,
         errorManage: manege,
+        errorCode: code,
         data: {}
       })
     }
@@ -806,11 +810,13 @@ class Video extends Component {
             this.test_controller.StopRemoteRecord(this.state.recordId)
           }
         }
-      } else if (Mival.typeId == 1010) {
-        if (Mival.sessionId == this.state.sessionId) {
-          this.endSession('customerHangUp')
-        }
-      } else if (Mival.typeId == 1215) {
+      }
+      //  else if (Mival.typeId == 1010) {
+      //   if (Mival.sessionId == this.state.sessionId) {
+      //     this.endSession('customerHangUp')
+      //   }
+      // } 
+      else if (Mival.typeId == 1215) {
         // 一炒多的图片
         if (Mival.sessionId == this.state.sessionId) {
           this.props.imgCallback(Mival.data.type, Mival.data.file) // 文字抄录和风险抄录，3--风险，，2--文字
@@ -1018,7 +1024,7 @@ class Video extends Component {
     window.IMOpenfire = msg =>{
       console.log('im登录', msg)
       if(!msg) {
-        this.roomCallBack(2, 'im建立连接失败')
+        this.roomCallBack(2, 'im建立连接失败',-7)
       } else {
         this.setState({
           imStatus: msg
@@ -1112,7 +1118,7 @@ class Video extends Component {
     this.test_controller.OnGetDevicesFailed = (code, msg) => {
       console.log('获取设备失败', code, msg)
       this.messageClick('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头','error')
-      this.roomCallBack(2, '获取失败')
+      this.roomCallBack(2, '获取设备失败',-1)
     };
     // 建立连接成功
     this.test_controller.OnConnectOK = () => {
@@ -1121,7 +1127,7 @@ class Video extends Component {
     };
     this.test_controller.OnConnectFailed = (code, msg) => {
       console.log('建立连接失败', code, msg)
-      this.roomCallBack(2, '连接失败')
+      this.roomCallBack(2, '连接失败',-2)
     };
     // 断开连接回调
     this.test_controller.OnConnectClose = (code, msg) => {
@@ -1135,7 +1141,7 @@ class Video extends Component {
     // 初始化房间失败
     this.test_controller.OnInitRoomConfigFail = (err_code, err_msg) => {
       console.log('初始化房间失败', err_code, err_msg)
-      this.roomCallBack(2, '初始化失败')
+      this.roomCallBack(2, '初始化失败',-3)
     };
     // 初始化成功回调
     this.test_controller.OnInitRoomConfigOK = () => {
@@ -1161,7 +1167,7 @@ class Video extends Component {
     // 创建房间失败
     this.test_controller.OnCreateRoomFailed = (err_code, err_msg) => {
       console.log('创建房间失败', err_code, err_msg)
-      this.roomCallBack(2, '创建失败')
+      this.roomCallBack(2, '创建房间失败',-4)
     };
     // 初始化⾳视频成功
     this.test_controller.OnMediaCallSucc = (sid) => {
@@ -1178,12 +1184,12 @@ class Video extends Component {
     // 加入房间成功
     this.test_controller.OnJoinRoomSucc = () => {
       console.log('加入房间成功')
-      this.roomCallBack(1, '')
+      this.roomCallBack(1, '',0)
     };
     // 加入房间失败
     this.test_controller.OnJoinRoomFailed = (err_code, err_msg) => {
       console.log('加入房间失败', err_code, err_msg)
-      this.roomCallBack(2, '加入失败')
+      this.roomCallBack(2, '加入失败',-5)
     };
     // 发布媒体流成功
     this.test_controller.OnPublishSucc = (sid) => {
@@ -1203,6 +1209,7 @@ class Video extends Component {
     // 发布媒体流失败
     this.test_controller.OnPublishFailed = (sid, err_code, err_msg) => {
       console.log('发布媒体流失败', sid, err_code, err_msg)
+      this.roomCallBack(2, '发布失败',-6)
     };
     // 订阅媒体流成功
     this.test_controller.OnSubscribeSucc = (feed, sid) => {
@@ -2094,7 +2101,7 @@ class Video extends Component {
     axios.get(this.props.resourcePath + "/beauty/beauty.js")
     .then(response => this.addToScriptClick()).catch(function (error) {
       console.log(error);
-      this.roomCallBack(2, '创建房间失败')
+      this.roomCallBack(2, '创建房间失败',-4)
       
   })
     
@@ -2869,14 +2876,22 @@ class Video extends Component {
       width:'100%', 
       height:'100%',
       position: 'absolute',
-      left: 0
+      left: 0,
+      top: 0,
+      right: 0,
+      bottom: 0,
+      margin: 'auto'
 
     } :{
       'z-index': '0',
       width:'100%', 
-      height:'100%',
+      // height:'100%',
       position: 'absolute',
-      left: 0
+      left: 0,
+      top: 0,
+      right: 0,
+      bottom: 0,
+      margin: 'auto'
     };
     return (
       <div className="all">

package/packages/pages/video/video.less

@@ -216,8 +216,13 @@
 }
 .themeClass{
   position: absolute;
-  top: 50%;
-  left: 40%;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  width: 500px;
+  height: 150px;
   font-size: 22px;
     color: #222222;
     font-weight: 600;
@@ -225,6 +230,7 @@
     li{ 
       list-style: none;
       margin: 21px 0;
+      text-align: left;
       span{
         font-size: 20px;
         width: 143px;