react_hsbc_teller 1.9.11 → 1.9.12

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -142,7 +142,7 @@ export default class foot extends Component {
                                   <div className="one"  onClick={this.ocrClick.bind(this)}>
                                       <img className="imgClass" src={require("../../assets/img/icon_ocr.png").default} alt="" />
                                       <div className="text">
-                                          OCR识别
+                                        证件识别
                                       </div>
                                   </div>
                                 //   </Popover>

package/packages/pages/video/video.jsx

@@ -14,6 +14,7 @@ import cameraImgOpen from '../../assets/img/icon_camera.png'
 import cameraImgCloe from '../../assets/img/icon_cameraOne.png'
 import beautyImg from '../../assets/img/whiteningLut.jpg'
 import ocrImage from '../../assets/img/jietu.png'
+import faceImage from '../../assets/img/jietu_face.png'
 import autod from '../../assets/mp3/joinmeeting.mp3'
 import internalJoin from '../../assets/mp3/internalJoin.mp3'
 import internalLeft from '../../assets/mp3/internalLeft.mp3'
@@ -42,6 +43,8 @@ import { Button } from '../../../node_modules/antd/lib/index';
 import SignMy from '../sign/signMy.jsx'
 import axios from 'axios';
 import CryptoJS from "crypto-js";
+const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
+const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
 const LEAVE_TYPE = {
   TELLER_EXIT: 1, // 坐席退出
@@ -179,7 +182,7 @@ class Video extends Component {
     isWhiteboard: false,
     isSelect: '',
     loading: false,
-    titleModal: '人脸识别',
+    titleModal: '身份验证',
     faceCustomerType: 1, // 1无感人脸，2ocr
     faceCustomerUid: '',
     customerList: [],
@@ -352,7 +355,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.11&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
+      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.12&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -780,7 +783,7 @@ class Video extends Component {
         this.setState({
           cardFailReason: '证件图片不清晰，请重试。返回重拍时，请检查并确保身份证件图片信息完整清晰后再提交核查。[#'+value+'#]'
         })
-      } else if(value == -1001 || value == -1002|| value == -1003||value == -1004||value == -1005||value==-1006) {
+      } else if(value == -1001 || value == -1002|| value == -1003||value == -1004||value == -1005||value==-100801||value==-100802) {
         this.setState({
           cardFailReason: '系统或网络连接异常，请重试。若仍有问题，请联系Support同事。[#'+value+'#]'
         })
@@ -799,7 +802,11 @@ class Video extends Component {
         this.setState({
           faceFailReason: '用户信息核查未通过。请返回重试。返回重拍时，请检查并确保客户照片完整清晰后再提交核查。[#'+ value + '#]'
         })
-      }else if(value == 209) {
+      }else if(value == 206) {
+        this.setState({
+          faceFailReason: '用户信息核查无法处理，请重试。若仍有问题，请联系Support同事。[#'+ value + '#]'
+        })
+      } else if(value == 209) {
         this.setState({
           faceFailReason: '用户信息核查未通过。请确认客户与其提供的证件信息一致后，再提交核查。[#'+ value + '#]'
         })
@@ -1083,7 +1090,7 @@ class Video extends Component {
     if (this.isFileSuccuse()) {
       this.state.faceCustomerType = 1
       this.setState({
-        titleModal: '人脸识别'
+        titleModal: '身份验证'
       })
       this.selectCustomer('facial')
     }
@@ -1092,7 +1099,7 @@ class Video extends Component {
     if (this.isFileSuccuse()) {
       this.state.faceCustomerType = 2
       this.setState({
-        titleModal: 'OCR识别'
+        titleModal: '拍摄证件照片'
       })
       this.selectCustomer('ocr')
     }
@@ -3871,7 +3878,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.9.11')
+    console.log('hsbc_teller_sdk', '1.9.12')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4287,9 +4294,9 @@ class Video extends Component {
             certificateValidity: '',
             idCardNumber: '',
             idCardName: '',
-            titleModal: '人脸识别',
+            titleModal: '身份验证',
             // clickedFacial: true,
-            facialImg: ocrImage,
+            facialImg: faceImage,
             isFaceImage: false
             })
           })
@@ -4485,7 +4492,7 @@ class Video extends Component {
   }
   handleOkFacial = () => {
     if (this.state.faceCustomerType == 2) {
-      if (this.state.IDtypeFrontOrBack == '请截取证件头像面') {
+      if (this.state.IDtypeFrontOrBack == IDtypeFront) {
         if(this.state.documentType == 'PASSPORT_CARD' || this.state.documentType == 'TW_PASS_CARD' || this.state.documentType == 'HK_MO_PASS_CARD') {
           this.setState({
             loadingFace: true
@@ -4494,12 +4501,12 @@ class Video extends Component {
         } else {
           this.setState({
             facialImg: ocrImage,
-            IDtypeFrontOrBack: '请截取证件国徽面',
+            IDtypeFrontOrBack: IDtypeBack,
             isFaceImage: false,
           })
         }
         
-      } else if (this.state.IDtypeFrontOrBack == '请截取证件国徽面') {
+      } else if (this.state.IDtypeFrontOrBack == IDtypeBack) {
         this.setState({
           loadingFace: true
         })
@@ -4568,7 +4575,7 @@ class Video extends Component {
       isFaceImage: false,
       facialImg: ocrImage,
       disabledIdCard: true,
-      IDtypeFrontOrBack: '请截取证件头像面',
+      IDtypeFrontOrBack: IDtypeFront,
       facialImgFront: '',
       facialImgBack: '',
       faceResuly: '',
@@ -4728,9 +4735,9 @@ class Video extends Component {
         clickedFacial: false,
         clickedOcr: false,
         isFaceImage: false,
-        facialImg: ocrImage,
+        facialImg: this.state.titleModal=='身份验证'? faceImage : ocrImage,
         disabledIdCard: true,
-        IDtypeFrontOrBack: '请截取证件头像面',
+        IDtypeFrontOrBack: IDtypeFront,
         facialImgFront: '',
         facialImgBack: '',
         faceResuly: '',
@@ -4751,13 +4758,13 @@ class Video extends Component {
     }
   }
   sgsinImage = () => {
-    if (this.state.IDtypeFrontOrBack == '请截取证件头像面') {
+    if (this.state.IDtypeFrontOrBack == IDtypeFront) {
       this.setState({
         facialImg: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png'),
         isFaceImage: true,
         facialImgFront: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png'),
       })
-    } else if (this.state.IDtypeFrontOrBack == '请截取证件国徽面') {
+    } else if (this.state.IDtypeFrontOrBack == IDtypeBack) {
       this.setState({
         facialImg: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png'),
         isFaceImage: true,
@@ -6409,7 +6416,7 @@ class Video extends Component {
             virtualization={this.virtualization}
           ></Foot>
           {/* 暂停恢复会话 */}
-          <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
+          <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} maskClosable={false} onOk={this.handleOk}
             onCancel={this.handleCancel}>
             {
               this.state.isSuspend && <span>确定是否恢复会话？</span>
@@ -6419,7 +6426,7 @@ class Video extends Component {
             }
           </Modal>
           {/* 是否退出会议*/}
-          <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} footer={[
+          <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} maskClosable={false} footer={[
             <div key='end'>
               <Button className="modelButtonCancel" onClick={this.handleCancelEnd}>取消</Button>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkEnd}>确定</Button>
@@ -6428,11 +6435,11 @@ class Video extends Component {
             <div className='endModal'>是否要结束并退出会议？</div>
           </Modal>
           {/* ocr及人脸 */}
-          <Modal title={this.state.titleModal} width={650} closable={true} onCancel={this.handleCancelFacial} centered={true} visible={this.state.isModalVisibleFacial} footer={[
+          <Modal title={this.state.titleModal} width={650} closable={true} maskClosable={false} onCancel={this.handleCancelFacial} centered={true} visible={this.state.isModalVisibleFacial} footer={[
             // ocr及人脸在截图界面的按钮
             this.state.cardResuly == '' && this.state.faceResuly == ''  &&<div key='facial'>
               <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
-              <Button className="modelButtonCancel" onClick={this.sgsinImage}>截图</Button>
+              <Button className="modelButtonCancel" onClick={this.sgsinImage}>拍照</Button>
               {/* 再截图后按钮高亮 */}
               {
                 this.state.isFaceImage && <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>下一步</Button>
@@ -6457,13 +6464,13 @@ class Video extends Component {
           // ocr成功
             this.state.cardResuly == 'success' && <div key='facial'>
               {
-                this.state.disabledIdCard && <Button className="modelButtonFaceOk" danger onClick={(e) => this.updateConfirm('noFace')}>修改</Button>
+                this.state.disabledIdCard && <Button className="modelButtonFaceOk" danger onClick={(e) => this.updateConfirm('noFace')}>修正证件信息</Button>
               }
               {
-                this.state.documentType == 'ID_CARD' && this.state.certificateValidityType && <Button className="modelButtonFaceOkColor" danger onClick={(e) => this.confirmCallback('face')}>完成并发起人脸识别</Button>
+                this.state.documentType == 'ID_CARD' && this.state.certificateValidityType && <Button className="modelButtonFaceOkColor" danger onClick={(e) => this.confirmCallback('face')}>确认信息并发起人脸识别</Button>
               }
               {
-                this.state.documentType == 'ID_CARD' && !this.state.certificateValidityType && <Button className="modelButtonFaceOkColorFile" danger >完成并发起人脸识别</Button>
+                this.state.documentType == 'ID_CARD' && !this.state.certificateValidityType && <Button className="modelButtonFaceOkColorFile" danger >确认信息并发起人脸识别</Button>
               }
               {
                 this.state.documentType != 'ID_CARD' &&this.state.certificateValidityType && <Button className="modelButtonOk" type="primary" danger onClick={(e) => this.confirmCallback('noFace')}>完成</Button>
@@ -6484,7 +6491,10 @@ class Video extends Component {
                 {this.state.cardResuly == '' && <div className='faceCardImg'>
 
                   {
-                    this.state.titleModal == 'OCR识别' && <div className='titleDiv'>{this.state.IDtypeFrontOrBack}</div>
+                    this.state.titleModal == '拍摄证件照片' && <div className='titleDiv'>{this.state.IDtypeFrontOrBack}</div>
+                  }
+                  {
+                    this.state.titleModal == '身份验证' && this.state.faceResuly == '' && <div className='titleDiv'>请确保陪同者头像清楚显示在前置镜头前</div>
                   }
 
                   {
@@ -6493,7 +6503,7 @@ class Video extends Component {
                         {
                           this.state.videoType == 'error' && <div className='errorClassFace videoErrorClass'>
                           <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>
-                          请点击“截图”拍摄客户人像的照片。若界面无客户头像显示，请检查网络并保持网络稳定后，点击“截图”重试
+                          请点击“拍照”拍摄客户人像的照片。若界面无客户头像显示，请检查网络并保持网络稳定后，点击“拍照”重试
                           </div>
                         }
                         <video disablePictureInPicture className="faceImg" id="publish_video_2" autoPlay muted={true}></video>
@@ -6514,14 +6524,14 @@ class Video extends Component {
                           this.state.cardFailReason && <span>{this.state.cardFailReason}</span>
                         }
                         {
-                          !this.state.cardFailReason && <span>识别成功</span>
+                          !this.state.cardFailReason && <span>识别证件信息成功</span>
                         }
                         
                         </div>
                     }
                     {
                       this.state.cardResuly == 'fail' && <div className='errorClassFace'>
-                      <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>识别失败--{this.state.cardFailReason}</div>
+                      <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>识别证件信息失败--{this.state.cardFailReason}</div>
                     }
                     <div className='imgDIV'>
                       <img className="faceImgCard" src={this.state.facialImgFront} alt=""></img>
@@ -6537,16 +6547,16 @@ class Video extends Component {
                   </div>
                 }
                 {
-                  this.state.titleModal == '人脸识别' && this.state.faceResuly != '' && <div className='resuleCard'>
+                  this.state.titleModal == '身份验证' && this.state.faceResuly != '' && <div className='resuleCard'>
                     {
                       this.state.faceResuly == 'success' && <div className='successClassFace'>
                         <img src={require("../../assets/img/tooltips1_pass.png").default} alt="" ></img>
           
-                        人脸识别成功</div>
+                        认证通过</div>
                     }
                     {
                       this.state.faceResuly == 'fail' && <div className='errorClassFace'>
-                      <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>人脸识别失败--{this.state.faceFailReason}</div>
+                      <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>{this.state.faceFailReason}</div>
                     }
                     <div><span>客户姓名</span>  <input disabled type="text" value={this.state.idCardNameFace}/></div>
                     <div><span>身份证号</span>  <input disabled type="text" value={this.state.idCardNumberFace}/></div>
@@ -6557,7 +6567,7 @@ class Video extends Component {
               </div>
             </Spin>
           </Modal>
-          <Modal title="经理人员授权" closable={false} centered={true} visible={this.state.isModalVisibleSFP}
+          <Modal title="经理人员授权" closable={false} centered={true} visible={this.state.isModalVisibleSFP} maskClosable={false}
             footer={[
               <div key='end'>
                 <Button className="modelButtonCancel" onClick={this.handleCancelSFP}>取消</Button>
@@ -6590,7 +6600,7 @@ class Video extends Component {
             </div>
             </Spin>
           </Modal>
-          <Modal title={this.state.customerTitleName} closable={false} centered={true} visible={this.state.isModalVisibleCustomer}
+          <Modal title={this.state.customerTitleName} closable={false} centered={true} visible={this.state.isModalVisibleCustomer} maskClosable={false}
             footer={[
               <div key='end'>
                 
@@ -6627,7 +6637,7 @@ class Video extends Component {
                 {
                   this.state.isCustomerSelect && <div>
                     <div>
-                      请选择进行身份识别的客户
+                      请选择进行身份识别的客户（陪同者)
                     </div>
                     <div>
                       <Radio.Group onChange={this.onChangeOCRCustomer} value={this.state.customerSelect}>
@@ -6651,7 +6661,7 @@ class Video extends Component {
                       <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>{this.state.documentError}</div>
                     }
                     <div>
-                      请您确认您的身份证件类型
+                      请选择您的身份证件类型
                     </div>
                     <div>
                       <Radio.Group onChange={this.onChangeDocumentType} value={this.state.documentType}>
@@ -6673,7 +6683,7 @@ class Video extends Component {
 
           </Modal>
 
-          <Modal className="modelClass" title="邀请参会人员" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
+          <Modal className="modelClass" maskClosable={false} title="邀请参会人员" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
             <div key='invitation'>
               <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>
               {
@@ -6729,7 +6739,7 @@ class Video extends Component {
               ></CanvasDraw> */}
             </div>
           </Modal>
-          <Modal title="设置视频设备" width={650} closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
+          <Modal title="设置视频设备" maskClosable={false} width={650} closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
             <div key='inspection'>
               <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInspection}>确定</Button>

package/packages/pages/video/video.less

@@ -406,7 +406,7 @@
   border-spacing: 20px!important;
 }
 .modelButtonFaceOkColor{
-  width: 170px!important;
+  min-width: 170px!important;
   height: 40px!important;
   font-size: 16px!important;
   color: #ffffff!important;
@@ -598,7 +598,8 @@ margin: 20Px 40px;
   margin-bottom: 0px !important;
 }
 .titleDiv{
-  font-size: 1.4rem;
+  font-size: 1.2rem;
+  margin: 10px 0;
 }
 .videoListClass{
   align-content: flex-start;