react_hsbc_teller 2.0.78 → 2.0.80

package/package.json

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

package/packages/pages/video/video.jsx

@@ -25,7 +25,7 @@ import { Button } from '../../../node_modules/antd/lib/index';
 import Slider from 'antd/lib/slider';
 import 'antd/lib/slider/style'
 import './video.less'
-import { compressImage, isLight, saveBase64Image, combineBase64Images } from '../../utils/utils'
+import { compressImage, isLight, saveBase64Image, combineBase64Images, dateTime } from '../../utils/utils'
 import Recorder from "js-audio-recorder";
 import MyAsrController from '../../utils/asrController'
 import Header from '../header/header.jsx'
@@ -64,7 +64,8 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.78'
+
+const SDK_VERISON = '2.0.80'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -724,7 +725,7 @@ class Video extends Component {
           height: (420 * SCALE)
         })
         // 开启业务录制的时候type传值，在后面加标识，全局的不加
-      const filePath = 'recordId_' + new Date().valueOf() + type;
+      const filePath = 'recordId_' + this.props.tellerAccount + new Date().valueOf() + type;
       const recordParam = {};
       recordParam.width = 1280 * SCALE;
       recordParam.height = 720 * SCALE;
@@ -872,7 +873,7 @@ class Video extends Component {
           height: (420 * SCALE)
         })
         // 开启业务录制的时候type传值，在后面加标识，全局的不加
-      const filePath = type ? ('recordId_' + new Date().valueOf() + '_business') : ('recordId_' + new Date().valueOf());
+      const filePath = type ? ('recordId_' + this.props.tellerAccount + new Date().valueOf() + '_business') : ('recordId_' + this.props.tellerAccount + new Date().valueOf());
       const recordParam = {};
       recordParam.width = 1280 * SCALE;
       recordParam.height = 720 * SCALE;
@@ -915,7 +916,7 @@ class Video extends Component {
   // 开启ipad录制
   enableIpadRecording = (record_business_id) => {
     const that = this
-    const filePath = 'recordId_' + new Date().valueOf() + '_ipad';
+    const filePath = 'recordId_' + this.props.tellerAccount + new Date().valueOf() + '_ipad';
       const recordParam = {};
       recordParam.width = 1280;
       recordParam.height = 720;
@@ -2636,6 +2637,26 @@ class Video extends Component {
         }
       }
     };
