react_hsbc_teller 1.8.5 → 1.8.6

package/package.json

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

package/packages/pages/video/video.jsx

@@ -318,7 +318,12 @@ class Video extends Component {
     isCustomerSelect: true,
     customerTitleName: '客户身份识别',
     certificateType: 'identityCard',
-    customerName: ''
+    customerName: '',
+    IDtypeFrontOrBack: '',
+    disabledIdCard: true,
+    isModalVisibleSFP: false,
+    StaffidSFP: '',
+    PasswordSFP: ''
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -326,7 +331,7 @@ class Video extends Component {
   saveLog=(val)=>{
     axios({
       method: 'get',
-        baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.8.4&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId),
+        baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.8.6&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
         
     }).then(res => {
       
@@ -413,6 +418,7 @@ class Video extends Component {
       let result = await API.getBase64Image({ fileName: data});
       console.log('getBase64Image',result)
       this.tabTitlesClick('customerScreen', 'delect')
+      this.saveLog('imgCallback success' + Mival.data.type)
       this.props.imgCallback({
         type: result.data.type + '', 
         file: result.data.base64Image,
@@ -840,14 +846,6 @@ class Video extends Component {
         name: this.state.videoOneName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoOneName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).uid,
-          name: this.state.videoOneName + '--查询客户',
-          tourist: true
-        })
-      }
     }
     if (document.getElementById('video2').name && !this.state.isPIBIntranet[1].type) {
       console.log(this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText))
@@ -858,14 +856,6 @@ class Video extends Component {
         name: this.state.videoTwoName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoTwoName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).uid,
-            name: this.state.videoTwoName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video3').name && !this.state.isPIBIntranet[2].type) {
       console.log(this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText))
@@ -876,14 +866,6 @@ class Video extends Component {
         name: this.state.videoThreeName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoThreeName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).uid,
-            name: this.state.videoThreeName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video4').name && !this.state.isPIBIntranet[3].type) {
       console.log(this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText))
@@ -894,14 +876,6 @@ class Video extends Component {
         name: this.state.videoFourName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoFourName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).uid,
-            name: this.state.videoFourName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video5').name && !this.state.isPIBIntranet[4].type) {
       console.log(this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText))
@@ -912,14 +886,6 @@ class Video extends Component {
         name: this.state.videoFiveName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoFiveName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).uid,
-            name: this.state.videoFiveName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video6').name && !this.state.isPIBIntranet[5].type) {
       console.log(this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText))
