react_hsbc_teller 2.0.21 → 2.0.23

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -167,7 +167,7 @@ export default class foot extends Component {
                               item == 'PIP' && <div className="one" onClick={this.pictureInPicture.bind(this)}>
                                   <img className="imgClass" src={require("../../assets/img/huazhonghua.png").default} alt="" />
                                   <div className="text">
-                                  开启视频画中画
+                                  开启视频浮窗
                                   </div>
                               </div>
                       }

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.21'
+const SDK_VERISON = '2.0.23'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -82,6 +82,7 @@ let worker
 let streamShare
 let streamRecord
 let videoName
+let lastFaceNum = 1
 let muteJson = new Map()
 // let dateTime = 0
 let messageValue = ''
@@ -1776,18 +1777,24 @@ class Video extends Component {
             recordId: this.state.recordId,
             base64Image: path.replace('data:image/png;base64,', '')
           });
+          const changeNum = lastFaceNum - result.faceNum
           if (result.faceNum == 0) {
             // 人脸出框
             this.messageClick('检测到您的人脸已出框', 'error')
-            // 打点
             this.saveVideoPoint('ffd', 'RM端人脸离框');
+          } else if (lastFaceNum == 0 && result.faceNum == 1) { 
+            // 0->1不需要提示
+          } else if (changeNum != 0) {
+            this.messageClick('检测到参会人员数量发生变化', 'error')
+            this.saveVideoPoint('fcd', 'RM端人脸数量发生变化');
           }
+          lastFaceNum = result.faceNum;
         } catch (err) {
           console.error(err);
           if (err.status == 502 || err.status == 404) {
           }
         }
-    }, 5000);
+    }, this.props.faceDetectInterval * 1000);
 
     this.state.faceDetectionTimer = timer;
   }
@@ -1812,7 +1819,7 @@ class Video extends Component {
         // let end = new Date().getTime()
         // console.log('执行时间(s) ', (end - start)/1000 )
       }
-    }, 3000);
+    }, this.props.lightDetectInterval * 1000);
 
     this.state.imageDetectionTimer = timer;
   }
@@ -3291,6 +3298,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
       });
@@ -3321,6 +3329,7 @@ class Video extends Component {
         id: businessId,
         appId: this.state.appId,
         recordId: this.state.businessRecordId,
+        customerId: this.props.customerId,
         type: type,
         status: status
       });
@@ -3644,20 +3653,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({
@@ -6336,7 +6331,7 @@ class Video extends Component {
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkPictureConfirm}>确定</Button>
             </div>
           ]}>
-            <div className='endModal'>画中画已关闭，请重新开启</div>
+            <div className='endModal'>视频浮窗已关闭，请重新开启</div>
           </Modal>
           {/* 双录中断重新开启确认 */}
           <Modal closable={false} centered={true} visible={this.state.isRecordingeErrorModalVisible} maskClosable={false} footer={[
@@ -6789,6 +6784,8 @@ Video.defaultProps = {
   isWeakSound: false,
   whetherDetectFace: false, // 是否在双录时开启人脸检测
   whetherDetectLight: false, // 是否在双录时开启背光检测
+  faceDetectInterval: 6, // 人脸检测间隔（秒）
+  lightDetectInterval: 6, // 背光检测间隔（秒）
   userSide: 2,
   meetingDuration: null, // 会议时长，单位小时
   recordMode: 1, // 录制模式 1远程录制 2网点录制

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);