react_hsbc_teller 1.9.6 → 1.9.8

package/package.json

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

package/packages/api/api.js

@@ -179,7 +179,7 @@ class API extends Server{
     try{
       let result = await this.axios('post', '/hsbc/identify/ocr/callback', params); 
       console.log(result)
-      if(result && (result.data instanceof Object) && result.code === 200){
+      if(result && (result.data instanceof Object) && (result.code === 200 || result.code == 30002 || result.code == 20002 || result.code == 40002 || result.code == 50002)){
         return result||[];
       }else{
         let err = {

package/packages/demo/demo.js

@@ -7,16 +7,16 @@ class Demo extends Component {
     shareMask: false,
     imRoomId
     : 
-    "IZLZMoTxj@conference.ls-im-xmpp.chinawp.dev.ali.cloud.cn.hsbc",
+    "zuQwaI8vq@conference.ls-im-xmpp.chinawp.dev.ali.cloud.cn.hsbc",
     sessionId
     : 
-    "IZLZMoTxj",
+    "zuQwaI8vq",
     mtoken
 : 
-"bc084d8a922f",
+"56f7485985f4",
 roomId
 : 
-"663912632731275",
+"665293795986281",
     // roomId: '',
     // mtoken: '',
     // imRoomId: '',

package/packages/pages/video/video.jsx

@@ -352,7 +352,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.6&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.8&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -513,7 +513,6 @@ class Video extends Component {
     console.log(JSON.parse(window.sessionStorage.getItem('sigData')));
     // eslint-disable-next-line no-undef
     // initWebSocket('wss://im.uat.dsp.hsbcfts.com.cn:443/wealth/im/ws/')
-    // initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + '15603' + '/ws/');
     if (!this.state.imStatus) {
       this.state.manualClose = false
       initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + JSON.parse(window.sessionStorage.getItem('sigData')).webPort + '/ws/');
@@ -777,26 +776,20 @@ class Video extends Component {
   };
   errorCodeClick=(type,value)=>{
     if(type == 'ocr'){
-      if(value == 100701 || value == 100702 || value == 200001 || value == 300901 || value == 300902 || value == 400001) {
+      if(value == -1007 || value == -100701 || value == -100702 || value == -200001 || value == -300901 || value == -300902 || value == -400001) {
         this.setState({
           cardFailReason: '证件图片不清晰，请重试。返回重拍时，请检查并确保身份证件图片信息完整清晰后再提交核查。[#'+value+'#]'
         })
-      }
-      if(value == 100803 || value == 100804 || value == 100805) {
-        this.setState({
-          cardFailReason: '证件信息核查失败，请重试。返回重拍时，请检查并确保身份证件图片信息完整清晰后再提交核查。[#'+value+'#]'
-        })
-      }
-      if(value == 100801 || value == 100802) {
+      } else if(value == -1001 || value == -1002|| value == -1003||value == -1004||value == -1005||value==-1006) {
         this.setState({
           cardFailReason: '系统或网络连接异常，请重试。若仍有问题，请联系Support同事。[#'+value+'#]'
         })
-      }
-      if(value == 30002) {
+      }else {
         this.setState({
-          cardFailReason: '识别成功-证件已过期。[#'+value+'#]'
+          cardFailReason: '证件信息核查失败，请重试。返回重拍时，请检查并确保身份证件图片信息完整清晰后再提交核查。[#'+value+'#]'
         })
       }
+      
     } else if(type == 'face') {
       if(value == 201 || value == 202 || value == 203 || value == 401 || value == 428) {
         this.setState({
@@ -833,7 +826,7 @@ class Video extends Component {
         fileBase64: this.state.facialImg.replace(/^data:image\/\w+;base64,/, "")
       });
       console.log(result);
-      if (result.code == 200 || result.code == 201) {
+      if (result.code == 200 || result.code == 210) {
         // this.messageClick('人脸识别成功','success')
         this.setState({
           loadingFace: false,
@@ -3878,7 +3871,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.9.6')
+    console.log('hsbc_teller_sdk', '1.9.8')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4322,8 +4315,8 @@ class Video extends Component {
         fileBase64: val == 1 ? this.state.facialImgFront.replace(/^data:image\/\w+;base64,/, "") : this.state.facialImgBack.replace(/^data:image\/\w+;base64,/, ""),
         type: val == 1 ? true : false
       });
-      if (result.code == 200) {
-        console.log('ocrCallback', result.data)
+      if (result.code === 200 || result.code == 30002 || result.code == 20002 || result.code == 40002 || result.code == 50002) {
+        console.log('ocrCallback', result.data,val)
         // this.messageClick('姓名：' + result.data.idCardName + ',身份证号：' + result.data.idCardNumber,'success')
         // this.messageClick('识别成功','success')
         callNimIM('sendCustomCmdMsg', {
@@ -4336,15 +4329,27 @@ class Video extends Component {
           })
         });
         if(this.state.documentType == 'ID_CARD') {
-          if (result.data.side == 'front') {
+          if (result.data.side == 'front' && val == 1) {
             if(this.state.certificateValidity) {
-              this.setState({
-                idCardNumber: result.data.idCardNumber,
-                idCardName: result.data.idCardName,
-                loadingFace: false,
-                cardFailReason: '',
-                cardResuly: 'success',
-              })
+              if(this.dateNewTime(this.state.certificateValidity.split('-')[1])){
+                this.setState({
+                  idCardNumber: result.data.idCardNumber,
+                  idCardName: result.data.idCardName,
+                  loadingFace: false,
+                  cardFailReason: '',
+                  cardResuly: 'success',
+                })
+              } else {
+                this.setState({
+                  idCardNumber: result.data.idCardNumber,
+                  idCardName: result.data.idCardName,
+                  certificateValidityType: false,
+                  cardFailReason: '证件已过期[#'+result.code+'#]',
+                  loadingFace: false,
+                  cardResuly: 'success',
+                })
+              }
+              
             } else {
               this.setState({
                 // isModalVisibleFacial: false
@@ -4353,38 +4358,40 @@ class Video extends Component {
               })
               this.ocrCallback(2)
             }
-          } else if (result.data.side == 'back') {
-            console.log(result.data.startDate, result.data.endDate)
-            if(this.state.idCardName && this.dateNewTime(result.data.endDate.split('-')[1])) {
+          } else if (result.data.side == 'back' &&  val != 1) {
+            let startDate
+            let endDate
+            if(result.code == 20002) {
+              startDate = result.data.idCard.startDate
+              endDate = result.data.idCard.endDate
+            } else {
+              startDate = result.data.startDate
+              endDate = result.data.endDate
+            }
+            console.log(startDate, endDate)
+            if(this.state.idCardName && this.dateNewTime(endDate)) {
               this.setState({
-                certificateValidity: result.data.startDate + '-' + result.data.endDate,
+                certificateValidity: startDate + '-' + endDate,
                 loadingFace: false,
                 cardFailReason: '',
                 cardResuly: 'success',
                 certificateValidityType: true,
               })
-            } else if(this.state.idCardName && !this.dateNewTime(result.data.endDate.split('-')[1])) {
+            } else if(this.state.idCardName && !this.dateNewTime(endDate)) {
               this.setState({
-                certificateValidity: result.data.startDate + '-' + result.data.endDate,
+                certificateValidity: startDate + '-' + endDate,
                 loadingFace: false,
                 certificateValidityType: false,
-                cardFailReason: '证件不在有效期内',
-                cardResuly: 'fail',
-              })
-            } else if(!this.state.idCardName && this.dateNewTime(result.data.endDate.split('-')[1])) {
-              this.setState({
-                certificateValidity: result.data.startDate + '-' + result.data.endDate,
-              })
-              this.ocrCallback(2)
-            } else if(!this.state.idCardName && !this.dateNewTime(result.data.endDate.split('-')[1])) {
-              this.setState({
-                certificateValidity: result.data.startDate + '-' + result.data.endDate,
-                loadingFace: false,
-                certificateValidityType: false,
-                cardFailReason: '证件不在有效期内',
-                cardResuly: 'fail',
+                cardFailReason: '证件已过期[#'+result.code+'#]',
+                cardResuly: 'success',
               })
             }
+            //  else if(!this.state.idCardName) {
+            //   this.setState({
+            //     certificateValidity: result.data.startDate + '-' + result.data.endDate,
+            //   })
+            //   this.ocrCallback(2)
+            // }
             // if(this.state.idCardName) {
             //   this.setState({
             //     certificateValidity: result.data.startDate + '-' + result.data.endDate,
@@ -4398,6 +4405,12 @@ class Video extends Component {
             //   })
             //   this.ocrCallback(2)
             // }
+          } else {
+            this.setState({
+              loadingFace: false,
+              cardFailReason: '证件截取顺序有误，请返回重拍[41000]',
+              cardResuly: 'fail',
+            })
           }
         }
         if(this.state.documentType == 'HK_MO_RESIDENCE_CARD' || this.state.documentType == 'TW_RESIDENCE_CARD') {
@@ -4413,7 +4426,7 @@ class Video extends Component {
             this.setState({
               certificateValidity: result.data.resident.startDate + '-' + result.data.resident.endDate,
               loadingFace: false,
-              cardFailReason: '',
+              cardFailReason: result.code == 40002 ? '证件已过期[#'+result.code+'#]' : '',
               cardResuly: 'success',
             })
           }
@@ -4424,7 +4437,7 @@ class Video extends Component {
             idCardName: result.data.passport.nameEN,
             certificateValidity: result.data.passport.expiryDate,
             loadingFace: false,
-            cardFailReason: '',
+            cardFailReason: result.code == 30002 ? '证件已过期[#'+result.code+'#]' : '',
             cardResuly: 'success',
           })
         }
@@ -4435,7 +4448,7 @@ class Video extends Component {
             idCardName: result.data.permission.nameEN,
             certificateValidity: result.data.permission.validDate,
             loadingFace: false,
-            cardFailReason: '',
+            cardFailReason: result.code == 50002 ? '证件已过期[#'+result.code+'#]' : '',
             cardResuly: 'success',
           })
         }
@@ -5390,7 +5403,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId2').innerText).uid
         })
       });
     } if (value == 'video3') {
@@ -5399,7 +5412,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId3').innerText).uid
         })
       });
     } if (value == 'video4') {
@@ -5408,7 +5421,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId4').innerText).uid
         })
       });
     } if (value == 'video5') {
@@ -5417,7 +5430,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId5').innerText).uid
         })
       });
     } if (value == 'video6') {
@@ -5426,7 +5439,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId6').innerText).uid
         })
       });
     } if (value == 'video7') {
@@ -5435,7 +5448,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId7').innerText).uid
         })
       });
     } if (value == 'video8') {
@@ -5444,7 +5457,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId8').innerText).uid
         })
       });
     } if (value == 'video9') {
@@ -5453,7 +5466,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId9').innerText).uid
         })
       });
     }
