react_hsbc_teller 0.1.5 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",
@@ -84,6 +84,7 @@
     "webpackbar": "^4.0.0"
   },
   "dependencies": {
+    "@babel/plugin-proposal-decorators": "^7.16.4",
     "antd": "^4.16.13",
     "axios": "0.19.0",
     "react": "^17.0.1",

package/packages/envconfig/envconfig.js

@@ -4,9 +4,9 @@
 let baseURL; 
 // let imgUrl = '//elm.cangdu.org/img/';
 if(process.env.NODE_ENV === 'development'){
-  baseURL = 'http://47.102.126.132:8082/api/leimon-counter-api';
+  baseURL = 'https://counter-web.leimondata.cn:18082/api/leimon-counter-api';
 }else{
-  baseURL = 'http://47.102.126.132:8082/api/leimon-counter-api';
+  baseURL = 'https://counter-web.leimondata.cn:18082/api/leimon-counter-api';
 }
 
 

package/packages/pages/foot/foot.jsx

@@ -45,9 +45,7 @@ export default class foot extends Component {
     }
     customerFaceClick=(item)=>{
         this.setState({
-            clicked: false
-        })
-        this.setState({
+            clicked: false,
             clickedOcr: false
         })
         this.props.customerFaceClick(item)
@@ -88,7 +86,7 @@ export default class foot extends Component {
                         <div className="one" onClick={this.transcribingClick.bind(this)}>
                         <img src={require("../../assets/img/icon_copy.png").default} alt="" />
                         <div className="text">
-                            抄录
+                            签字
                         </div>
                     </div>
                     }

package/packages/pages/index.jsx

@@ -5,7 +5,10 @@ import { IntlProvider  } from 'react-intl';
 
 class Main extends Component {
   state = {
-    langPackage: {}
+    langPackage: {
+      en: {},
+      zh: {},
+    }
   };
 
   // 获取语言包
@@ -22,12 +25,16 @@ class Main extends Component {
   }
   componentWillMount() {
     localStorage.setItem("a_lang", this.props.lang)
-    this.setState({langPackage: JSON.parse(localStorage.getItem("langData"))})
+    if (localStorage.getItem("langData")){
+      this.setState({langPackage: JSON.parse(localStorage.getItem("langData"))})
+    }
+    // console.log(JSON.parse(localStorage.getItem("langData")))
     this.updateLanguage()
   }
 
   render() {
     const lang = this.props.lang
+    // console.log(this.state.langPackage[lang])
     return (
       <IntlProvider locale={lang} messages={this.state.langPackage[lang]}>
         <Video {...this.props}></Video>

package/packages/pages/video/video.jsx

@@ -16,6 +16,8 @@ import Modal from "antd/lib/modal";
 import 'antd/lib/modal/style'
 import message from "antd/lib/message";
 import 'antd/lib/message/style'
+import Spin from "antd/lib/spin";
+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';
@@ -23,12 +25,12 @@ const LEAVE_TYPE = {
   TELLER_EXIT: '1', // 坐席退出
   ROOM_DESTROYED: '-1', // 房间异常
 }
-
+@injectIntl
 class Video extends Component {
   signCanvas = React.createRef();
   state = {
+    loading: false,
     isModalVisibleSign: false,
-    signData: {},
     titleModal: '人脸识别',
     faceCustomerType: 1, // 1无感人脸，2ocr
     faceCustomerUid: '',
@@ -36,8 +38,6 @@ class Video extends Component {
     employeeNumber: '',
     employeeName: '',
     isModalVisibleInvitation: false,
-    isTranscribing: false,
-    transcribingData: '',
     isPDF: false,
     roomCustomerList: [],
     facialImg: '',
@@ -86,9 +86,7 @@ class Video extends Component {
       });
       console.log(result);
       this.setState({
-        imRoomId: result.imRoomId
-      });
-      this.setState({
+        imRoomId: result.imRoomId,
         sessionId: result.sessionId
       });
       // eslint-disable-next-line no-undef
@@ -108,15 +106,8 @@ class Video extends Component {
       console.log(result);
       window.sessionStorage.setItem('alimpassSig', result.mpsSig);
       this.setState({
-        workSpaceId: result.workSpaceId
-      });
-      this.setState({
-        appId: result.appId
-      });
-      this.setState({
-        bizName: result.bizName
-      });
-      this.setState({
+        workSpaceId: result.workSpaceId,
+        appId: result.appId,
         bizName: result.bizName
       });
       window.sessionStorage.setItem('sigData', JSON.stringify(result));
@@ -379,18 +370,14 @@ class Video extends Component {
   // 人脸识别
   facialRecognition = () => {
     this.setState({
-      faceCustomerType: 1
-    })
-    this.setState({
+      faceCustomerType: 1,
       titleModal: '人脸识别'
     })
     this.selectCustomer()
   };
   ocrClick = () => {
     this.setState({
-      faceCustomerType: 2
-    })
-    this.setState({
+      faceCustomerType: 2,
       titleModal: 'OCR识别'
     })
     this.selectCustomer()
@@ -527,22 +514,6 @@ class Video extends Component {
         if (Mival.sessionId == this.state.sessionId) {
           this.endSession('customerHangUp')
         }
-      } else if (Mival.typeId == 1214) {
-        console.log(Mival);
-        if (Mival.sessionId == this.state.sessionId) {
-          this.setState({
-            transcribingData: Mival
-          });
-          this.setState({
-            isTranscribing: true
-          })
-        }
-
-      } else if (Mival.typeId == 1216) {
-        this.setState({
-          signData: Mival.callbackUrl,
-          isModalVisibleSign: true
-        })
       }
     };
 
@@ -646,8 +617,10 @@ class Video extends Component {
 
     this.test_controller.OnCreateRoomSucc = (room_id, rtoken) => {
       console.log('创建房间成功', room_id, rtoken);
-      this.setState({ channelId: room_id });
-      this.setState({ rtoken: rtoken });
+      this.setState({ 
+        channelId: room_id,
+        rtoken: rtoken
+      });
       this.createRoom()
     };
     // 创建房间失败
@@ -927,16 +900,12 @@ class Video extends Component {
           })
         });
         this.setState({
-          isSharedScreen: true
-        });
-        this.setState({
+          isSharedScreen: true,
           screenName: '取消共享'
-        })
-      } else {
-        this.setState({
-          isSharedScreen: false
         });
+      } else {
         this.setState({
+          isSharedScreen: false,
           screenName: '投屏'
         });
         callNimIM('sendCustomCmdMsg', {
@@ -1115,36 +1084,37 @@ class Video extends Component {
     }
   }
   addToScript = () => {
+    this.setState({
+      loading: true,
+    })
     const _dependScripts = [
-      "http://dns.leimon.xyz/log4b.js",
-      "http://dns.leimon.xyz/meeting_api_util.js",
-      "http://dns.leimon.xyz/mcu.js",
-      "http://dns.leimon.xyz/client_record.js",
-      "http://dns.leimon.xyz/meeting_vod.js",
-      "http://dns.leimon.xyz/remote_record.js",
-      "http://dns.leimon.xyz/meeting_invite.js",
-      "http://dns.leimon.xyz/meeting_im.js",
-      "http://dns.leimon.xyz/meeting_camera_stream.js",
-      "http://dns.leimon.xyz/meeting_file_stream.js",
-      "http://dns.leimon.xyz/meeting_desk_stream.js",
-      "http://dns.leimon.xyz/meeting_html_stream.js",
-      "http://dns.leimon.xyz/meeting_beautify_stream.js",
-      "http://dns.leimon.xyz/stream.js",
-      "http://dns.leimon.xyz/room.js",
-      "http://dns.leimon.xyz/backgroundBlur.js",
-      "http://dns.leimon.xyz/meeting_api.js",
-      "http://dns.leimon.xyz/html2image.js",
-      "http://dns.leimon.xyz/reconnecting-websocket.min.js",
-      "http://dns.leimon.xyz/mtc_api.js",
-      "http://dns.leimon.xyz/BandwidthHandler.js",
+      "https://counter-web.leimondata.cn:7199/log4b.js",
+      "https://counter-web.leimondata.cn:7199/meeting_api_util.js",
+      "https://counter-web.leimondata.cn:7199/mcu.js",
+      "https://counter-web.leimondata.cn:7199/client_record.js",
+      "https://counter-web.leimondata.cn:7199/meeting_vod.js",
+      "https://counter-web.leimondata.cn:7199/remote_record.js",
+      "https://counter-web.leimondata.cn:7199/meeting_invite.js",
+      "https://counter-web.leimondata.cn:7199/meeting_im.js",
+      "https://counter-web.leimondata.cn:7199/meeting_camera_stream.js",
+      "https://counter-web.leimondata.cn:7199/meeting_file_stream.js",
+      "https://counter-web.leimondata.cn:7199/meeting_desk_stream.js",
+      "https://counter-web.leimondata.cn:7199/meeting_html_stream.js",
+      "https://counter-web.leimondata.cn:7199/meeting_beautify_stream.js",
+      "https://counter-web.leimondata.cn:7199/stream.js",
+      "https://counter-web.leimondata.cn:7199/room.js",
+      "https://counter-web.leimondata.cn:7199/backgroundBlur.js",
+      "https://counter-web.leimondata.cn:7199/meeting_api.js",
+      "https://counter-web.leimondata.cn:7199/html2image.js",
+      "https://counter-web.leimondata.cn:7199/reconnecting-websocket.min.js",
+      "https://counter-web.leimondata.cn:7199/mtc_api.js",
+      "https://counter-web.leimondata.cn:7199/BandwidthHandler.js",
       "https://gw.alipayobjects.com/os/lib/recordrtc/5.5.9/RecordRTC.min.js",
-      "https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@1.2",
-      "https://cdn.jsdelivr.net/npm/@tensorflow-models/body-pix@2.0",
-      "http://dns.leimon.xyz/pdf.js",
-      "http://dns.leimon.xyz/EBML.js",
-      "http://dns.leimon.xyz/adapter.js",
-      "http://dns.leimon.xyz/beauty.js",
-      "http://dns.leimon.xyz/getMediaInfo.js",
+      "https://counter-web.leimondata.cn:7199/pdf.js",
+      "https://counter-web.leimondata.cn:7199/EBML.js",
+      "https://counter-web.leimondata.cn:7199/adapter.js",
+      "https://counter-web.leimondata.cn:7199/beauty.js",
+      "https://counter-web.leimondata.cn:7199/getMediaInfo.js",
     ]
     const that = this
     let i = 0
@@ -1168,6 +1138,9 @@ class Video extends Component {
             script.onload = () => {
               that.test_controller = new McuController();
               that.mountClick()
+              that.setState({
+                loading: false,
+              })
             }
           }
         } else {
@@ -1208,9 +1181,7 @@ class Video extends Component {
     if (!this.state.voiceStatue) {
       // 静音本地
       this.setState({
-        voiceStatue: true
-      });
-      this.setState({
+        voiceStatue: true,
         voiceImg: voiceImgCloe
       });
       let sid = document.getElementById('publish_video1').name;
@@ -1232,9 +1203,7 @@ class Video extends Component {
     } else if (this.state.voiceStatue) {
       // 打开本地
       this.setState({
-        voiceStatue: false
-      });
-      this.setState({
+        voiceStatue: false,
         voiceImg: voiceImgOpen
       });
       let sid = document.getElementById('publish_video1').name;
@@ -1270,9 +1239,7 @@ class Video extends Component {
     if (this.isFileSuccuse()) {
       if (!this.state.audioed) {
         this.setState({
-          audioed: true
-        });
-        this.setState({
+          audioed: true,
           cameraImg: cameraImgCloe
         });
         let sid = document.getElementById('publish_video1').name;
@@ -1294,9 +1261,7 @@ class Video extends Component {
         })
       } else if (this.state.audioed) {
         this.setState({
-          audioed: false
-        });
-        this.setState({
+          audioed: false,
           cameraImg: cameraImgOpen
         });
         let sid = document.getElementById('publish_video1').name;
@@ -1329,14 +1294,10 @@ class Video extends Component {
         publish_config.video_profile_type = 5;
         this.test_controller.ChangeMediaStream(publish_config);
         this.setState({
-          publishDevic: 1
-        });
-        this.setState({
+          publishDevic: 1,
+          isSharedScreen: false,
           screenName: '投屏'
         });
-        this.setState({
-          isSharedScreen: false
-        })
       } else {
         publish_config.media_type = 1;
         publish_config.publish_device = 2;
@@ -1353,9 +1314,7 @@ class Video extends Component {
     if (this.state.isSuspend) {
       // 代表此时按钮是恢复会话，把isSuspend改成true变成暂停会话
       this.setState({
-        isSuspend: false
-      });
-      this.setState({
+        isSuspend: false,
         suspendName: '暂停'
       });
       let sid = document.getElementById('publish_video1').name;
@@ -1414,9 +1373,7 @@ class Video extends Component {
       console.log(data)
     });
     this.setState({
-      isSuspend: true
-    });
-    this.setState({
+      isSuspend: true,
       suspendName: '恢复'
     });
     callNimIM('sendCustomCmdMsg', {
@@ -1472,10 +1429,10 @@ class Video extends Component {
       isModalVisibleFacial: false
     })
   };
+  // 坐席签字
   transcribingClick = () => {
-    callNimIM('sendCustomCmdMsg', {
-      customId: this.state.imRoomId,
-      content: JSON.stringify(this.state.transcribingData)
+    this.setState({
+      isModalVisibleSign: true,
     })
   };
   invitationClick = () => {
@@ -1530,20 +1487,18 @@ class Video extends Component {
     }
     console.log(sid)
     this.setState({
-      faceCustomerUid: item.customId
-    })
-    this.setState({
-      isModalVisibleFacial: true
-    })
-    this.setState({
+      faceCustomerUid: item.customId,
+      isModalVisibleFacial: true,
       facialImg: this.test_controller.TakePicture(1, undefined, undefined, sid, 'png')
     })
   }
   componentWillReceiveProps(props) {
-    this.setState({ channelId: props.roomId });
-    this.setState({ rtoken: props.mtoken });
-    this.setState({ sessionId: props.sessionId });
-    this.setState({ imRoomId: props.imRoomId });
+    this.setState({ 
+      channelId: props.roomId,
+      rtoken: props.mtoken,
+      sessionId: props.sessionId,
+      imRoomId: props.imRoomId
+    });
   }
   queryStaff = async () => {
     try {
@@ -1566,7 +1521,6 @@ class Video extends Component {
     try {
       let result = await API.counterSign({
         sessionId: this.state.sessionId,
-        callbackUrl: this.state.signData,
         file: data.file
       });
       console.log(result)
@@ -1574,7 +1528,6 @@ class Video extends Component {
         message.success('签字成功')
         this.setState({
           isModalVisibleSign: false,
-          signData: ''
         })
       } else {
         message.success('签字失败')
@@ -1591,7 +1544,9 @@ class Video extends Component {
   render() {
 
     return (
+      
       <div className="all">
+        <Spin spinning={this.state.loading} tip="视频初始化中...">
         <Header></Header>
         <div className="health">
           <div className="wrapper">
@@ -1736,7 +1691,6 @@ class Video extends Component {
           screenName={this.state.screenName}
           suspendName={this.state.suspendName}
           cameraImg={this.state.cameraImg}
-          isTranscribing={this.state.isTranscribing}
           customerList={this.state.customerList}
           suspend={this.suspend}
           voice={this.voice}
@@ -1805,8 +1759,9 @@ class Video extends Component {
         <video className="mixedvideo" id="mixedvideo" autoPlay muted={true} width="0" height="0"
           webkit-playsinline="true" playsInline={true} x5-playsinline="x5-playsinline"
           x-webkit-airplay="true"></video>
-
+          </Spin>
       </div>
+      
     );
   }
 }
@@ -1816,4 +1771,4 @@ Video.defaultProps = {
   callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
 
 }
-export default injectIntl(Video);
+export default Video

package/packages/pages/video/video.less

@@ -77,7 +77,7 @@
 }
 .health{
   margin: 20px;
-  height: calc(100vh - 15px);
+  height: calc(100vh - 5px);
 }
 .all{
   height: 100%;

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+      "experimentalDecorators": true,
       "outDir": "./dist/",
       "sourceMap": true,
       "noImplicitAny": true,