react_hsbc_teller 1.9.6 → 1.9.7

package/package.json

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

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",
+    "vVwWYL84k@conference.ls-im-xmpp.chinawp.dev.ali.cloud.cn.hsbc",
     sessionId
     : 
-    "IZLZMoTxj",
+    "vVwWYL84k",
     mtoken
 : 
-"bc084d8a922f",
+"d6544d018d07",
 roomId
 : 
-"663912632731275",
+"664439964321531",
     // 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.7&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -792,7 +792,7 @@ class Video extends Component {
           cardFailReason: '系统或网络连接异常，请重试。若仍有问题，请联系Support同事。[#'+value+'#]'
         })
       }
-      if(value == 30002) {
+      if(value == 30002 || value == 20002 || value == 40002 || value == 50002 ) {
         this.setState({
           cardFailReason: '识别成功-证件已过期。[#'+value+'#]'
         })
@@ -833,7 +833,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 +3878,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.9.6')
+    console.log('hsbc_teller_sdk', '1.9.7')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4338,13 +4338,25 @@ class Video extends Component {
         if(this.state.documentType == 'ID_CARD') {
           if (result.data.side == 'front') {
             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: '证件不在有效期内',
+                  loadingFace: false,
+                  cardResuly: 'success',
+                })
+              }
+              
             } else {
               this.setState({
                 // isModalVisibleFacial: false
@@ -4355,7 +4367,7 @@ class Video extends Component {
             }
           } 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])) {
+            if(this.state.idCardName && this.dateNewTime(result.data.endDate)) {
               this.setState({
                 certificateValidity: result.data.startDate + '-' + result.data.endDate,
                 loadingFace: false,
@@ -4363,27 +4375,19 @@ class Video extends Component {
                 cardResuly: 'success',
                 certificateValidityType: true,
               })
-            } else if(this.state.idCardName && !this.dateNewTime(result.data.endDate.split('-')[1])) {
+            } else if(this.state.idCardName && !this.dateNewTime(result.data.endDate)) {
               this.setState({
                 certificateValidity: result.data.startDate + '-' + result.data.endDate,
                 loadingFace: false,
                 certificateValidityType: false,
                 cardFailReason: '证件不在有效期内',
-                cardResuly: 'fail',
+                cardResuly: 'success',
               })
-            } else if(!this.state.idCardName && this.dateNewTime(result.data.endDate.split('-')[1])) {
+            } else if(!this.state.idCardName) {
               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',
-              })
             }
             // if(this.state.idCardName) {
             //   this.setState({
@@ -5390,7 +5394,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 +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('feedId3').innerText).uid
         })
       });
     } if (value == 'video4') {
@@ -5408,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('feedId4').innerText).uid
         })
       });
     } if (value == 'video5') {
@@ -5417,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('feedId5').innerText).uid
         })
       });
     } if (value == 'video6') {
@@ -5426,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('feedId6').innerText).uid
         })
       });
     } if (value == 'video7') {
@@ -5435,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('feedId7').innerText).uid
         })
       });
     } if (value == 'video8') {
@@ -5444,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('feedId8').innerText).uid
         })
       });
     } if (value == 'video9') {
@@ -5453,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('feedId9').innerText).uid
         })
       });
     }
@@ -5463,7 +5467,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 +5477,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 +5487,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
         })
       });
     }
@@ -6435,8 +6439,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'>