react_hsbc_teller 2.0.15 → 2.0.17

package/package.json

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

package/packages/api/api.js

@@ -57,6 +57,30 @@ class API extends Server{
       throw err;
     }
   }
+  /**
+   *  用途：获取录制状态
+   *  @url https://api.cangdu.org/shopro/data/products
+   *  返回http_code为200表示成功
+   *  @method post
+   *  @return {promise}
+   */
+  async getRecordStatus(params = {}){
+    try{
+      let result = await this.axios('get', '/hsbc/record/status?roomId=' + params.roomId, params); 
+      if(result && result.code === 200){
+        return result.data||[];
+      }else{
+        let err = {
+          tip: '录制状态获取失败',
+          response: result,
+          data: params,
+        }
+        throw err;
+      }
+    }catch(err){
+      throw err;
+    }
+  }
   /**
    *  用途：人脸检测
    *  @url https://api.cangdu.org/shopro/data/products

package/packages/pages/foot/foot.jsx

@@ -27,9 +27,6 @@ export default class foot extends Component {
     ocrClick=()=>{
         this.props.ocrClick()
     }
-    paperOcrClick=()=>{
-        this.props.paperOcrClick()
-    }
     pictureInPicture=()=>{
         this.props.pictureInPicture()
     }
@@ -156,15 +153,6 @@ export default class foot extends Component {
                                   </div>
                                 //   </Popover>
                               }
-                              {
-                                  item == 'PAPER_OCR' && 
-                                  <div className="one"  onClick={this.paperOcrClick.bind(this)}>
-                                      <img className="imgClass" src={require("../../assets/img/icon_paper.png").default} alt="" />
-                                      <div className="text">
-                                        纸质识别
-                                      </div>
-                                  </div>
-                              }
                               {
                                   item == 'INVITE' && <div className="one" onClick={this.invitationClick.bind(this)}>
                                   <img className="imgClass" src={require("../../assets/img/icon_invitation.png").default} alt="" />

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.15'
+const SDK_VERISON = '2.0.17'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -69,7 +69,9 @@ const POINT_TYPE = {
   pipd:	"画中画显示、关闭",
   pwd:	"违禁词检测",
   wnd:	"弱网",
-  mute:  "静音"
+  mute:  "静音",
+  expDark: '曝光、背光',
+  fcd: '人脸变化检测'
 }
 const RECORD_DEVICE_NAME = 'screen-capture-recorder'
 // const RECORD_DEVICE_NAME = 'Full HD webcam'
@@ -940,8 +942,8 @@ class Video extends Component {
   }
   messageClick = (value, tipType) => {
     console.log('messageClick', value, tipType)
-    const intervalSec = 15 // 相同提示触发间隔
-    const durationSec = 10 // 提示持续时间
+    const intervalSec = 5 // 相同提示触发间隔
+    const durationSec = 4.5 // 提示持续时间
     if (messageValueMap.get(value) == undefined) {
       // map中没有相同消息
       messageValue = value
@@ -1086,18 +1088,6 @@ class Video extends Component {
       this.selectCustomer('ocr')
     }
   };
-  paperOcrClick  = () => {
-    setTimeout(() => {
-      // this.messageClick('系统检测到您已签署2/3个地方，还有1处未签署', 'error')
-      message.error({
-        content: '系统检测到您已签署2/3个地方，还有1处未签署',
-        icon: <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>,
-        className: 'errorClassName',
-        top: 200,
-        duration: 10
-      })
-    }, 1500);
-  };
   endSessionValue = () => {
     this.saveLog('RM actively exits the meeting')
     if (streamShare) {
@@ -1738,7 +1728,7 @@ class Video extends Component {
           }
         } else if (Mival.status == 2) {
           // 关闭了业务录制
-          console.log('业务录制关闭')
+          console.log('业务录制关闭', this.state.businessRecordId)
           this.saveLog('Stop business recording')
           this.test_controller.StopRemoteRecord(this.state.businessRecordId)
           this.state.businessId = '';
@@ -1796,7 +1786,7 @@ class Video extends Component {
         if (res==1 || res== -1){
           // 背景曝光过度
           this.messageClick('检测到当前背光、曝光过度', 'error')
-          this.saveVideoPoint('env', 'RM端背光、曝光过度');
+          this.saveVideoPoint('expDark', 'RM端背光、曝光过度');
         }
         origin.delete()
         // let end = new Date().getTime()
@@ -1850,6 +1840,8 @@ class Video extends Component {
         roomId: this.state.channelId + '',
         appId: this.state.appId,
         recordId: this.state.recordId,
+        client: 'rm',
+        customerId: this.props.tellerAccount
       });
     } catch (err) {
       console.error(err);
@@ -3357,6 +3349,7 @@ class Video extends Component {
         type: '2'
       });
       console.log(result);
+      this.queryRecordStatus()
       this.appGetUsername(document.getElementById('publish_video1').name)
       this.sendMessage({
           'typeId': 1014,
@@ -3726,6 +3719,31 @@ class Video extends Component {
       }
     }
   };
+  queryRecordStatus = async()=>{
+    try {
+      let result = await API.getRecordStatus({
+        roomId: this.state.channelId + ''
+      });
+      console.log('RecordStatus', result)
+      if (result.fullRecordStatus == 1) { // 1开启 2未开启
+        // 全局录制
+        this.state.recordId = result.fullRecordId
+        if (result.businessRecordStatus == 1){
+          // 业务录制
+          this.state.businessRecordId = result.businessRecordId;
+          if (this.props.whetherDetectFace) this.startFaceDetection();
+          if (this.props.whetherDetectLight) this.startImageDetection();
+        }
+      } else {
+        this.state.recordId = ''
+      }
+    } catch (err) {
+      console.error(err);
+      if(err.status == 502 || err.status== 404) {
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
+      }
+    }
+  }
   isFileSuccuse = () => {
     if (!this.state.sessionId || !this.state.sessionType || !this.state.imStatus) {
       this.messageClick('当前程序异常请先退出重开', 'error')
@@ -6081,7 +6099,11 @@ class Video extends Component {
                       {!this.state.loading && this.state.sessionType && this.state.sessionId?
                       <div className='QRCode'>
                         <QRCode
-                            value={this.state.sessionId}  //value参数为生成二维码的链接
+                            value={JSON.stringify({
+                              sessionId:this.state.sessionId,
+                              staffId: this.props.tellerAccount,
+                              staffName: this.props.staffName
+                            })}  //value参数为生成二维码的链接
                             size={110} //二维码的宽高尺寸
                             fgColor="#000000"  //二维码的颜色
                         />
@@ -6254,7 +6276,6 @@ class Video extends Component {
             invitationClick={this.invitationClick}
             customerFaceClick={this.customerFaceClick}
             ocrClick={this.ocrClick}
-            paperOcrClick={this.paperOcrClick}
             switchExternal={this.switchExternal}
             inspection={this.inspection}
             toggleAsr={this.toggleAsr}