react_hsbc_teller 0.6.6 → 0.7.0

package/lib/hsbc.js.LICENSE.txt

@@ -11,27 +11,6 @@
  * @license  MIT
  */
 
-/*!
- * html2canvas 1.4.0 <https://html2canvas.hertzen.com>
- * Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>
- * Released under MIT License
- */
-
-/*! *****************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */
-
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 

package/package.json

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

package/packages/api/api.js

@@ -1,6 +1,26 @@
 import Server from './server';
 
 class API extends Server{
+  async sendEmail(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/sendEmail', 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 appGetUsername(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{

package/packages/common/websocket.js

@@ -3,6 +3,7 @@ import JKL from './JKL';
 
 let websock;
 let id;
+let fromHostName;
 const xmlLang = 'zh';
 const version = '1.0';
 let islogin = false;
@@ -36,6 +37,9 @@ function websocketonopen() { // 连接建立之后执行send方法发送数据
   // 发送建立流请求
   const steam = {
     open: {
+      // '-to': 'im.uat.dsp.hsbcfts.com.cn',
+      // '-from': `${'web'}@${'im.uat.dsp.hsbcfts.com.cn'}`,
+
       '-to': JSON.parse(window.sessionStorage.getItem('sigData')).hostname,
       '-from': `${JSON.parse(window.sessionStorage.getItem('sigData')).account}@${JSON.parse(window.sessionStorage.getItem('sigData')).hostname}`,
       '-xmlns': 'urn:ietf:params:xml:ns:xmpp-framing',
@@ -84,7 +88,8 @@ function websocketonmessage(e) {
   } else if (undefined != jsondata.open) {
     // 记录id
     id = jsondata.open['-id'];
-    console.log(id);
+    fromHostName = jsondata.open["-from"];
+    console.log('记录id',id,fromHostName);
   } else if (undefined != jsondata['stream:features']) {
     if (undefined != jsondata['stream:features'].mechanisms) {
       // 获取登录验证方式
@@ -159,7 +164,7 @@ function newopen() {
       '-xmlns': 'jabber:client',
       '-to': JSON.parse(window.sessionStorage.getItem('sigData')).hostname,
       '-version': version,
-      '-from': `${JSON.parse(window.sessionStorage.getItem('sigData')).account}@${JSON.parse(window.sessionStorage.getItem('sigData')).hostname}`,
+      '-from': JSON.parse(window.sessionStorage.getItem('sigData')).account + '@' + fromHostName,
       '-id': id,
       '-xml:lang': xmlLang,
     },
@@ -184,7 +189,9 @@ function bind() {
 function auth(val) {
   // Base64编码
   console.log('www');
-  const token = window.btoa(`${JSON.parse(window.sessionStorage.getItem('sigData')).account}@${JSON.parse(window.sessionStorage.getItem('sigData')).hostname}\0` + `${JSON.parse(window.sessionStorage.getItem('sigData')).openfireToken}`);
+  // const token = window.btoa('web'+'@'+ fromHostName+ '\0' + '123');
+
+  const token = window.btoa(JSON.parse(window.sessionStorage.getItem('sigData')).account + '@' + fromHostName + '\0' + JSON.parse(window.sessionStorage.getItem('sigData')).openfireToken);
   const message = {
     auth: {
       '-xmlns': 'urn:ietf:params:xml:ns:xmpp-sasl',

package/packages/pages/foot/foot.jsx

@@ -51,7 +51,7 @@ export default class foot extends Component {
           this.props.inspection()
       }
     render() {
-        const {clickedOcr,clickedFacial,isTranscribing,img,cameraImg,screenName,suspendName,customerList,menus} = this.props
+        const {clickedOcr,clickedFacial,isTranscribing,img,cameraImg,screenName,suspendName,customerList,menus,voiceName} = this.props
         const content = (
             <div>
               {customerList.map((item,index)=>{
@@ -137,7 +137,7 @@ export default class foot extends Component {
                         <div className="one">
                         <img className="imgClass" src={img} alt="" />
                         <div className="text">
-                            静音
+                            {voiceName}
                         </div>
                         </div>
                         

package/packages/pages/video/video.jsx

@@ -22,7 +22,6 @@ import 'antd/lib/spin/style'
 import { Button } from '../../../node_modules/antd/lib/index';
 import CanvasDraw from "react-canvas-draw";
 import { FormattedMessage, injectIntl } from 'react-intl';
-import html2canvas from 'html2canvas';
 import axios from 'axios';
 const LEAVE_TYPE = {
   TELLER_EXIT: 1, // 坐席退出
@@ -54,6 +53,7 @@ class Video extends Component {
     cameraImg: cameraImgOpen,
     voiceStatue: false,
     voiceImg: voiceImgOpen,
+    voiceName: '静音',
     isCustomer: false,
     publishDevic: 1,
     isSharedScreen: false,
@@ -179,6 +179,12 @@ class Video extends Component {
         appId: result.appId,
         bizName: result.bizName
       });
+      // const data1={
+      //   hostname: 'im.uat.dsp.hsbcfts.com.cn',
+      //   webPort: '443',
+      //   account: 'web',
+      //   openfireToken: '123'
+      // }
       window.sessionStorage.setItem('sigData', JSON.stringify(result));
       if (data.sigType == 1) {
         this.handleEdit()
@@ -191,6 +197,9 @@ class Video extends Component {
   handleEdit = () => {
     console.log(JSON.parse(window.sessionStorage.getItem('sigData')));
     // eslint-disable-next-line no-undef
+    // initWebSocket('wss://im.uat.dsp.hsbcfts.com.cn:443/wealth/im/ws/')
+    // initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + '15603' + '/ws/');
+
     initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + JSON.parse(window.sessionStorage.getItem('sigData')).webPort + '/ws/');
     const config_param = {};
     config_param.workspaceId = this.state.workSpaceId;
@@ -2201,7 +2210,8 @@ class Video extends Component {
       // 静音本地
       this.setState({
         voiceStatue: true,
-        voiceImg: voiceImgCloe
+        voiceImg: voiceImgCloe,
+        voiceName: '解除静音'
       });
       let sid = document.getElementById('publish_video1').name;
       if (!sid) {
@@ -2227,7 +2237,8 @@ class Video extends Component {
       // 打开本地
       this.setState({
         voiceStatue: false,
-        voiceImg: voiceImgOpen
+        voiceImg: voiceImgOpen,
+        voiceName: '静音'
       });
       let sid = document.getElementById('publish_video1').name;
       if (!sid) {
@@ -2387,7 +2398,8 @@ class Video extends Component {
       if (this.state.voiceStatue) {
         // 当前是音频
         this.setState({
-          voiceImg: voiceImgCloe
+          voiceImg: voiceImgCloe,
+          voiceName: '解除静音'
         });
         let sid = document.getElementById('publish_video1').name;
         if (!sid) {
@@ -2399,7 +2411,8 @@ class Video extends Component {
         // 当前是
         this.test_controller.SetLocalAudioEnable(1, parseInt(sid, 10));
         this.setState({
-          voiceImg: voiceImgOpen
+          voiceImg: voiceImgOpen,
+          voiceName: '静音'
         })
       }
       callNimIM('sendCustomCmdMsg', {
@@ -2497,7 +2510,10 @@ class Video extends Component {
   };
   invitationClick = () => {
     this.setState({
-      isModalVisibleInvitation: true
+      isModalVisibleInvitation: true,
+      employeeNumber: '',
+      employeeName: '',
+      employeeError: ''
     })
 
   }
@@ -2507,9 +2523,9 @@ class Video extends Component {
       return
     }
     try {
-      let result = await API.sendLink({
-        sessionId: this.state.sessionId,
-        userId: this.state.employeeNumber
+      let result = await API.sendEmail({
+        staffId: this.state.employeeNumber,
+        activityId: this.props.businessNumber
       });
       if (result.code == 200) {
         this.messageClick('发送成功','success')
@@ -2691,8 +2707,8 @@ class Video extends Component {
       console.log(result)
       if (result.code == 200) {
         this.setState({
-          employeeName: result.data.username,
-          employeeError: '',
+          employeeName: result.data.staffName,
+          employeeError: result.data.staffName ? '' : '查无此人',
         })
       } else {
         this.messageClick('查询失败','error')
@@ -2700,7 +2716,7 @@ class Video extends Component {
     } catch (err) {
       console.log(err)
       this.setState({
-        employeeError: '未搜索到相关信息'
+        employeeError: '查无此人'
       })
     }
   }
@@ -3344,6 +3360,7 @@ class Video extends Component {
           </div>
           </div>
           <Foot
+          voiceName={this.state.voiceName}
             img={this.state.voiceImg}
             screenName={this.state.screenName}
             suspendName={this.state.suspendName}
@@ -3368,7 +3385,7 @@ class Video extends Component {
             switchExternal={this.switchExternal}
             inspection={this.inspection}
           ></Foot>
-          <Modal key={Math.random()}  cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
+          <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
             onCancel={this.handleCancel}>
             {
               this.state.isSuspend && <span>确定是否恢复会话？</span>
@@ -3377,15 +3394,19 @@ class Video extends Component {
               !this.state.isSuspend && <span>确定是否暂停会话？</span>
             }
           </Modal>
-          <Modal key={Math.random()}   closable={false} centered={true} visible={this.state.isModalVisibleEnd} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelEnd}>取消</Button>,
+          <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} footer={[
+            <div key='end'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelEnd}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkEnd}>确定</Button>
+            </div>
           ]}>
             <div className='endModal'>确定是否结束会话？</div>
           </Modal>
-          <Modal key={Math.random()}  title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>,
+          <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
+            <div key='facial'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>确定</Button>
+            </div>
           ]}>
             <div className="faceBody">
               <img className="faceImg" src={this.state.facialImg} alt=""></img>
@@ -3398,9 +3419,11 @@ class Video extends Component {
             </div>
 
           </Modal> */}
-          <Modal key={Math.random()} className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>,
+          <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>
+            </div>
           ]}>
             <div>
               <div className="invitationDiv">
@@ -3420,9 +3443,11 @@ class Video extends Component {
             }
             
           </Modal>
-          <Modal key={Math.random()}  title="签字白板" closable={false} centered={true} visible={this.state.isModalVisibleSign} footer={
+          <Modal title="签字白板" closable={false} centered={true} visible={this.state.isModalVisibleSign} footer={
             [
+              <div key='okSign'>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSign}>确定</Button>
+              </div>
             ]
           }>
             <div className="content">
@@ -3437,9 +3462,11 @@ class Video extends Component {
               ></CanvasDraw>
             </div>
           </Modal>
-          <Modal key={Math.random()}  title="设备检测" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>,
+          <Modal title="设备检测" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
+             <div key='inspection'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInspection}>确定</Button>
+            </div>
           ]}>
             <div className="inspection">
               <div>摄像头设备：</div>

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