react_hsbc_teller 1.6.6 → 1.6.7

package/package.json

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

package/packages/pages/video/video.jsx

@@ -430,9 +430,9 @@ class Video extends Component {
         {
           tag: 'projectionWhiteboard',
           xPosition: 0,
-          yPosition: 270,
-          width: 1280,
-          height: 720
+          yPosition: 175,
+          width: 960,
+          height: 540
         },
         // {
         //   tag: 'VIDEO_SOURCE_SCREEN_ONE',
@@ -452,43 +452,43 @@ class Video extends Component {
           tag: 'tag1',
           xPosition: 0,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer1',
-          xPosition: 320,
+          xPosition: 213,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer2',
-          xPosition: 640,
+          xPosition: 426,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer3',
-          xPosition: 960,
+          xPosition: 639,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer4',
-          xPosition: 1280,
+          xPosition: 852,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer5',
-          xPosition: 1600,
+          xPosition: 1065,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         // {
         //   tag: 'customer6',
@@ -542,17 +542,25 @@ class Video extends Component {
           width: item.width,
           height: item.height
         })
-      }) : list.push({
+      }) : 
+      list.push({
         tag: 'VIDEO_SOURCE_SCREEN',
-          xPosition: 1290,
-          yPosition: 640,
-          width: 630,
-          height: 350
+          xPosition: 960,
+          yPosition: 535,
+          width: 320,
+          height: 180
       })
+      // list.push({
+      //   tag: 'VIDEO_SOURCE_SCREEN_19_9',
+      //     xPosition: 960,
+      //     yPosition: 573,
+      //     width: 304,
+      //     height: 144
+      // })
       const filePath = 'recordId_' + new Date().valueOf();
       const recordParam = {};
-      recordParam.width = 1920;
-      recordParam.height = 1080;
+      recordParam.width = 1280;
+      recordParam.height = 720;
       recordParam.recordTotalStream = 0;
       recordParam.startTimeout = 10;
       recordParam.splitType = 0;
@@ -564,7 +572,7 @@ class Video extends Component {
           type: 1, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
           id: 1, // ⽔印 ID
           enable: true,
-          xPosition: 10, // x 轴位置
+          xPosition: 1000, // x 轴位置
           yPosition: 10, // y 轴位置
           text: '', // ⽔印⽂字
           fontSize: 16, // 字体⼤⼩
@@ -3207,7 +3215,6 @@ userType:'1'
             this.state.analyserHeight = this.state.analyserHeight
         }
       }
-      
       this.state.OnVolumeAnalyserMap.set(sid,setInterval(
         this.test_controller.OnVolumeAnalyser.bind(this, sid, analyser),
       300
@@ -3804,7 +3811,7 @@ userType:'1'
       isModalVisibleEnd: false
     })
   };
-  confirmCallback=async()=>{
+  confirmCallback=async(data)=>{
     try {
       let result = await API.confirmCallback({
         idCardName: this.state.idCardName,
@@ -3814,16 +3821,33 @@ userType:'1'
         idCardNumber: this.state.idCardNumber,
         sessionId: this.state.sessionId,
       });
+      console.log('confirmCallback',result)
       if (result.code == 200) {
-        this.setState({
-          isModalVisibleFacial: false,
-          idCardNumber: '',
-          idCardName: ''
-        })
+        console.log(data)
+        if(data == 'noFace') {
+          this.setState({
+            isModalVisibleFacial: false,
+            idCardNumber: '',
+            idCardName: ''
+          })
+        } else {
+          console.log('data')
+          this.state.faceCustomerType = 1
+          this.setState({
+            idCardNumber: '',
+            idCardName: '',
+            titleModal: '人脸识别',
+            // clickedFacial: true,
+            facialImg: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png')
+          })
+        }
+        
       } else {
+        console.log('1')
         this.messageClick('保持信息失败','error')
       }
     } catch (err) {
+      console.log('2')
       this.messageClick('保持信息失败','error')
     }
   }
@@ -5276,7 +5300,8 @@ userType:'1'
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>确定</Button>
             </div>,
             this.state.idCardName && <div key='facial'>
-            <Button className="modelButtonOk" type="primary" danger onClick={this.confirmCallback}>确认</Button>
+              <Button className="modelButtonFaceOk" danger onClick={(e)=>this.confirmCallback('face')}>完成并发起人脸识别</Button>
+            <Button className="modelButtonOk" type="primary" danger onClick={(e)=>this.confirmCallback('noFace')}>完成</Button>
             </div>
           ]}>
             <div className="faceBody">

package/packages/pages/video/video.less

@@ -378,6 +378,15 @@
   background: #DB0011!important;
   border-spacing: 20px!important;
 }
+.modelButtonFaceOk{
+  width: 170px!important;
+  height: 40px!important;
+  font-size: 16px!important;
+  color: #333!important;
+  border: 1px #333 solid!important;
+  background: #fff!important;
+  border-spacing: 20px!important;
+}
 .endModal{
   font-size: 16px;
     padding: 56px 30px 0px 30px;