react_hsbc_teller 0.5.0 → 0.5.4

package/package.json

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

package/packages/common/websocket.js

@@ -219,7 +219,7 @@ function sendMessage(to, from, type, message) {
     // 转化为xml
     websocketsend(json2xml(temp));
   } else {
-    alert('请先登录！');
+    console.log('请先登录！');
   }
 }
 // 加入群  from---加入群的人的jid，to--群名称
@@ -241,7 +241,7 @@ function joinRoom(from, to) {
     // 转化为xml
     websocketsend(json2xml(temp));
   } else {
-    alert('请先登录！');
+    console.log('请先登录！');
   }
 }
 export {

package/packages/pages/video/video.jsx

@@ -11,7 +11,7 @@ import voiceImgOpen from '../../assets/img/icon_Mute.png'
 import voiceImgCloe from '../../assets/img/icon_MuteOne.png'
 import cameraImgOpen from '../../assets/img/icon_camera.png'
 import cameraImgCloe from '../../assets/img/icon_cameraOne.png'
-import Background from '../../assets/img/placeholder_bg.png'
+import errorPng from '../../assets/img/tooltips2_fail.png'
 import { callNimIM } from '../../utils/cell.js'
 import Modal from "antd/lib/modal";
 import 'antd/lib/modal/style'
@@ -314,12 +314,12 @@ class Video extends Component {
       });
       console.log(result);
       if (result.code == 200) {
-        message.success('人脸识别成功');
+        this.messageClick('人脸识别成功','success')
         this.setState({
           isModalVisibleFacial: false
         })
       } else {
-        message.success('人脸识别失败')
+        this.messageClick('人脸识别失败','error')
       }
 
 
@@ -470,12 +470,28 @@ class Video extends Component {
         })
       }
     } else {
-      message.success('当前暂无客户')
+      this.messageClick('当前暂无客户','error')
     }
     this.setState({
       customerList: list
     })
   }
