react_hsbc_teller 2.0.57 → 2.0.58

package/package.json

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

package/packages/demo/demo.js

@@ -24,7 +24,8 @@ class Demo extends Component {
     // baseURL:'https://counter-web.leimondata.cn:18082/api/leimon-counter-api',
     // resourcePath: 'https://counter-web.leimondata.cn:7199',
     // resourcePath:'http://121.196.19.70:8027/',
-    roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws',
+    roomServerUrl: 'wss://uat.mpaas.investments.hsbc.com.hk:31000/mpaas/mrtc/ws',
+    // roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws',
     baseURL:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
     resourcePath:'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
     prohibitPrompt: '无客户',

package/packages/pages/video/video.jsx

@@ -63,7 +63,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.57'
+const SDK_VERISON = '2.0.58'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -4827,76 +4827,52 @@ class Video extends Component {
     })
   }
   handleFinishOcr = async (type) => {
-    // 非身份证直接入库
-    // if (type == 'noFace') {
-      await this.handleConfirmCallback()
-      // this.setState({
-      //   idCardNameFace: this.state.idCardName,
-      //   idCardNumberFace: this.state.idCardNumber,
-      //   certificateValidityFace: this.state.certificateValidity
-      // },()=>{
+     await this.handleConfirmCallback();
+     if (type === 'noFace') {
+       this.setState({
+         isModalVisibleFacial: false,
+         cardResuly: '',
+         idCardNumber: '',
+         idCardName: '',
+         certificateValidity: '',
+         resultIdCardName: '',
+         resultIdCardNumber: '',
+         resultCertificateDate: '',
+         authorizeStaffId: ''
+       })
+     } else {
+       console.log('身份证ocr');
+       // 保存身份证，进行人脸识别
+       this.state.userIdCardResults[this.state.faceCustomerUid] = {
+        idCardName: this.state.idCardName,
+        idCardNumber: this.state.idCardNumber,
+        customerName: this.state.customerName,
+        certificateValidity: this.state.certificateValidity,
+        resultIdCardName: this.state.resultIdCardName,
+        resultIdCardNumber: this.state.resultIdCardNumber,
+        resultCertificateDate: this.state.resultCertificateDate,
+        authorizeStaffId: this.state.authorizeStaffId,
+      }
+      console.log(this.state.userIdCardResults)
       this.setState({
-        isModalVisibleFacial: false,
-        cardResuly: '',
-        idCardNumber: '',
-        idCardName: '',
-        certificateValidity: '',
-        resultIdCardName: '',
-        resultIdCardNumber: '',
-        resultCertificateDate: '',
-        authorizeStaffId: ''
+        idCardNameFace: this.state.idCardName,
+        idCardNumberFace: this.state.idCardNumber,
+        certificateValidityFace: this.state.certificateValidity,
+        userIdCardResults: this.state.userIdCardResults
+      },()=>{
+        this.setState({
+          isModalVisibleFacial: false,
+          cardResuly: '',
+          certificateValidity: '',
+          idCardNumber: '',
+          idCardName: '',
+          resultIdCardName: '',
+          resultIdCardNumber: '',
+          resultCertificateDate: '',
+          authorizeStaffId: '',
+        })
       })
-    // })
-    // } else {
-    //   console.log('身份证ocr')
-    //   const idCardName = this.state.idCardName
-    //   const documentType = this.state.documentType
-    //   // 身份证，进行人脸识别后再入库
-    //   this.state.userIdCardResults[this.state.faceCustomerUid] = {
-    //     idCardName: this.state.idCardName,
-    //     idCardNumber: this.state.idCardNumber,
-    //     customerName: this.state.customerName,
-    //     certificateValidity: this.state.certificateValidity,
-    //     resultIdCardName: this.state.resultIdCardName,
-    //     resultIdCardNumber: this.state.resultIdCardNumber,
-    //     resultCertificateDate: this.state.resultCertificateDate,
-    //     authorizeStaffId: this.state.authorizeStaffId,
-    //   }
-    //   console.log(this.state.userIdCardResults)
-    //   this.setState({
-    //     idCardNameFace: this.state.idCardName,
-    //     idCardNumberFace: this.state.idCardNumber,
-    //     certificateValidityFace: this.state.certificateValidity,
-    //     userIdCardResults: this.state.userIdCardResults
-    //   },()=>{
-    //   this.state.faceCustomerType = 1
-    //     this.setState({
-    //     cardResuly: '',
-    //     certificateValidity: '',
-    //     idCardNumber: '',
-    //     idCardName: '',
-    //     resultIdCardName: '',
-    //     resultIdCardNumber: '',
-    //     resultCertificateDate: '',
-    //     authorizeStaffId: '',
-    //     titleModal: '身份验证',
-    //     // clickedFacial: true,
-    //     facialImg: faceImage,
-    //     isFaceImage: false
-    //     })
-    //   })
-    //   setTimeout(() => {
-    //     this.publishVideoTwo()
-    //   }, 0);
-    //
-    //   // 保存图片到本地
-    //   setTimeout(() => {
-    //     combineBase64Images(this.state.facialImgFront, this.state.facialImgBack, (base64Image)=>{
-    //       saveBase64Image(base64Image, `${idCardName}-${documentType}`)
-    //     })
-    //   }, 100);
-    //
-    // }
+     }
   }
   // ocr结果入库
   handleConfirmCallback = async () => {
@@ -5201,59 +5177,59 @@ class Video extends Component {
       return
     }
     this.handleCancelFacial();
-    try {
-      // 原始证件参数
-      let data = {
-        idCardName: userInfo.resultIdCardName,
-        staffId: this.props.tellerAccount,
-        activityId: this.props.businessNumber,
-        appAccount: this.state.faceCustomerUid,
-        idCardNumber: userInfo.resultIdCardNumber,
-        sessionId: this.state.sessionId,
-        certificateType: 'ID_CARD',
-        customerName: userInfo.customerName,
-        startDate: userInfo.resultCertificateDate ? userInfo.resultCertificateDate.split('-')[0] : '',
-        endDate: userInfo.resultCertificateDate ? userInfo.resultCertificateDate.split('-')[1] : '',
-      }
-      // 添加修改后的证件参数
-      if (userInfo.authorizeStaffId) {
-        data.authorizeStaffId = userInfo.authorizeStaffId
-      }
-      if (userInfo.idCardName != userInfo.resultIdCardName) {
-        data.reviseIdCardName = userInfo.idCardName
-      }
-      if (userInfo.idCardNumber != userInfo.resultIdCardNumber) {
-        data.reviseIdCardNumber = userInfo.idCardNumber
-      }
-      let reviseCertificateStartDate = userInfo.certificateValidity ? userInfo.certificateValidity.split('-')[0] : '';
-      let reviseCertificateEndDate = userInfo.certificateValidity ? userInfo.certificateValidity.split('-')[1] : '';
-      if (reviseCertificateStartDate != data.startDate) {
-        data.reviseCertificateStartDate = reviseCertificateStartDate
-      }
-      if (reviseCertificateEndDate != data.endDate) {
-        data.reviseCertificateEndDate = reviseCertificateEndDate
-      }
-      let result = await API.confirmCallback(data);
-      console.log('confirmCallback', result)
-      if (result.code == 200) {
-        // console.log(data)
-        let item = this.state.videoList.find(el => el.userId == this.state.faceCustomerUid )
-        item.hasOcr = 2; // 身份证ocr
-        // this.setState({
-        //   videoList: this.state.videoList
-        // })
-        this.videoListSort();
-        if (this.state.isPictureInPicture) {
-          this.pictureInPicture('Refresh')
-        }
-      } else {
-        console.log('1')
-        this.messageClick('保持信息失败', 'error')
-      }
-    } catch (err) {
-      console.log('2',err)
-      this.messageClick('保持信息失败', 'error')
-    }
+    // try {
+    //   // 原始证件参数
+    //   let data = {
+    //     idCardName: userInfo.resultIdCardName,
+    //     staffId: this.props.tellerAccount,
+    //     activityId: this.props.businessNumber,
+    //     appAccount: this.state.faceCustomerUid,
+    //     idCardNumber: userInfo.resultIdCardNumber,
+    //     sessionId: this.state.sessionId,
+    //     certificateType: 'ID_CARD',
+    //     customerName: userInfo.customerName,
+    //     startDate: userInfo.resultCertificateDate ? userInfo.resultCertificateDate.split('-')[0] : '',
+    //     endDate: userInfo.resultCertificateDate ? userInfo.resultCertificateDate.split('-')[1] : '',
+    //   }
+    //   // 添加修改后的证件参数
+    //   if (userInfo.authorizeStaffId) {
+    //     data.authorizeStaffId = userInfo.authorizeStaffId
+    //   }
+    //   if (userInfo.idCardName != userInfo.resultIdCardName) {
+    //     data.reviseIdCardName = userInfo.idCardName
+    //   }
+    //   if (userInfo.idCardNumber != userInfo.resultIdCardNumber) {
+    //     data.reviseIdCardNumber = userInfo.idCardNumber
+    //   }
+    //   let reviseCertificateStartDate = userInfo.certificateValidity ? userInfo.certificateValidity.split('-')[0] : '';
+    //   let reviseCertificateEndDate = userInfo.certificateValidity ? userInfo.certificateValidity.split('-')[1] : '';
+    //   if (reviseCertificateStartDate != data.startDate) {
+    //     data.reviseCertificateStartDate = reviseCertificateStartDate
+    //   }
+    //   if (reviseCertificateEndDate != data.endDate) {
+    //     data.reviseCertificateEndDate = reviseCertificateEndDate
+    //   }
+    //   let result = await API.confirmCallback(data);
+    //   console.log('confirmCallback', result)
+    //   if (result.code == 200) {
+    //     // console.log(data)
+    //     let item = this.state.videoList.find(el => el.userId == this.state.faceCustomerUid )
+    //     item.hasOcr = 2; // 身份证ocr
+    //     // this.setState({
+    //     //   videoList: this.state.videoList
+    //     // })
+    //     this.videoListSort();
+    //     if (this.state.isPictureInPicture) {
+    //       this.pictureInPicture('Refresh')
+    //     }
+    //   } else {
+    //     console.log('1')
+    //     this.messageClick('保持信息失败', 'error')
+    //   }
+    // } catch (err) {
+    //   console.log('2',err)
+    //   this.messageClick('保持信息失败', 'error')
+    // }
   };
   handleCancelFacial = () => {
     this.sendMessage({
@@ -5267,6 +5243,7 @@ class Video extends Component {
     })
   };
   publishVideoTwo=()=>{
+    console.log('publishVideoTwo', document.getElementById('publish_video_2'))
     const videoMedia = document.getElementById('publish_video_2');
         videoMedia.srcObject = document.getElementById(videoName).srcObject
         clearTime = setTimeout(() => {
@@ -5447,7 +5424,7 @@ class Video extends Component {
         sid = document.getElementById('video12').name;
         videoName = 'video12'
       }
-      console.log(sid)
+      console.log('sid-videoName', sid, videoName)
       this.state.customOcrSid = sid
       this.state.faceCustomerUid = item.customId,
         this.state.customerName = item.name
@@ -5465,16 +5442,13 @@ class Video extends Component {
         idCardName: '',
         cardFailReason: '',
         cardResuly: '',
-        certificateValidityType: true
-      }, () => {
-
-
-        this.setState({
-          isModalVisibleFacial: true,
-        }, () => {
-          this.publishVideoTwo()
-        })
+        videoType: '',
+        certificateValidityType: true,
+        isModalVisibleFacial: true,
       })
+        setTimeout(()=> {
+            this.publishVideoTwo()
+        },0)
     }
   }
   sgsinImage = () => {
@@ -7457,7 +7431,7 @@ class Video extends Component {
               </div>
             ]}>
             <div style={{display: 'flex', padding: '10px 20px'}}>
-              <Step current={this.state.isCustomerSelect?0:1} />
+              <Step current={this.state.isCustomerSelect?0:1} ocr={true} />
               <div>
                 {
                   this.state.isCustomerSelect && <div>