react_hsbc_teller 1.3.5 → 1.3.8

package/package.json

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

package/packages/api/api.js

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

package/packages/pages/video/video.jsx

@@ -257,6 +257,19 @@ class Video extends Component {
       
     }
   };
+  getBase64Image = async data => {
+    try {
+      let result = await API.getBase64Image({ fileName: data});
+      console.log('getBase64Image',result)
+      this.props.imgCallback({
+        type: result.data.type, 
+        file: result.data.fileName}
+        )
+    } catch (err) {
+      console.error(err);
+      
+    }
+  };
   /**
    * 初始化获取数据
    * @param  {JSON} data 数据类型
@@ -296,6 +309,7 @@ class Video extends Component {
     // initWebSocket('wss://im.uat.dsp.hsbcfts.com.cn:443/wealth/im/ws/')
     // initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + '15603' + '/ws/');
     if(!this.state.imStatus){
+      this.state.manualClose = false
       initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + JSON.parse(window.sessionStorage.getItem('sigData')).webPort + '/ws/');
 
     }
@@ -1427,6 +1441,8 @@ class Video extends Component {
             file: Mival.data.file}
             ) // 文字抄录和风险抄录，3--风险，，2--文字
         }
+      } else if (Mival.typeId == 1321) {
+        this.getBase64Image(Mival.fileName)
       } else if (Mival.typeId == 1216) {
         // 签字回调
         if (Mival.sessionId == this.state.sessionId) {
@@ -1872,6 +1888,13 @@ class Video extends Component {
         this.state.rtoken = '',
         this.state.sessionId = '',
         this.state.imRoomId = ''
+        this.state.imJoinRoom = false
+        if(this.state.imStatus) {
+          console.log('disconnect断开连接')
+          this.state.manualClose = true
+          this.state.imStatus = false
+          disconnect();
+        }
       this.test_controller.Disconnect()
       let data = {
         account: this.props.tellerAccount,
@@ -3993,7 +4016,7 @@ class Video extends Component {
     const top = document.getElementById("whiteboardDIV").getBoundingClientRect().top
     const bottom = document.getElementById("whiteboardDIV").getBoundingClientRect().bottom
     const width = (right - left)* window.screen.width / document.body.clientWidth
-    const height = ((bottom - top)* window.screen.width / document.body.clientWidth)
+    const height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 50
     const x = left * window.screen.width / document.body.clientWidth
     const y = top* window.screen.width / document.body.clientWidth
     canvas.width = 1280;
@@ -4011,7 +4034,7 @@ class Video extends Component {
             
             // console.log('addEventListener',x,y,width,height1,height)
             
-            cobj.drawImage(videoMedia, x, y, width, height, 0, 0,width, height);
+            cobj.drawImage(videoMedia, x, y, width, height, 0, 0,1280, 720);
               setTimeout(loop, 1000 / 10); // drawing at 30fps
           }
       }