react_hsbc_teller 1.3.6 → 1.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "1.3.6",
+  "version": "1.3.9",
   "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

@@ -38,6 +38,23 @@ let streamShare
 let muteJson = new Map()
 let dateTime = 0
 let messageValue = ''
+var os = function() {
+  var ua = navigator.userAgent,
+  isWindowsPhone = /(?:Windows Phone)/.test(ua),
+  isSymbian = /(?:SymbianOS)/.test(ua) || isWindowsPhone,
+  isAndroid = /(?:Android)/.test(ua),
+  isFireFox = /(?:Firefox)/.test(ua),
+  isChrome = /(?:Chrome|CriOS)/.test(ua),
+  isTablet = /(?:iPad|PlayBook)/.test(ua) || (isAndroid && !/(?:Mobile)/.test(ua)) || (isFireFox && /(?:Tablet)/.test(ua)),
+  isPhone = /(?:iPhone)/.test(ua) && !isTablet,
+  isPc = !isPhone && !isAndroid && !isSymbian;
+  return {
+  isTablet: isTablet,
+  isPhone: isPhone,
+  isAndroid: isAndroid,
+  isPc: isPc
+  };
+  }();
 message.config({
   getContainer: ()=>document.getElementById('allHSBC')
 })
@@ -257,6 +274,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.base64Image}
+        )
+    } catch (err) {
+      console.error(err);
+      
+    }
+  };
   /**
    * 初始化获取数据
    * @param  {JSON} data 数据类型
@@ -296,6 +326,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 +1458,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 +1905,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,
@@ -2710,7 +2750,7 @@ class Video extends Component {
     this.test_controller.OnStartRemoteRecordSucc = (record_id) => {
       console.log('开始服务端录制成功', record_id);
       this.state.recordId = record_id
-      this.videoRecordCallback('1')
+      this.videoRecordCallback('1',true)
     };
     // 开始服务端录制失败
     this.test_controller.OnStartRemoteRecordFailed = (
@@ -2718,12 +2758,13 @@ class Video extends Component {
       err_code,
       err_msg
     ) => {
+      this.videoRecordCallback('1',false)
       console.log('开始服务端录制失败', record_id, err_code, err_msg)
     };
     // 结束服务端录制成功
     this.test_controller.OnStopRemoteRecordSucc = (recordId) => {
       console.log('结束服务端录制成功', recordId);
-      this.videoRecordCallback('2')
+      this.videoRecordCallback('2',true)
       // this.endSessionValue()
       // 获取服务端录制结果
     };
@@ -2733,6 +2774,7 @@ class Video extends Component {
       err_code,
       err_msg
     ) => {
+      this.videoRecordCallback('2',false)
       console.log('结束服务端录制失败', recordId, err_code, err_msg)
     };
     // 开启浏览器录制成功
@@ -3046,12 +3088,13 @@ class Video extends Component {
       
     };
   }
-  videoRecordCallback = async(type)=>{
+  videoRecordCallback = async(type,status)=>{
     try {
       let result = await API.videoRecordCallback({
         activityId: this.props.businessNumber,
         sessionId: this.state.sessionId,
-        type: type
+        type: type,
+        status: status
       });
       console.log(result);
     } catch (err) {
@@ -3981,8 +4024,15 @@ class Video extends Component {
   handleCancelSign=()=>{
     this.signCanvas.current.clear()
   }
-
+  
   navigatorClick=()=>{
+    if(os.isAndroid || os.isPhone) {
+      console.log("手机")
+      } else if(os.isTablet) {
+        console.log("平板")
+      } else if(os.isPc) {
+        console.log("电脑")
+      }
     const that = this
     const publish_config = {};
     const canvas = document.createElement('canvas');
@@ -3992,10 +4042,22 @@ class Video extends Component {
     const right = document.getElementById("whiteboardDIV").getBoundingClientRect().right
     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) - 50
-    const x = left * window.screen.width / document.body.clientWidth
-    const y = top* window.screen.width / document.body.clientWidth
+    let width = 0
+    let height = 0
+    let x = 0
+    let y = 0
+    if(os.isTablet){
+      width = (right - left)* window.screen.width / document.body.clientWidth
+      height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 50
+      x = left * window.screen.width / document.body.clientWidth
+      y = top* window.screen.width / document.body.clientWidth
+    }
+    if(os.isPc) {
+      width = right - left
+      height = bottom - top
+      x = left
+      y = top
+    }
     canvas.width = 1280;
     canvas.height = 720;
     cobj.fillStyle = 'rgb(255 255 255)'
@@ -4011,7 +4073,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
           }
       }
@@ -4051,12 +4113,23 @@ class Video extends Component {
       streamShare = ''
     }
     videoMedia.srcObject = stream;
-    stream.getVideoTracks()[0].applyConstraints({
-      // width: document.body.clientWidth,
-      // height: document.body.clientHeight
-      width: window.screen.width,
-      height: window.screen.height
-    })
+    if(os.isTablet){
+      stream.getVideoTracks()[0].applyConstraints({
+        // width: document.body.clientWidth,
+        // height: document.body.clientHeight
+        width: window.screen.width,
+        height: window.screen.height
+      })
+    }
+    if(os.isPc) {
+      stream.getVideoTracks()[0].applyConstraints({
+        width: document.body.clientWidth,
+        height: document.body.clientHeight - 50
+        // width: window.screen.width,
+        // height: window.screen.height
+      })
+    }
+    
     streamShare = stream
     stream.getVideoTracks()[0].onended = async ()=>{
       //单击停止共享按钮后，触发这个事件