react_hsbc_teller 1.9.1 → 1.9.2

package/package.json

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

package/packages/pages/video/video.jsx

@@ -15,6 +15,8 @@ import cameraImgCloe from '../../assets/img/icon_cameraOne.png'
 import beautyImg from '../../assets/img/whiteningLut.jpg'
 import ocrImage from '../../assets/img/jietu.png'
 import autod from '../../assets/mp3/joinmeeting.mp3'
+import internalJoin from '../../assets/mp3/internalJoin.mp3'
+import internalLeft from '../../assets/mp3/internalLeft.mp3'
 import leftMetting from '../../assets/mp3/leftmeeting.mp3'
 import errorPng from '../../assets/img/tooltips2_fail.png'
 import { callNimIM } from '../../utils/cell.js'
@@ -61,6 +63,7 @@ let isBackgroundBlur = true
 let isSuccuseHs = false
 let isGraffiti = false
 let strokeColor = '#333'
+let clearTime
 let CanvasHome = styled.div`
   position: fixed;
   z-index: ${props => props.zIndexNum};
@@ -340,6 +343,7 @@ class Video extends Component {
     faceFailReason: '',
     cardResuly: '',
     cardFailReason: '',
+    videoType: ''
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -347,7 +351,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.1&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.2&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -434,7 +438,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.saveLog('imgCallback success' + result.data.type)
       this.props.imgCallback({
         type: result.data.type + '',
         file: result.data.base64Image,
@@ -879,7 +883,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoOneName,
         tourist: false
       })
     }
@@ -889,7 +893,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoTwoName,
         tourist: false
       })
     }
@@ -899,7 +903,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoThreeName,
         tourist: false
       })
     }
@@ -909,7 +913,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoFourName,
         tourist: false
       })
     }
@@ -919,7 +923,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoFiveName,
         tourist: false
       })
     }
@@ -928,7 +932,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoSixName,
         tourist: false
       })
     }
@@ -936,7 +940,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoSevenName,
         tourist: false
       })
     }
@@ -944,7 +948,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoEightName,
         tourist: false
       })
     }
@@ -952,7 +956,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoNineName,
         tourist: false
       })
     }
@@ -960,15 +964,15 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoTenName,
         tourist: false
       })
     }
-    if (document.getElementById('video11').name && !this.state.isPIBIntranet[10].type) {
+    if (document.getElementById('video11').name  && !this.state.isPIBIntranet[10].type) {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoElevenName,
         tourist: false
       })
     }
@@ -976,7 +980,7 @@ class Video extends Component {
       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 + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
+        name: this.state.videoTwelveName,
         tourist: false
       })
     }
@@ -989,10 +993,15 @@ class Video extends Component {
         console.log('this.state.customerList.length',list.length)
         this.setState({
           documentType: '',
-          isModalVisibleCustomer: true,
           isCustomerSelect: true,
-          customerSelect: list.length == 1 ? 0 : '',
+          customerSelect: list.length == 1 ? 1 : '',
+
           customerTitleName: '客户身份识别'
+        },()=>{
+          console.log(this.state.customerSelect)
+          this.setState({
+            isModalVisibleCustomer: true,
+          })
         })
       } else if (val == 'facial') {
         this.setState({
@@ -2235,7 +2244,7 @@ class Video extends Component {
       if (JSON.parse(msg).typeId == 33001 && this.state.sessionId == JSON.parse(msg).data.sessionId) {
         if (JSON.parse(msg).type == 1) {
           this.saveAuthorize(JSON.parse(msg).data.userId)
-          this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+          this.customerFaceClick(this.state.customerList[this.state.customerSelect - 1])
         }
       }
     }
@@ -2767,10 +2776,19 @@ class Video extends Component {
     this.test_controller.OnNewJoinerIn = (participant) => {
       console.log('新加⼊房间者', participant);
       this.state.isCustomer = true
+      
       if (this.props.isOpenSound) {
-        let src = autod
-        let audio = new Audio(src)
-        audio.play()
+        this.appGetUsernameClick(participant).then((res) => {
+          if (res.userType == 1) {
+            let src = autod
+            let audio = new Audio(src)
+            audio.play()
+          } else if (res.userType == 2) {
+            let src = internalJoin
+            let audio = new Audio(src)
+            audio.play()
+          }
+        })
       }
 
       // let src = autod
@@ -3191,12 +3209,12 @@ class Video extends Component {
       exitType
     ) => {
       console.log('退出房间者', participant, exitType)
-      if (this.props.isOpenSound) {
-        let src = leftMetting
-        let audio = new Audio(src)
-        audio.play()
-      }
-
+      // if (this.props.isOpenSound) {
+      //   let src = leftMetting
+      //   let audio = new Audio(src)
+      //   audio.play()
+      // }
+      
 
       this.appGetUsernameClick(participant).then((res) => {
         console.log('退出房间者', res)
@@ -3209,7 +3227,18 @@ class Video extends Component {
             userId: participant,
             userType: '1'
           })
-        }
+          if (this.props.isOpenSound) {
+            let src = leftMetting
+            let audio = new Audio(src)
+            audio.play()
+          }
+        } else if (res.userType == 2) {
+          if (this.props.isOpenSound) {
+            let src = internalLeft
+            let audio = new Audio(src)
+            audio.play()
+          }
+        } 
         // console.log('退出房间者',res)
         // let data = res? res : '客户'
         // console.log(data)
@@ -3837,7 +3866,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.9.1')
+    console.log('hsbc_teller_sdk', '1.9.2')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4258,8 +4287,7 @@ class Video extends Component {
             isFaceImage: false
             })
           })
-          const videoMedia = document.getElementById('publish_video_2');
-          videoMedia.srcObject = document.getElementById(videoName).srcObject
+          this.publishVideoTwo()
         }
       
       } else {
@@ -4343,7 +4371,7 @@ class Video extends Component {
   }
   handleOkFacial = () => {
     if (this.state.faceCustomerType == 2) {
-      if (this.state.IDtypeFrontOrBack == '请截取证件正面') {
+      if (this.state.IDtypeFrontOrBack == '请截取证件头像面') {
         if(this.state.documentType == 'PASSPORT_CARD') {
           this.setState({
             loadingFace: true
@@ -4352,12 +4380,12 @@ class Video extends Component {
         } else {
           this.setState({
             facialImg: ocrImage,
-            IDtypeFrontOrBack: '请截取证件反面',
+            IDtypeFrontOrBack: '请截取证件国徽面',
             isFaceImage: false,
           })
         }
         
-      } else if (this.state.IDtypeFrontOrBack == '请截取证件反面') {
+      } else if (this.state.IDtypeFrontOrBack == '请截取证件国徽面') {
         this.setState({
           loadingFace: true
         })
@@ -4391,6 +4419,25 @@ class Video extends Component {
       isModalVisibleFacial: false
     })
   };
+  publishVideoTwo=()=>{
+    const videoMedia = document.getElementById('publish_video_2');
+        videoMedia.srcObject = document.getElementById(videoName).srcObject
+        clearTime = setTimeout(() => {
+          if(this.state.videoType == '') {
+            this.setState({
+              videoType: 'error'
+            })
+            
+          }
+        }, 9000)
+        videoMedia.onloadeddata = () => {
+          console.log('success_publish_video_2')
+          this.setState({
+            videoType: 'success'
+          })
+          clearTimeout(clearTime)
+        }
+  }
   newFaceClick=()=>{
     callNimIM('sendCustomCmdMsg', {
       customId: this.state.imRoomId,
@@ -4407,7 +4454,7 @@ class Video extends Component {
       isFaceImage: false,
       facialImg: ocrImage,
       disabledIdCard: true,
-      IDtypeFrontOrBack: '请截取证件正面',
+      IDtypeFrontOrBack: '请截取证件头像面',
       facialImgFront: '',
       facialImgBack: '',
       faceResuly: '',
@@ -4416,8 +4463,7 @@ class Video extends Component {
       cardFailReason: '',
       cardResuly: '',
     }, () => {
-        const videoMedia = document.getElementById('publish_video_2');
-        videoMedia.srcObject = document.getElementById(videoName).srcObject
+        this.publishVideoTwo()
     })
   }
   ReIdentification = () =>{
@@ -4426,8 +4472,7 @@ class Video extends Component {
             facialImg: ocrImage,
             isFaceImage: false
             },()=>{
-              const videoMedia = document.getElementById('publish_video_2');
-          videoMedia.srcObject = document.getElementById(videoName).srcObject
+             this.publishVideoTwo()
             })
           
   }
@@ -4571,7 +4616,7 @@ class Video extends Component {
         isFaceImage: false,
         facialImg: ocrImage,
         disabledIdCard: true,
-        IDtypeFrontOrBack: '请截取证件正面',
+        IDtypeFrontOrBack: '请截取证件头像面',
         facialImgFront: '',
         facialImgBack: '',
         faceResuly: '',
@@ -4585,23 +4630,19 @@ class Video extends Component {
         this.setState({
           isModalVisibleFacial: true,
         }, () => {
-          const videoMedia = document.getElementById('publish_video_2');
-          videoMedia.srcObject = document.getElementById(videoName).srcObject
-          videoMedia.onloadeddata = function() {
-            console.log('onerror')
-          }
+          this.publishVideoTwo()
         })
       })
     }
   }
   sgsinImage = () => {
-    if (this.state.IDtypeFrontOrBack == '请截取证件正面') {
+    if (this.state.IDtypeFrontOrBack == '请截取证件头像面') {
       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 == '请截取证件国徽面') {
       this.setState({
         facialImg: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png'),
         isFaceImage: true,
@@ -5403,26 +5444,26 @@ class Video extends Component {
     this.setState({
       documentType: '',
       isCustomerSelect: true,
-      customerSelect: this.state.customerList.length == 1 ? 0 : '',
+      customerSelect: this.state.customerList.length == 1 ? 1 : '',
       customerTitleName: '客户身份识别'
     })
   }
   handleOkCustomer = () => {
     if (this.state.isCustomerSelect) {
-      if (this.state.customerList[this.state.customerSelect].tourist) {
-        this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+      if (this.state.customerList[this.state.customerSelect - 1].tourist) {
+        this.customerFaceClick(this.state.customerList[this.state.customerSelect - 1])
       } else {
         this.setState({
           isCustomerSelect: false,
           documentError: '',
-          customerTitleName: this.state.customerList[this.state.customerSelect].name
+          customerTitleName: this.state.customerList[this.state.customerSelect - 1].name
         })
       }
 
     } else {
-      this.getAuthorizeResult(this.state.customerList[this.state.customerSelect].customId).then((res) => {
+      this.getAuthorizeResult(this.state.customerList[this.state.customerSelect - 1].customId).then((res) => {
         if (res) {
-          this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+          this.customerFaceClick(this.state.customerList[this.state.customerSelect - 1])
           this.setState({
             isModalVisibleCustomer: false,
           })
@@ -5432,7 +5473,7 @@ class Video extends Component {
               'typeId': 3300,
               "data": {
                 'sessionId': this.state.sessionId,
-                'userId': this.state.customerList[this.state.customerSelect].customId,
+                'userId': this.state.customerList[this.state.customerSelect - 1].customId,
                 'title': '为了有效确认客户身份，请您配合进行我行的身份识别和核验。请您阅读以下内容，若您同意，请您之后在摄像头前出示您的身份证件，我行将对您的身份证件拍照并采集证件信息；同时，我行会对您进行脸部拍照，采集您的脸部图像。',
                 'list': [
                   {
@@ -5452,7 +5493,7 @@ class Video extends Component {
               'typeId': 3300,
               "data": {
                 'sessionId': this.state.sessionId,
-                'userId': this.state.customerList[this.state.customerSelect].customId,
+                'userId': this.state.customerList[this.state.customerSelect - 1].customId,
                 'title': '为了有效确认客户身份，请您配合进行我行的身份识别。请您阅读以下内容，若您同意，请您之后在摄像头前出示您的身份证件，我行将对您的身份证件拍照并采集证件信息；',
                 'list': [
                   {
@@ -6204,8 +6245,13 @@ class Video extends Component {
               {
                 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>
+              {
+                this.state.documentType == 'ID_CARD' && <Button className="modelButtonFaceOk" danger onClick={(e) => this.confirmCallback('face')}>完成并发起人脸识别</Button>
+              }
+              {
+                this.state.documentType != 'ID_CARD' && <Button className="modelButtonOk" type="primary" danger onClick={(e) => this.confirmCallback('noFace')}>完成</Button>
+              }
+              
             </div>,
             this.state.cardResuly == 'fail' && <div key='facial'>
               <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
@@ -6229,6 +6275,10 @@ class Video extends Component {
                   {
                     this.state.faceResuly == '' && <span>
                       <div>
+                        {
+                          this.state.videoType == 'error' && <div className='errorClassFace'>
+                          <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>客户视频异常，请重试</div>
+                        }
                         <video className="faceImg" id="publish_video_2" autoPlay muted={true}></video>
                       </div>
                       <img className="faceImg" src={this.state.facialImg} alt=""></img>
@@ -6285,7 +6335,13 @@ class Video extends Component {
             footer={[
               <div key='end'>
                 <Button className="modelButtonCancel" onClick={this.handleCancelSFP}>取消</Button>
-                <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSFP}>确定</Button>
+                {
+                  this.state.StaffidSFP &&  this.state.PasswordSFP && <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSFP}>确定</Button>
+                }
+                {
+                  (this.state.StaffidSFP == '' ||  this.state.PasswordSFP == '') && <Button className="modelButtonNo" type="primary" danger >确定</Button>
+                }
+                
               </div>
             ]}>
               <Spin spinning={this.state.loadingStaff} tip="授权中...">
@@ -6317,12 +6373,27 @@ class Video extends Component {
                   !this.state.isCustomerSelect && <Button className="modelButtonCancel" onClick={this.goBackSelectCustomer}>上一步</Button>
                 }
                 <Button className="modelButtonCancel" onClick={this.handleCancelCustomer}>取消</Button>
-                {/* {
-                  this.state.customerSelect == '' && <Button className="modelButtonCancel">下一步</Button>
-                } */}
                 {
-                  <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkCustomer}>下一步</Button>
+                  this.state.isCustomerSelect && <span>
+                    {
+                      this.state.customerSelect == '' && <Button className="modelButtonNo modelNoButton" type="primary" danger>下一步</Button>
+                    }
+                    {
+                      this.state.customerSelect != '' && <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkCustomer}>下一步</Button>
+                    }
+                  </span>
                 }
+                {
+                  !this.state.isCustomerSelect&& <span>
+                    {
+                  this.state.documentType == '' && <Button className="modelButtonNo modelNoButton" type="primary" danger>下一步</Button>
+                }
+                {
+                  this.state.documentType != '' &&<Button className="modelButtonOk" type="primary" danger onClick={this.handleOkCustomer}>下一步</Button>
+                }
+                  </span>
+                }
+                
               </div>
             ]}>
             <div>
@@ -6338,7 +6409,7 @@ class Video extends Component {
                           {
                             this.state.customerList.map((item, index) => {
                               // if(item.name.indexOf("访客") != -1) {
-                                return <Radio value={index}>{item.name}</Radio>
+                                return <Radio value={index + 1}>{item.name}</Radio>
                               // }
                             })
                           }

package/packages/pages/video/video.less

@@ -165,7 +165,7 @@
     div{
       font-size: 16Px;
       color: #646464;
-      margin: 20Px;
+      margin: 10Px 20Px;
       input{
         border: #DCDCDC 1px solid;
         width: 15rem;
@@ -355,6 +355,9 @@
   background: #fff!important;
   border-spacing: 20px!important;
 }
+.modelNoButton{
+  margin-left: 10px;
+}
 .modelButtonCancelOne{
   width: 170px!important;
   height: 40px!important;
@@ -563,8 +566,8 @@
 margin: 0 40px;
 }    
 .faceImgCard{
-  width: 20rem;
-  margin-right: 3Px;
+  width: 25rem;
+  margin-bottom: 10px;
 }
 .titleDiv{
   font-size: 1.4rem;
@@ -582,4 +585,5 @@ display: inline-flex;
 }
 .imgDIV{
   margin: 0 !important;
+  text-align:center;
 }