react_hsbc_teller 2.0.12 → 2.0.14

package/package.json

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

package/packages/api/api.js

@@ -492,7 +492,31 @@ class API extends Server{
         throw err;
       }
     }
-    
+    /**
+   *  用途：查询分行名称
+   *  @url https://api.cangdu.org/shopro/data/products
+   *  返回http_code为200表示成功
+   *  @method post
+   *  @return {promise}
+   */
+    async getBranchName(params = {}){
+      try{
+        let result = await this.axios('get', '/hsbc/getBranchName?branchCode=' + params.branchCode, params); 
+        if(result && (result.data instanceof Object) && result.code === 200){
+          return result.data||[];
+        }else{
+          let err = {
+            tip: '分行名称获取失败',
+            response: result,
+            data: params,
+            // url: 'https://api.cangdu.org/shopro/data/products',
+          }
+          throw err;
+        }
+      }catch(err){
+        throw err;
+      }
+    }
       /**
    *  用途：人脸识别
    *  @url https://elm.cangdu.org/v1/addimg/shop

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.12'
+const SDK_VERISON = '2.0.14'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -356,6 +356,7 @@ class Video extends Component {
         recordMode: this.props.recordMode,
         defaultBranchCode: this.props.defaultBranchCode,
         customerId: this.props.customerId,
+        customerType: this.props.customerType.toString(),
         salesBranchCode:  this.props.salesBranchCode,
         financialOffice:  this.props.financialOffice,
         roomId: this.state.channelId,
@@ -706,7 +707,7 @@ class Video extends Component {
           enable: true,
           xPosition: 640, // x 轴位置
           yPosition: 10, // y 轴位置
-          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.props.financialOffice || ''}`,
+          text: `${this.props.recordMode ==1 ?'远程录制' :'网点录制'} ${this.props.salesBranchCode || ''} ${this.state.branchName || ''} ${this.props.financialOffice || ''}`,
           fontSize: 16, // 字体⼤⼩
           url: '' // ⽔印图⽚ HTTP 地址
         },
@@ -1325,10 +1326,12 @@ class Video extends Component {
         }
 
       }
+      cobj.fillStyle = '#333333';
+      cobj.fillRect(0, 0, 640, baseStartHeight)
       // 录制中状态
       if (this.state.businessRecordId) {
         let str = '· 录制中'
-        cobj.fillStyle = '#F8F2F3';
+        // cobj.fillStyle = '#F8F2F3';
         cobj.font = "normal lighter 30px sans-serif";
         // cobj.fillRect(0, 0, 640, recordBoxHeight)
         cobj.textAlign = 'center';
@@ -3448,6 +3451,21 @@ class Video extends Component {
       this.roomCallBack(2, '获取tiken失败', 'SYS-01')
     }
   }
+  queryBranchName = async () => {
+    try {
+      let result = await API.getBranchName({
+        branchCode: this.props.salesBranchCode
+      })
+      this.setState({
+        branchName: result.branchName || ''
+      })
+      console.log('branchName', this.state.branchName)
+    } catch (err) {
+      console.error(err);
+      
+    }
+  }
+ 
   getRoomStatus = async data => {
     try {
       let result = await API.getRoomStatus({
@@ -3599,6 +3617,20 @@ 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({
@@ -3632,6 +3664,10 @@ class Video extends Component {
     } else {
       this.addToScript()
     }
+
+    if (this.props.salesBranchCode) {
+      this.queryBranchName()
+    }
   }
 
   voice = () => {
@@ -5246,9 +5282,6 @@ class Video extends Component {
       networkStatus: '未知', // 网络状态 （已连接/未连接）
       cameraResult: this.state.cameraList.length>0 ? '合格': '不合格', // 摄像头检测
       microResult: this.state.microphoneList.length>0 ? '合格': '不合格', // 麦克风检测
-      jsHeapSizeLimit: '未知', // 上下文内可用堆的最大体积
-      totalJSHeapSize: '未知', // 已分配的堆体积
-      usedJSHeapSize: '未知', // 当前 JS 堆活跃段（segment）的体积
       lightResult: this.state.envInfo? this.state.envInfo.lightResult : '未知'
     }
      
@@ -5296,28 +5329,7 @@ class Video extends Component {
       }
       
     }
-    // 内存检测
-    if (performance.memory) {
-      const filterSize = (size) => {
-        if (!size) return ''
-        if (size < pow1024(1)) return size + ' B'
-        if (size < pow1024(2)) return (size / pow1024(1)).toFixed(2) + ' KB'
-        if (size < pow1024(3)) return (size / pow1024(2)).toFixed(2) + ' MB'
-        if (size < pow1024(4)) return (size / pow1024(3)).toFixed(2) + ' GB'
-        return (size / pow1024(4)).toFixed(2) + ' TB'
-      }
     
-      function pow1024(num) {
-          return Math.pow(1024, num)
-      }
-      envInfo.jsHeapSizeLimit = filterSize(performance.memory.jsHeapSizeLimit)
-      envInfo.totalJSHeapSize = filterSize(performance.memory.totalJSHeapSize)
-      envInfo.usedJSHeapSize = filterSize(performance.memory.usedJSHeapSize)
-      // console.log('上下文内可用堆的最大体积', envInfo.jsHeapSizeLimit)
-      // console.log('已分配的堆体积', envInfo.totalJSHeapSize)
-      // console.log('当前 JS 堆活跃段（segment）的体积', envInfo.usedJSHeapSize)
-      envInfo.memoryResult = '合格'
-    }
     // 背景曝光环境检测
     this.lightDetect()
 
@@ -5940,7 +5952,6 @@ class Video extends Component {
     const isEnvironmentOK = !this.state.loading && 
                             this.state.envInfo.networkResult=='合格' &&
                             this.state.envInfo.batteryResult=='合格' &&
-                            this.state.envInfo.memoryResult=='合格' &&
                             this.state.envInfo.cameraResult=='合格' &&
                             this.state.envInfo.microResult=='合格' &&
                             this.state.envInfo.lightResult=='合格'
@@ -6055,13 +6066,15 @@ class Video extends Component {
 
                         </ul>
                       </div>
-                      {!this.state.loading && this.state.sessionId?
-                      <QRCode
-                            style={{'position': 'absolute', 'right': '10px', 'top': '-110px'}}
+                      {!this.state.loading && this.state.sessionType && this.state.sessionId?
+                      <div className='QRCode'>
+                        <QRCode
                             value={this.state.sessionId}  //value参数为生成二维码的链接
-                            size={100} //二维码的宽高尺寸
+                            size={110} //二维码的宽高尺寸
                             fgColor="#000000"  //二维码的颜色
-                      /> : null}
+                        />
+                        <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+                      </div> : null}
                     </div>
                   }
 
@@ -6629,10 +6642,6 @@ class Video extends Component {
                 key="2" className={this.state.envInfo.batteryResult=='不合格'? 'panel-error':''}>
                 <p className='envClass'>电量：{this.state.envInfo.batteryLevel}（{this.state.envInfo.batteryCharging}）</p>
               </Panel>
-              <Panel header={<span>内存检测 - {this.state.envInfo.memoryResult} {this.state.envInfo.memoryResult=='不合格'? <img src={IconFail} />: <img src={IconSuccess} />}</span>} 
-                key="1" className={this.state.envInfo.memoryResult=='不合格'? 'panel-error':''}>
-                <p className='envClass'>最大可用内存：{this.state.envInfo.jsHeapSizeLimit} ；当前已使用：{this.state.envInfo.usedJSHeapSize} </p>
-              </Panel>
               <Panel header={<span>摄像头设备 - {this.state.envInfo.cameraResult}{this.state.envInfo.cameraResult=='不合格'? <img src={IconFail} />: <img src={IconSuccess} />}</span>} 
                 key="3" className={this.state.envInfo.cameraResult=='不合格'? 'panel-error':''}>
                 <div >
@@ -6717,6 +6726,7 @@ Video.defaultProps = {
   recordMode: 1, // 录制模式 1远程录制 2网点录制
   defaultBranchCode: "",// 员工网点缩写
   customerId: "", //客户号
+  customerType: "", // 客户类型
   salesBranchCode: "", //网点编号(分行号)
   financialOffice: "", // 理财室
   staffName: '', // 坐席名称

package/packages/pages/video/video.less

@@ -276,6 +276,7 @@
   font-size: 22px;
     color: #222222;
     font-weight: 600;
+    transform: translateX(-100px);
   ul{
     li{ 
       list-style: none;
@@ -643,4 +644,22 @@ display: inline-flex;
 .imgDIV{
   margin: 0 !important;
   text-align:center;
-}
+}
+.QRCode{
+  position: absolute;
+  right: -200px;
+  top: 30px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .sessionDiv{
+    background: #DB0011;
+    border-radius: 20px;
+    padding: 0 15px;
+    text-align: center;
+    line-height: 40px;
+    height: 40px;
+    color: white;
+    margin-top: 20px;
+  }
+}