react_hsbc_teller 2.0.22 → 2.0.24

package/package.json

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

package/packages/pages/video/video.jsx

@@ -53,7 +53,7 @@ import Step from '../components/step/step.jsx'
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.22'
+const SDK_VERISON = '2.0.24'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -1703,22 +1703,23 @@ class Video extends Component {
           }
         }
       } else if (Mival.typeId == 10020) {
-        // 录制中断
-        this.messageClick('录制服务异常中断，请重试', 'error')
-        this.saveLog('recording error')
-        this.setState({
-          isRecordingeErrorModalVisible: true,
-          recordId: ''
-        })
-        // 循环播放录制中断语音
-        const loopPlay = () => {
-          if(!this.state.recordId && document.getElementById("publish_video1")){
-            let audio = new Audio(recordErrorAudio)
-            audio.play()
-            setTimeout(loopPlay, 3000);
-          }
-        }
-        setTimeout(loopPlay, 0);
+        // 录制中断（模拟测试）
+        // this.messageClick('双录异常中断，请重新开启', 'error')
+        // this.setState({
+        //   isRecordingeErrorModalVisible: true,
+        //   businessRecordId: '',
+        // })
+        // // 循环播放录制中断语音
+        // clearTimeout(this.recordLoopPlay)
+        // this.recordLoopPlay = () => {
+        //   console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
+        //   if(!this.state.businessRecordId && document.getElementById("publish_video1")){
+        //     let audio = new Audio(recordErrorAudio)
+        //     audio.play()
+        //     setTimeout(this.recordLoopPlay, 3000);
+        //   }
+        // }
+        // setTimeout(this.recordLoopPlay, 0);
 
       } else if (Mival.typeId == 33001 && this.state.sessionId == Mival.data.sessionId) {
         if (Mival.type == 1) {
@@ -2885,6 +2886,28 @@ class Video extends Component {
       msg
     ) => {
       console.log('服务端录制失败通知', recordId, feedId, code, msg)
+      this.saveLog(`recording error, recordId=${recordId}`)
+
+      // 如果在业务双录中，需要重新开启；如果是full录制出错，则不用处理
+      if (this.state.businessRecordId == recordId) {
+        // 录制中断
+        this.messageClick('双录异常中断，请重新开启', 'error')
+        this.setState({
+          isRecordingeErrorModalVisible: true,
+          businessRecordId: '',
+        })
+        // 循环播放录制中断语音
+        clearTimeout(this.recordLoopPlay)
+        this.recordLoopPlay = () => {
+          console.log('loop recordId', this.state.recordId, 'businessRecordId ', this.state.businessRecordId)
+          if(!this.state.businessRecordId && document.getElementById("publish_video1")){
+            let audio = new Audio(recordErrorAudio)
+            audio.play()
+            setTimeout(this.recordLoopPlay, 3000);
+          }
+        }
+        setTimeout(this.recordLoopPlay, 0);
+      }
     };
     // 停止浏览器录制成功回调
     this.test_controller.OnClientStopRecordSuccess = (
@@ -3298,6 +3321,7 @@ class Video extends Component {
         roomId: this.state.channelId + '',
         appId: this.state.appId,
         recordId: this.state.recordId,
+        customerId: this.props.customerId,
         type: type,
         status: status
       });
@@ -3328,6 +3352,7 @@ class Video extends Component {
         id: businessId,
         appId: this.state.appId,
         recordId: this.state.businessRecordId,
+        customerId: this.props.customerId,
         type: type,
         status: status
       });
@@ -3426,6 +3451,7 @@ class Video extends Component {
     }
     message.destroy()
     clearTimeout(this.loopPlay)
+    clearTimeout(this.recordLoopPlay)
     clearInterval(this.state.drawCanvasInterval)
     clearInterval(this.state.faceDetectionTimer);
     clearInterval(this.state.imageDetectionTimer);
@@ -3651,20 +3677,6 @@ class Video extends Component {
   }
   componentWillMount() {
     console.log('hsbc_teller_sdk', SDK_VERISON)
-    // window.document.startRecord = () => {
-    //   this.enableServerRecording();
-    // }
-    // window.document.stopRecord = (recordId) => {
-    //   this.test_controller.StopRemoteRecord(recordId || this.state.recordId)
-    // }
-    // window.document.detectNetworkWeak = () => {
-    //   console.log('detectNetworkWeak')
-    //   this.test_controller.detectNetworkWeak()        
-    // }
-    // window.document.start = () => {
-    //   this.startFaceDetection();
-    //   this.startImageDetection();
-    // }
     let arr = []
     for(let i=1;i<=12;i++){
       arr.push({
@@ -4005,8 +4017,8 @@ class Video extends Component {
     if (!this.state.isPictureInPicture) {
       this.pictureInPicture()
     }
-    this.saveLog('Start recording')
-    this.enableServerRecording()
+    this.saveLog('Start business recording')
+    this.enableServerRecording(this.state.businessId)
   }
   handleOk = () => {
     // 代表此时按钮是暂停会话，把isSuspend改成true变成恢复会话
@@ -6138,7 +6150,7 @@ class Video extends Component {
 
                         </ul>
                       </div>
-                      {!this.state.loading && this.state.sessionType && this.state.sessionId?
+                      {!this.state.loading && this.state.sessionType && this.state.sessionId && this.props.recordMode == 2?
                       <div className='QRCode'>
                         <QRCode
                             value={JSON.stringify({

package/packages/utils/utils.js

@@ -51,7 +51,7 @@ function debounce(fn, delay = 500) {
 }
 function isLight(src) {
   let gray = new cv.Mat() 
-  cv.cvtColor(src, gray, cv.COLOR_RGBA2RGB)
+  cv.cvtColor(src, gray, cv.COLOR_BGR2GRAY)
   let sum = 0;
   let avg = 0;
   let scalar = new cv.Scalar() 
@@ -59,15 +59,12 @@ function isLight(src) {
   let size = gray.rows * gray.cols;
   for (let i = 0; i < 256; i++)
       ls[i] = 0;
-      const data = gray.data;
-      // console.log(data)
 
   for (let i = 0; i < gray.rows; i++)
   {
       for (let j = 0; j < gray.cols; j++)
       {
-          const pos = i*gray.cols + j;
-          scalar = [data[pos*3], data[pos*3+1], data[pos*3+2]]
+          scalar = gray.ucharPtr(i, j);
           sum += (scalar[0] - 128);
           let x = scalar[0];
           ls[x]++;
@@ -78,7 +75,7 @@ function isLight(src) {
   let mean = 0;
   for (let i = 0; i < 256; i++)
   {
-      total +=  Math.abs(parseFloat(i - 128) - avg) * ls[i];
+      total +=  Math.abs((i - 128) - avg) * ls[i];
   }
   mean = total / size;
   let cast = Math.abs(avg / mean);