+    this.test_controller.OnSignalDisconnected = () => {
+      // 30001每次⽹络请求都会打印log，但是30001断开期间此回调只会执⾏⼀次
+      let time = 1000 * (this.props.signalDisconnectedTime ? this.props.signalDisconnectedTime : 20)
+      console.log('OnSignalDisconnected', this.props.signalDisconnectedTime, dateTime(), time)
+      this.saveLog('OnSignalDisconnected, signalDisconnectedTime' + this.props.signalDisconnectedTime + 's, date=' + dateTime())
+      this.signalDisconnectedSetTimeout = setTimeout(signalDisconnectedMethod, time);
+    }
+    this.test_controller.OnSignalConnected = () => {
+      // 重连成功
+      console.log('OnSignalConnected')
+      this.saveLog('OnSignalConnected, signalDisconnectedTime' + this.props.signalDisconnectedTime + 's, date=' + dateTime())
+      clearTimeout(this.signalDisconnectedSetTimeout)
+    }
+    const signalDisconnectedMethod = () => {
+      console.log('OnSignalDisconnected', this.props.signalDisconnectedTime, dateTime())
+      this.setState({
+        transcribeErrorCode: 30001,
+        transcribeErrorModalVisible: true
+      })
+    }
     // 加入房间成功
     this.test_controller.OnJoinRoomSucc = () => {
       console.log('加入房间成功')
@@ -8193,6 +8214,7 @@ Video.defaultProps = {
   echoCancellation: true,
   noiseSuppression: true,
   needPreSale: true, // 是否开启音频录制 默认true--只控制售前full
+  signalDisconnectedTime: 20, // 网络异常断开多久后异常弹窗提示
   logUrl: 'http://hsbc.cn-shanghai.log.aliyuncs.com/logstores/hsbc/track?APIVersion=0.6.0&app=meeting-ui',
   internalUrl: 'https://wp-staff-gateway.wealth-platform.uat.ali.cloud.cn.hsbc/meeting-ui/OHB/CN/HSBC?chnlID=OHB&locale=zh_CN&chnlCC=CN&chnlGMC=HSBC&targetFunc=supervisorMeeting&sourceFunc=rmMeeting'
 }

package/packages/utils/utils.js

@@ -1,81 +1,78 @@
 function compressImage(base64, callback) {
   var targSize = 1024 * 1024 * 1.45 //1024KB  
   if (base64.length <= targSize) {
-      callback(base64);
-      // console.log("直接返回")
-      return
+    callback(base64);
+    // console.log("直接返回")
+    return
   }
   var newImage = new Image();
   newImage.src = base64;
-  console.log('压缩前'+base64.length)
+  console.log('压缩前' + base64.length)
   newImage.setAttribute("crossOrigin", 'Anonymous'); //url为外域时需要  
   newImage.onload = function () {
-      var quality = 0.95; //压缩系数0-1之间
-      var canvas = document.createElement("canvas");
-      var ctx = canvas.getContext("2d");
-      canvas.width = 720
-      canvas.height = 405
-      ctx.clearRect(0, 0, canvas.width, canvas.height);
-      ctx.drawImage(newImage, 0, 0, canvas.width, canvas.height);
-      var base64 = canvas.toDataURL("image/png", quality); //压缩语句
-      // 如想确保图片压缩到自己想要的尺寸,如要求在5-10kb之间，请加以下语句，quality初始值根据情况自定
-      // console.log(base64.length + "循环1压缩" + (base64.length / 1024 > 512))
-      
-      // while (base64.length > targSize) {
-      //     quality -= 0.03;
-      //     // console.log(base64.length + "循环压缩" + quality)
-      //     base64 = canvas.toDataURL("image/png", quality);
-      // }
-      console.log('压缩后'+base64.length)
-      callback(base64); //必须通过回调函数返回，否则无法及时拿到该值
+    var quality = 0.95; //压缩系数0-1之间
+    var canvas = document.createElement("canvas");
+    var ctx = canvas.getContext("2d");
+    canvas.width = 720
+    canvas.height = 405
+    ctx.clearRect(0, 0, canvas.width, canvas.height);
+    ctx.drawImage(newImage, 0, 0, canvas.width, canvas.height);
+    var base64 = canvas.toDataURL("image/png", quality); //压缩语句
+    // 如想确保图片压缩到自己想要的尺寸,如要求在5-10kb之间，请加以下语句，quality初始值根据情况自定
+    // console.log(base64.length + "循环1压缩" + (base64.length / 1024 > 512))
+
+    // while (base64.length > targSize) {
+    //     quality -= 0.03;
+    //     // console.log(base64.length + "循环压缩" + quality)
+    //     base64 = canvas.toDataURL("image/png", quality);
+    // }
+    console.log('压缩后' + base64.length)
+    callback(base64); //必须通过回调函数返回，否则无法及时拿到该值
   }
 }
 function debounce(fn, delay = 500) {
   // 是闭包中的
   let timer
-  
+
   // input事件调用的函数，相当于obj调用函数 this指向Input
-  return function() {
-     // 这个if 判断不做也没关系，判断了（除第一次非空的情况）也就是执行从第二次开始，在延迟时间内多次触发才会走该判断
-     if(timer) {clearTimeout(timer)}
-     // 此时的箭头函数的this 和 arguments 都是从外部函数继承而来
-     // 如果用普通函数就要用词法作用域 var tshat = this var arg = arguments
-     timer = setTimeout(() =>{
-        // 使得传入的回调函数的this 指向Input这个元素对象
-        // arguments是该事件的详情，可以获得该函数被调用时的所有参数,是一个event 对象（所有Dom事件都会传event对象进入）
-        // 直接使用 fn() 问题也不大
-        fn.apply(this,arguments) 
-        timer = null
-     },delay)
- }
+  return function () {
+    // 这个if 判断不做也没关系，判断了（除第一次非空的情况）也就是执行从第二次开始，在延迟时间内多次触发才会走该判断
+    if (timer) { clearTimeout(timer) }
+    // 此时的箭头函数的this 和 arguments 都是从外部函数继承而来
+    // 如果用普通函数就要用词法作用域 var tshat = this var arg = arguments
+    timer = setTimeout(() => {
+      // 使得传入的回调函数的this 指向Input这个元素对象
+      // arguments是该事件的详情，可以获得该函数被调用时的所有参数,是一个event 对象（所有Dom事件都会传event对象进入）
+      // 直接使用 fn() 问题也不大
+      fn.apply(this, arguments)
+      timer = null
+    }, delay)
+  }
 }
 function isLight(src, sensitivity = 1) {
-  let gray = new cv.Mat() 
+  let gray = new cv.Mat()
   cv.cvtColor(src, gray, cv.COLOR_BGR2GRAY)
   let sum = 0;
   let avg = 0;
-  let scalar = new cv.Scalar() 
+  let scalar = new cv.Scalar()
   let ls = new Array();
   let size = gray.rows * gray.cols;
   for (let i = 0; i < 256; i++)
-      ls[i] = 0;
-
-  for (let i = 0; i < gray.rows; i++)
-  {
-      for (let j = 0; j < gray.cols; j++)
-      {
-          scalar = gray.ucharPtr(i, j);
-          sum += (scalar[0] - 128);
-          let x = scalar[0];
-          ls[x]++;
-      }
+    ls[i] = 0;
+
+  for (let i = 0; i < gray.rows; i++) {
+    for (let j = 0; j < gray.cols; j++) {
+      scalar = gray.ucharPtr(i, j);
+      sum += (scalar[0] - 128);
+      let x = scalar[0];
+      ls[x]++;
+    }
   }
   avg = sum / size;
   let total = 0;
   let mean = 0;
-  for (let i = 0; i < 256; i++)
-  {
-      total +=  Math.abs((i - 128) - avg) * ls[i];
+  for (let i = 0; i < 256; i++) {
+    total += Math.abs((i - 128) - avg) * ls[i];
   }
   mean = total / size;
   let cast = Math.abs(avg / mean);
@@ -93,27 +90,24 @@ function isLight(src, sensitivity = 1) {
   }
 
   //std::cout <<  "亮度异常值:" << cast << std::endl;
-  if (cast * sensitivity > 1)
-  {
-      if (avg > 0)
-      {
-        console.log('亮度异常 过亮:')
-          //std::cout << "亮度异常 过亮" << avg << std::endl;
-          return 1;
-      }
-      else {
-        console.log('亮度异常 过暗')
-          //std::cout << "亮度异常 过暗" << avg << std::endl;
-          return -1;
-      }
+  if (cast * sensitivity > 1) {
+    if (avg > 0) {
+      console.log('亮度异常 过亮:')
+      //std::cout << "亮度异常 过亮" << avg << std::endl;
+      return 1;
+    }
+    else {
+      console.log('亮度异常 过暗')
+      //std::cout << "亮度异常 过暗" << avg << std::endl;
+      return -1;
+    }
   }
-  else
-  {
+  else {
     console.log('亮度正常')
-      //std::cout << "normal" << std::endl;
-      return 0;
+    //std::cout << "normal" << std::endl;
+    return 0;
   }
-  
+
 }
 
 function combineBase64Images(image1, image2, callback) {
@@ -121,33 +115,33 @@ function combineBase64Images(image1, image2, callback) {
   // 创建Canvas元素
   var canvas = document.createElement('canvas');
   var ctx = canvas.getContext('2d');
- 
+
   // 加载第一张图片
   var img1 = new Image();
-  img1.onload = function() {
- 
+  img1.onload = function () {
+
     // 加载第二张图片
     var img2 = new Image();
-    img2.onload = function() {
+    img2.onload = function () {
 
       // 设置Canvas的宽度和高度
       const imageWidth = 1280;
       const imageHeight = 720;
-      canvas.width = imageWidth ; // 不压缩的话是 1280 x 720 
+      canvas.width = imageWidth; // 不压缩的话是 1280 x 720 
       canvas.height = imageHeight * 2;
 
       console.log(img1.width, img1.height)
       console.log(img2.width, img2.height)
-  
+
       // 绘制第一张图片
       ctx.drawImage(img1, 0, 0, imageWidth, imageHeight);
       // 绘制第二张图片在第一张图片下方
       ctx.drawImage(img2, 0, imageHeight, imageWidth, imageHeight);
 
- 
+
       // 导出拼接后的图片为base64
       var combinedImageData = canvas.toDataURL('image/png');
-      
+
       // 执行回调函数，返回base64字符串
       callback(combinedImageData);
       console.log(combinedImageData)
@@ -156,7 +150,7 @@ function combineBase64Images(image1, image2, callback) {
     img2.src = image2;
   };
   img1.src = image1;
- 
+
 }
 
 function saveBase64Image(base64Data, fileName) {
@@ -168,7 +162,7 @@ function saveBase64Image(base64Data, fileName) {
   let u8arr = new Uint8Array(n);
 
   while (n--) {
-      u8arr[n] = bstr.charCodeAt(n);
+    u8arr[n] = bstr.charCodeAt(n);
   }
 
   let blob = new Blob([u8arr], { type: mime });
@@ -189,11 +183,28 @@ function saveBase64Image(base64Data, fileName) {
   document.body.removeChild(link);
   URL.revokeObjectURL(url);
 }
-
+function dateTime() {
+  // 创建一个Date对象
+  const now = new Date();
+
+  // 获取年月日时分秒
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以要加1，并且可能需要补0
+  const day = String(now.getDate()).padStart(2, '0'); // 日期补0
+  const hours = String(now.getHours()).padStart(2, '0'); // 小时补0
+  const minutes = String(now.getMinutes()).padStart(2, '0'); // 分钟补0
+  const seconds = String(now.getSeconds()).padStart(2, '0'); // 秒数补0
+
+  // 格式化输出
+  const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  console.log(formattedDate);
+  return formattedDate;
+}
 export {
   compressImage,
   debounce,
   isLight,
   combineBase64Images,
-  saveBase64Image
+  saveBase64Image,
+  dateTime
 }