+  messageClick=(value,valueOne)=>{
+    if(valueOne == 'error') {
+      message.error({
+        content: value,
+        icon: <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>,
+        className: 'errorClassName'
+      })
+    } else if(valueOne == 'success') {
+      message.success({
+        content: value,
+        icon: <img src={require("../../assets/img/tooltips1_pass.png").default} alt="" ></img>,
+        className: 'successClassName'
+      })
+    }
+    
+  }
   // 人脸识别
   facialRecognition = () => {
     if (this.isFileSuccuse()) {
@@ -1069,7 +1085,7 @@ class Video extends Component {
     // 获取设备失败
     this.test_controller.OnGetDevicesFailed = (code, msg) => {
       console.log('获取设备失败', code, msg)
-      message.success('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头')
+      this.messageClick('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头','error')
       this.roomCallBack(2, '获取失败失败')
     };
     // 建立连接成功
@@ -1839,7 +1855,7 @@ class Video extends Component {
     // 切流成功通知
     this.test_controller.OnChangeMediaStreamSuccess = (sid) => {
       console.log('切流成功通知', sid);
-      message.success('切换摄像头或麦克风成功');
+      this.messageClick('切换摄像头或麦克风成功','success')
       this.setState({
         isModalVisibleInspection: false
       })
@@ -1851,7 +1867,7 @@ class Video extends Component {
       msg
     ) => {
       console.log('切流失败通知', sid, code, msg)
-      message.success('切换摄像头或麦克风失败，请先检查设备');
+      this.messageClick('切换摄像头或麦克风失败，请先检查设备','error')
     };
     // 服务端录制初始化成功
     this.test_controller.OnInitRemoteRecordSucc = (
@@ -1970,12 +1986,12 @@ class Video extends Component {
       });
       console.log(result);
       if (result.code == 200) {
-        message.success('人脸识别成功');
+        this.messageClick('人脸识别成功','success')
         this.setState({
           isModalVisibleFacial: false
         })
       } else {
-        message.success('人脸识别失败')
+        this.messageClick('人脸识别失败','error')
       }
 
 
@@ -2014,14 +2030,14 @@ class Video extends Component {
       if (result.code == 200 && result.data.roomStatus == 1) {
         this.addToScript()
       } else {
-        message.success('当前房间状态异常')
+        this.messageClick('当前房间状态异常','error')
         this.props.onLeaveRoom({
           code: LEAVE_TYPE.ROOM_DESTROYED,
           errMsg: '当前房间状态异常'
         })
       }
     } catch (err) {
-      message.success('当前房间状态异常')
+      this.messageClick('当前房间状态异常','error')
       this.props.onLeaveRoom({
         code: LEAVE_TYPE.ROOM_DESTROYED,
         errMsg: '当前房间状态异常'
@@ -2164,7 +2180,7 @@ class Video extends Component {
   };
   isFileSuccuse = () => {
     if (!this.state.sessionId || this.state.isSuspend) {
-      message.success(this.props.prohibitPrompt)
+      this.messageClick(this.props.prohibitPrompt,'error')
       return false
     } else {
       return true
@@ -2420,12 +2436,12 @@ class Video extends Component {
         userId: this.state.employeeNumber
       });
       if (result.code == 200) {
-        message.success('发送成功')
+        this.messageClick('发送成功','success')
         this.setState({
           isModalVisibleInvitation: false
         })
       } else {
-        message.success('发送失败')
+        this.messageClick('发送失败','error')
       }
     } catch (err) {
 
@@ -2490,27 +2506,6 @@ class Video extends Component {
     console.log(sid)
     let userId = ''
     let index
-    // this.state.videoList.map((item,index)=>{
-    //   let name = 'video' + item.videoIndex
-    //   if(document.getElementById(name).name == sid){
-    //     userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById(("feedId" + item.videoIndex)).innerText).uid
-    //     index = index
-    //   }
-    // })
-    // try {
-    //   let result = await API.appGetUsername({
-    //     userId: userId
-    //   });
-    //   console.log(result)
-    //   if (result.code == 200) {
-    //     let data = result.data.userInfo ? result.data.userInfo.userName ? result.data.userInfo.userName : '' : ''
-    //     this.state.videoList[index].videoOneName = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById(("feedId" + item.videoIndex)).innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户' + item.videoIndex
-    //   } else {
-    //     message.success('查询失败')
-    //   }
-    // } catch (err) {
-
-    // }
     if (document.getElementById('video1').name == sid) {
       userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).uid
     }
@@ -2553,7 +2548,7 @@ class Video extends Component {
       if (result.code == 200) {
         data = result.data.userInfo ? result.data.userInfo.userName ? result.data.userInfo.userName : '' : ''
       } else {
-        message.success('查询失败')
+        this.messageClick('查询失败','error')
       }
       if (document.getElementById('video1').name == sid) {
 
@@ -2622,7 +2617,7 @@ class Video extends Component {
           employeeName: result.data.username
         })
       } else {
-        message.success('查询失败')
+        this.messageClick('查询失败','error')
       }
     } catch (err) {
 
@@ -2636,12 +2631,12 @@ class Video extends Component {
       });
       console.log(result)
       if (result.code == 200) {
-        message.success('签字成功')
+        this.messageClick('签字成功','success')
         this.setState({
           isModalVisibleSign: false,
         })
       } else {
-        message.success('签字失败')
+        this.messageClick('签字失败','error')
       }
     } catch (err) {
 
@@ -2683,7 +2678,8 @@ class Video extends Component {
         this.test_controller.Publish(publish_config)
       }
     } else {
-      message.success('当前已经切换RM白板')
+      this.messageClick('当前已经切换RM白板','success')
+
     }
 
 
@@ -3299,21 +3295,30 @@ class Video extends Component {
           ]}>
             <div className='endModal'>确定是否结束会话？</div>
           </Modal>
-          <Modal title={this.state.titleModal} cancelText="取消" okText="确定" visible={this.state.isModalVisibleFacial}
+          <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
+            <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>,
+            <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>确定</Button>
+          ]}>
+            <div className="faceBody">
+              <img className="faceImg" src={this.state.facialImg} alt=""></img>
+            </div>
+          </Modal>
+          {/* <Modal title={this.state.titleModal} cancelText="取消" okText="确定" visible={this.state.isModalVisibleFacial}
             onOk={this.handleOkFacial} onCancel={this.handleCancelFacial}>
             <div className="faceBody">
               <img className="faceImg" src={this.state.facialImg} alt=""></img>
             </div>
 
-          </Modal>
+          </Modal> */}
           <Modal className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
             <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>,
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInvitation}>确定</Button>
           ]}>
             <div>
               <div className="invitationDiv">
-                <span class="modalSpan">员工号：</span><input className="inputClick" placeholder="请输入员工号" value={this.state.employeeNumber} onChange={e => this.handleChange(e)}></input>
-                <span className="invitationSpan" onClick={this.queryStaff}>查 询</span>
+                <span class="modalSpan">员工号：</span><input type="number"className="inputClick" placeholder="请输入员工号" value={this.state.employeeNumber} onChange={e => this.handleChange(e)}></input>
+                {/* <span className="invitationSpan" onClick={this.queryStaff}>查 询</span> */}
+                <Button className="invitationSpan" type="primary" danger onClick={this.queryStaff}>查 询</Button>
               </div>
               <div className="invitationDiv">
               <span class="modalSpan">&nbsp;&nbsp;&nbsp;姓名：</span><span>{this.state.employeeName}</span>
@@ -3361,7 +3366,7 @@ Video.defaultProps = {
   callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
   roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
   resourcePath: 'https://counter-web.leimondata.cn:7199',
-  prohibitPrompt: '当前无客户',
+  prohbiitPrompt: '当前无客户',
   voiceColor: '#0AE544',
   titleBackground: 'rgba(0,0,0,0.65)',
   titleColor: '#fff',

package/packages/pages/video/video.less

@@ -98,13 +98,15 @@
   border-radius: 6px;
 }
 .invitationSpan{
-  padding: 10px 20px;
-  height: 44px;
-  width: 100px;
-  font-size: 16px;
-  background: #3E505D;
-  color: #fff;
-  margin-left: 20px;
+  margin-top: 5px;
+  margin-right: 15px;
+  float: right;
+  height: 37px !important;
+  width: 80px !important;
+  font-size: 16px !important;
+  border: 1px #3E505D solid!important;
+  background: #3E505D !important;
+  color: #fff!important;
 }
 .inputClick{
   width: 65%;
@@ -122,7 +124,12 @@
 }
 .invitationDiv{
   margin-left: 40px;
-  margin-bottom: 15px
+  margin-bottom: 15px;
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    appearance: none;
+    margin: 0;
+}
 }
 .faceImg{
   width: 200px;
@@ -308,10 +315,50 @@
 }
 .endModal{
   font-size: 16px;
-    padding: 56px 30px 18px 30px;
+    padding: 56px 30px 0px 30px;
     color: #333333;
 }
 .inspection{
   font-size: 16px;
   margin: 20px 50px;
+}
+.errorClassName{
+    .ant-message-notice-content{
+      min-width: 500px;
+      height: 44px;
+      background: #F9F2F3;
+      border: 1px #E5B2B5 solid;
+      font-size: 16px;
+      color: #252525;
+      text-align: center;
+      padding: 7px;
+    }
+  
+    img{
+      margin-right: 8px;
+      width: 16px;
+      height: 16px;
+      margin-bottom: 3px;
+    }
+  
+}
+.successClassName{
+  .ant-message-notice-content{
+    min-width: 500px;
+    height: 44px;
+    background: #E5F2F2;
+    border: 1px #99CECC solid;
+    font-size: 16px;
+    color: #252525;
+    text-align: center;
+    padding: 7px;
+  }
+
+  img{
+    margin-right: 8px;
+    width: 16px;
+    height: 16px;
+    margin-bottom: 3px;
+  }
+
 }