@@ -5463,7 +5476,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId10').innerText).uid
         })
       });
     }
@@ -5473,7 +5486,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId11').innerText).uid
         })
       });
     }
@@ -5483,7 +5496,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId12').innerText).uid
         })
       });
     }
@@ -5680,14 +5693,25 @@ class Video extends Component {
     }
   }
   saveAuthorize = async (appAccount) => {
-    try {
-      let result = await API.saveAuthorize({
+    let obj 
+    if(this.state.documentType == 'ID_CARD') {
+      obj = {
         activityId: this.props.businessNumber,
-        authorizeType: this.state.documentType == 'ID_CARD' ? 'ID' : 'NID',
+        authorizeType: 'ID',
         appAccount: appAccount,
-        idCardAuthorize: this.state.documentType == 'ID_CARD' ? 'YES' : '',
+        idCardAuthorize: 'YES',
         pictureAuthorize: 'YES'
-      });
+      }
+    } else {
+      obj = {
+        activityId: this.props.businessNumber,
+        authorizeType: 'NID',
+        appAccount: appAccount,
+        pictureAuthorize: 'YES'
+      }
+    }
+    try {
+      let result = await API.saveAuthorize(obj);
       console.log(result)
       if (result.code == 200) {
         console.log('成功')
@@ -6344,6 +6368,7 @@ class Video extends Component {
             graffiti={this.graffiti}
             virtualization={this.virtualization}
           ></Foot>
+          {/* 暂停恢复会话 */}
           <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
             onCancel={this.handleCancel}>
             {
@@ -6353,6 +6378,7 @@ class Video extends Component {
               !this.state.isSuspend && <span>确定是否暂停会话？</span>
             }
           </Modal>
+          {/* 是否退出会议*/}
           <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} footer={[
             <div key='end'>
               <Button className="modelButtonCancel" onClick={this.handleCancelEnd}>取消</Button>
@@ -6361,10 +6387,13 @@ class Video extends Component {
           ]}>
             <div className='endModal'>是否要结束并退出会议？</div>
           </Modal>
+          {/* ocr及人脸 */}
           <Modal title={this.state.titleModal} width={650} closable={false} 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>
+              {/* 再截图后按钮高亮 */}
               {
                 this.state.isFaceImage && <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>下一步</Button>
               }
@@ -6373,6 +6402,7 @@ class Video extends Component {
               }
 
             </div>,
+            // 人脸识别后的结果界面的按钮
             this.state.cardResuly == '' && this.state.faceResuly != ''  &&<div key='facial'>
               <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>完成</Button>
               {
@@ -6384,6 +6414,7 @@ class Video extends Component {
             
 
           </div>,
+          // ocr成功
             this.state.cardResuly == 'success' && <div key='facial'>
               {
                 this.state.disabledIdCard && <Button className="modelButtonFaceOk" danger onClick={(e) => this.updateConfirm('noFace')}>修改</Button>
@@ -6399,6 +6430,7 @@ class Video extends Component {
               }
               
             </div>,
+            // ocr失败
             this.state.cardResuly == 'fail' && <div key='facial'>
               <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
               <Button className="modelButtonOk" type="primary" danger onClick={this.newFaceClick}>返回重拍</Button>
@@ -6435,8 +6467,14 @@ class Video extends Component {
                     {
                       this.state.cardResuly == 'success' && <div className='successClassFace'>
                         <img src={require("../../assets/img/tooltips1_pass.png").default} alt="" ></img>
-          
-                        识别成功</div>
+                        {
+                          this.state.cardFailReason && <span>识别成功 -- {this.state.cardFailReason}</span>
+                        }
+                        {
+                          !this.state.cardFailReason && <span>识别成功</span>
+                        }
+                        
+                        </div>
                     }
                     {
                       this.state.cardResuly == 'fail' && <div className='errorClassFace'>

package/packages/pages/video/video.less

@@ -176,7 +176,7 @@
       }
       span{
         display: inline-block;
-        width: 5rem;
+        min-width: 5rem;
       }
     }
   }