@@ -929,14 +895,6 @@ class Video extends Component {
         name: this.state.videoSixName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoSixName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid,
-            name: this.state.videoSixName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video7').name && !this.state.isPIBIntranet[6].type) {
       list.push({
@@ -945,14 +903,6 @@ class Video extends Component {
         name: this.state.videoSevenName +  (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoSevenName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).uid,
-            name: this.state.videoSevenName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video8').name && !this.state.isPIBIntranet[7].type) {
       list.push({
@@ -961,14 +911,6 @@ class Video extends Component {
         name: this.state.videoEightName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoEightName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).uid,
-            name: this.state.videoEightName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video9').name && !this.state.isPIBIntranet[8].type) {
       list.push({
@@ -977,14 +919,6 @@ class Video extends Component {
         name: this.state.videoNineName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoNineName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).uid,
-            name: this.state.videoNineName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video10').name && !this.state.isPIBIntranet[9].type) {
       list.push({
@@ -993,14 +927,6 @@ class Video extends Component {
         name: this.state.videoTenName +(this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoTenName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).uid,
-            name: this.state.videoTenName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video11').name && !this.state.isPIBIntranet[10].type) {
       list.push({
@@ -1009,14 +935,6 @@ class Video extends Component {
         name: this.state.videoElevenName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoElevenName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).uid,
-            name: this.state.videoElevenName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     if (document.getElementById('video12').name && !this.state.isPIBIntranet[11].type) {
       list.push({
@@ -1025,14 +943,6 @@ class Video extends Component {
         name: this.state.videoTwelveName + (this.state.faceCustomerType == 1 ? '--人脸识别' :'--OCR'),
         tourist: false
       })
-      if(this.state.videoTwelveName.indexOf("客户") == -1 && this.state.faceCustomerType == 2) {
-        list.push({
-          feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).feedId,
-          customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).uid,
-            name: this.state.videoTwelveName + '--查询客户',
-            tourist: true
-        })
-      }
     }
     console.log(list)
     this.setState({
@@ -1041,6 +951,7 @@ class Video extends Component {
     if (list.length > 0) {
       if (val == 'ocr') {
         this.setState({
+          documentType: '',
           isModalVisibleCustomer: true,
           isCustomerSelect: true,
           customerSelect: '',
@@ -1521,9 +1432,11 @@ class Video extends Component {
         if (Mival.sessionId == this.state.sessionId) {
           if (Mival.type == 1) {
             // 开启录制
+            this.saveLog('Start recording')
             this.enableServerRecording()
           } else if (Mival.type == 2) {
             // 关闭录制
+            this.saveLog('stop recording')
             this.test_controller.StopRemoteRecord(this.state.recordId)
           }
         }
@@ -1693,6 +1606,7 @@ class Video extends Component {
       else if (Mival.typeId == 1220) {
         // 一炒多的图片  1214
         if (Mival.sessionId == this.state.sessionId) {
+          this.saveLog('imgCallback success' + Mival.data.type)
           this.tabTitlesClick('customerScreen', 'delect')
           this.props.imgCallback({
             type: Mival.data.type + '', 
@@ -1706,6 +1620,7 @@ class Video extends Component {
         // 签字回调  1213
         if (Mival.sessionId == this.state.sessionId) {
           this.tabTitlesClick('customerScreen', 'delect')
+          this.saveLog('signatureCallback success')
           this.props.signatureCallback({
             errorType: 0
           })
@@ -1900,6 +1815,7 @@ class Video extends Component {
         }
       } else if (Mival.typeId == 121305) {
         if (Mival.sessionId == this.state.sessionId) {
+          this.saveLog('signatureCallback fail')
           this.props.signatureCallback({
             errorType: -1
           })
@@ -1907,6 +1823,7 @@ class Video extends Component {
       } else if (Mival.typeId == 121405) {
         if (Mival.sessionId == this.state.sessionId) {
           console.log('imgCallback')
+          this.saveLog('imgCallback fail')
           this.props.imgCallback({
             type: '', 
             file: '',
@@ -3850,7 +3767,7 @@ userType:'1'
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.8.1')
+    console.log('hsbc_teller_sdk', '1.8.6')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4171,6 +4088,34 @@ userType:'1'
       isModalVisibleEnd: false
     })
   };
+  updateConfirm=()=>{
+    this.setState({
+      isModalVisibleSFP: true,
+      StaffidSFP: '',
+      PasswordSFP: ''
+    })
+  }
+  handleCancelSFP=()=>{
+    this.setState({
+      isModalVisibleSFP: false
+    })
+  }
+  handleOkSFP=()=>{
+    this.setState({
+      isModalVisibleSFP: false,
+      disabledIdCard: false
+    })
+  }
+  handleChangeStaffid = (event) => {
+    this.setState({
+      StaffidSFP: event.target.value
+    })
+  }
+  handleChangePasswordd = (event) => {
+    this.setState({
+      PasswordSFP: event.target.value
+    })
+  }
   confirmCallback=async(data)=>{
     try {
       let result = await API.confirmCallback({
@@ -4370,30 +4315,43 @@ userType:'1'
       });
     }
     var sid
+    var videoName
     if (item.feedId == document.getElementById("feedId1").innerText) {
       sid = document.getElementById('video1').name;
+      videoName = 'video1'
     } else if (item.feedId == document.getElementById("feedId2").innerText) {
       sid = document.getElementById('video2').name;
+      videoName = 'video2'
     } else if (item.feedId == document.getElementById("feedId3").innerText) {
       sid = document.getElementById('video3').name;
+      videoName = 'video3'
     } else if (item.feedId == document.getElementById("feedId4").innerText) {
       sid = document.getElementById('video4').name;
+      videoName = 'video4'
     } else if (item.feedId == document.getElementById("feedId5").innerText) {
       sid = document.getElementById('video5').name;
+      videoName = 'video5'
     } else if (item.feedId == document.getElementById("feedId6").innerText) {
       sid = document.getElementById('video6').name;
+      videoName = 'video6'
     } else if (item.feedId == document.getElementById("feedId7").innerText) {
       sid = document.getElementById('video7').name;
+      videoName = 'video7'
     } else if (item.feedId == document.getElementById("feedId8").innerText) {
       sid = document.getElementById('video8').name;
+      videoName = 'video8'
     } else if (item.feedId == document.getElementById("feedId9").innerText) {
       sid = document.getElementById('video9').name;
+      videoName = 'video'
     } else if (item.feedId == document.getElementById("feedId10").innerText) {
       sid = document.getElementById('video10').name;
+      videoName = 'video10'
     } else if (item.feedId == document.getElementById("feedId11").innerText) {
       sid = document.getElementById('video11').name;
+      videoName = 'video11'
     } else if (item.feedId == document.getElementById("feedId12").innerText) {
       sid = document.getElementById('video12').name;
+      videoName = 'video12'
     }
     console.log(sid)
     this.state.customOcrSid = sid
@@ -4404,9 +4362,16 @@ userType:'1'
       clickedOcr: false,
       isFaceImage: false,
       facialImg: ocrImage,
+      disabledIdCard: true,
+      IDtypeFrontOrBack: '请截取证件正面'
     },()=>{
+      
+      
       this.setState({
       isModalVisibleFacial: true,
+    },()=>{
+      const videoMedia = document.getElementById('publish_video_2');
+      videoMedia.srcObject = document.getElementById(videoName).srcObject
     })
       })
   }
@@ -5422,7 +5387,7 @@ userType:'1'
           <canvas id="canvas" className="canvas"></canvas>
         </CanvasHome>
               <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMScreen' || this.state.isSelect == 'staffScreen') ? '' : 'none', }}>
-                <div className="videoDiv" style={{'text-align': 'center'}}>
+                <div className="videoDiv" style={{'textAlign': 'center'}}>
                   <video
                     id="video20"
                     autoPlay
@@ -5946,6 +5911,9 @@ userType:'1'
             
             </div>,
             this.state.idCardName && <div key='facial'>
+              {
+              this.state.disabledIdCard &&<Button className="modelButtonFaceOk" danger onClick={(e)=>this.updateConfirm('noFace')}>修改</Button>
+              }
               <Button className="modelButtonFaceOk" danger onClick={(e)=>this.confirmCallback('face')}>完成并发起人脸识别</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={(e)=>this.confirmCallback('noFace')}>完成</Button>
             </div>
@@ -5959,19 +5927,46 @@ userType:'1'
             } */}
             <div className='faceCardImg'>
               {/* <div>{this.state.IDtypeFrontOrBack}</div> */}
-              <img className="faceImg" src={this.state.facialImg} alt=""></img>
+              {
+                !this.state.idCardName &&<div>
+                <video className="faceImg" id="publish_video_2" autoPlay muted={true}></video> 
+              </div>
+              }
+                
+                <img className="faceImg" src={this.state.facialImg} alt=""></img>
             </div>
             {
               this.state.idCardName &&<div className='resuleCard'>
                 <div>证件信息确认</div>
-              <div><span>客户姓名</span>  <input type="text" value={this.state.idCardName} onChange={this.handleChangeIdCardName} /></div>
-          <div><span>身份证号</span>  <input type="text" value={this.state.idCardNumber} onChange={this.handleChangeIdCardNumber} /></div>
+              <div><span>客户姓名</span>  <input disabled={this.state.disabledIdCard} type="text" value={this.state.idCardName} onChange={this.handleChangeIdCardName} /></div>
+          <div><span>身份证号</span>  <input disabled={this.state.disabledIdCard} type="text" value={this.state.idCardNumber} onChange={this.handleChangeIdCardNumber} /></div>
             </div>
             }
             
               
             </div>
           </Modal>
+          <Modal title="经理人员授权（SFP双录同款）" closable={false} centered={true} visible={this.state.isModalVisibleSFP}
+            footer={[
+              <div key='end'>
+              <Button className="modelButtonCancel" onClick={this.handleCancelSFP}>取消</Button>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSFP}>确定</Button>
+              </div>
+            ]}>
+              <div className="faceBody">
+              <div className='resuleCard'>
+                <div>
+                  <span>Staffid</span>
+                  <input type="text" value={this.state.StaffidSFP} onChange={this.handleChangeStaffid}></input>
+                </div>
+                <div>
+                  <span>Password</span>
+                  <input type="text" value={this.state.PasswordSFP} onChange={this.handleChangePasswordd}></input>
+                </div>
+              </div>
+              </div>
+              
+            </Modal>
           <Modal title={this.state.customerTitleName} closable={false} centered={true} visible={this.state.isModalVisibleCustomer}
             footer={[
               <div key='end'>

package/packages/pages/video/video.less

@@ -173,6 +173,10 @@
         line-height: 2.5rem;
         margin-left: 15px;
       }
+      span{
+        display: inline-block;
+        width: 5rem;
+      }
     }
   }
 }