react_hsbc_teller 1.8.8 → 1.9.1

package/packages/pages/video/video.jsx

@@ -308,6 +308,7 @@ class Video extends Component {
     idCardName: '',
     idCardNameFace: '',
     idCardNumberFace: '',
+    certificateValidityFace: '',
     idCardNumber: '',
     certificateValidity: '',
     operateShow: false,
@@ -320,8 +321,9 @@ class Video extends Component {
     customerSelect: '',
     documentType: '',
     isCustomerSelect: true,
+    documentError: '',
     customerTitleName: '客户身份识别',
-    certificateType: 'identityCard',
+    certificateType: 'ID_CARD',
     customerName: '',
     IDtypeFrontOrBack: '',
     disabledIdCard: true,
@@ -333,7 +335,11 @@ class Video extends Component {
     loadingFace: false,
     faceResuly: '',
     isStaffState: '',
-    loadingStaff: false
+    loadingStaff: false,
+    isVideoList: false,
+    faceFailReason: '',
+    cardResuly: '',
+    cardFailReason: '',
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -341,7 +347,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.8.8&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.1&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -801,7 +807,8 @@ class Video extends Component {
         this.setState({
           loadingFace: false,
           faceResuly: 'success',
-          isFaceImage: ''
+          isFaceImage: '',
+          faceFailReason: ''
         })
         // this.setState({
         //   isModalVisibleFacial: false
@@ -811,7 +818,8 @@ class Video extends Component {
         this.setState({
           loadingFace: false,
           faceResuly: 'fail',
-          isFaceImage: ''
+          isFaceImage: '',
+          faceFailReason: result.message
         })
       }
 
@@ -820,10 +828,12 @@ class Video extends Component {
       if (err.status == 502 || err.status == 404) {
         this.roomCallBack(2, '连接服务器失败', 'SYS-02')
       }
+      console.log(err)
       this.setState({
         loadingFace: false,
         faceResuly: 'fail',
-        isFaceImage: ''
+        isFaceImage: '',
+        faceFailReason: err.message
       })
       console.error('err', err);
     }
@@ -869,7 +879,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoOneName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -879,7 +889,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoTwoName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -889,7 +899,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoThreeName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -899,7 +909,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoFourName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -909,7 +919,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoFiveName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -918,7 +928,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoSixName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -926,7 +936,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoSevenName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -934,7 +944,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoEightName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -942,7 +952,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoNineName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -950,7 +960,7 @@ 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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoTenName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -958,7 +968,7 @@ class Video extends Component {
       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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoElevenName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -966,7 +976,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 ? '--人脸识别' : '--OCR'),
+        name: this.state.videoTwelveName + (this.state.faceCustomerType == 1 ? '--人脸识别' : ''),
         tourist: false
       })
     }
@@ -976,11 +986,12 @@ class Video extends Component {
     })
     if (list.length > 0) {
       if (val == 'ocr') {
+        console.log('this.state.customerList.length',list.length)
         this.setState({
           documentType: '',
           isModalVisibleCustomer: true,
           isCustomerSelect: true,
-          customerSelect: '',
+          customerSelect: list.length == 1 ? 0 : '',
           customerTitleName: '客户身份识别'
         })
       } else if (val == 'facial') {
@@ -2208,9 +2219,16 @@ class Video extends Component {
     };
     this.test_controller.OnSendTextMsgSucc = (msgId) => {
       console.log('发送成功', msgId)
+      this.setState({
+        documentError: '',
+        isModalVisibleCustomer: false,
+      })
     }
     this.test_controller.OnSendTextMsgFailed = (msgId, code, msg) => {
       console.log('发送失败', msgId, code, msg)
+      this.setState({
+        documentError: '推送授权白板失败，请重试'
+      })
     }
     this.test_controller.OnReceiveTextMsg = (uid, msg) => {
       console.log('收到手机端消息', uid, msg, JSON.parse(msg).typeId, JSON.parse(msg).data.sessionId, this.state.sessionId)
@@ -2397,6 +2415,7 @@ class Video extends Component {
     // 订阅媒体流成功
     this.test_controller.OnSubscribeSucc = (feed, sid) => {
       console.log('订阅媒体流成功', feed, sid);
+      
       this.appGetUsername(sid)
       console.log(muteJson, muteJson.size)
       if (muteJson.size > 0) {
@@ -3016,6 +3035,8 @@ class Video extends Component {
           videoOneName: '',
           voiceVideoOne: false,
           noVideoOne: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video2").name) {
@@ -3024,6 +3045,8 @@ class Video extends Component {
           videoTwoName: '',
           voiceVideoTwo: false,
           noVideoTwo: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video3").name) {
@@ -3032,6 +3055,8 @@ class Video extends Component {
           videoThreeName: '',
           voiceVideoThree: false,
           noVideoThree: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video4").name) {
@@ -3040,6 +3065,8 @@ class Video extends Component {
           videoFourName: '',
           voiceVideoFour: false,
           noVideoFour: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video5").name) {
@@ -3048,6 +3075,8 @@ class Video extends Component {
           videoFiveName: '',
           voiceVideoFive: false,
           noVideoFive: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video6").name) {
@@ -3056,6 +3085,8 @@ class Video extends Component {
           videoSixName: '',
           voiceVideoSix: false,
           noVideoSix: false
+        },()=>{
+          this.videoListClick()
         })
       }
 
@@ -3065,6 +3096,8 @@ class Video extends Component {
           videoSevenName: '',
           voiceVideoSeven: false,
           noVideoSeven: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video8").name) {
@@ -3073,6 +3106,8 @@ class Video extends Component {
           videoEightName: '',
           voiceVideoEight: false,
           noVideoEight: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video9").name) {
@@ -3081,6 +3116,8 @@ class Video extends Component {
           videoNineName: '',
           voiceVideoNine: false,
           noVideoNine: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video10").name) {
@@ -3089,6 +3126,8 @@ class Video extends Component {
           videoTenName: '',
           voiceVideoTen: false,
           noVideoTen: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video11").name) {
@@ -3097,6 +3136,8 @@ class Video extends Component {
           videoElevenName: '',
           voiceVideoEleven: false,
           noVideoEleven: false
+        },()=>{
+          this.videoListClick()
         })
       }
       if (!document.getElementById("video12").name) {
@@ -3105,6 +3146,8 @@ class Video extends Component {
           videoTwelveName: '',
           voiceVideoTwelve: false,
           noVideoTwelve: false
+        },()=>{
+          this.videoListClick()
         })
       }
       this.state.analyserData.delete(sid)
@@ -3794,7 +3837,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.8.8')
+    console.log('hsbc_teller_sdk', '1.9.1')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4186,13 +4229,14 @@ class Video extends Component {
           this.setState({
             idCardNameFace: this.state.idCardName,
             idCardNumberFace: this.state.idCardNumber,
-            
+            certificateValidityFace: this.state.certificateValidity
           },()=>{
           this.setState({
             isModalVisibleFacial: false,
+            cardResuly: '',
             idCardNumber: '',
             idCardName: '',
-            // certificateValidity: '',
+            certificateValidity: '',
           })
         })
         } else {
@@ -4200,10 +4244,12 @@ class Video extends Component {
           this.setState({
             idCardNameFace: this.state.idCardName,
             idCardNumberFace: this.state.idCardNumber,
-            
+            certificateValidityFace: this.state.certificateValidity
           },()=>{
           this.state.faceCustomerType = 1
             this.setState({
+            cardResuly: '',
+            certificateValidity: '',
             idCardNumber: '',
             idCardName: '',
             titleModal: '人脸识别',
@@ -4232,8 +4278,9 @@ class Video extends Component {
         staffId: this.props.tellerAccount,
         activityId: this.props.businessNumber,
         appAccount: this.state.faceCustomerUid,
+        certificateType: this.state.certificateType,
         fileBase64: val == 1 ? this.state.facialImgFront.replace(/^data:image\/\w+;base64,/, "") : this.state.facialImgBack.replace(/^data:image\/\w+;base64,/, ""),
-        type: val
+        type: val == 1 ? true : false
       });
       if (result.code == 200) {
         console.log('ocrCallback', result.data)
@@ -4248,41 +4295,68 @@ class Video extends Component {
             "userId": this.state.faceCustomerUid
           })
         });
-        if (result.data.side == 'front') {
+        if(this.state.documentType == 'ID_CARD') {
+          if (result.data.side == 'front') {
+            this.setState({
+              // isModalVisibleFacial: false
+              idCardNumber: result.data.idCardNumber,
+              idCardName: result.data.idCardName
+            })
+            this.ocrCallback(2)
+          } else if (result.data.side == 'back') {
+            console.log(result.data.startDate, result.data.endDate)
+            this.setState({
+              certificateValidity: result.data.startDate + '-' + result.data.endDate,
+              loadingFace: false,
+              cardFailReason: '',
+              cardResuly: 'success',
+            })
+          }
+        }
+        if(this.state.documentType == 'PASSPORT_CARD') {
           this.setState({
-            // isModalVisibleFacial: false
             idCardNumber: result.data.idCardNumber,
-            idCardName: result.data.idCardName
-          })
-          this.ocrCallback(2)
-        } else if (result.data.side == 'back') {
-          console.log(result.data.startDate, result.data.endDate)
-          this.setState({
+            idCardName: result.data.idCardName,
             certificateValidity: result.data.startDate + '-' + result.data.endDate,
-            loadingFace: false
+            loadingFace: false,
+            cardFailReason: '',
+            cardResuly: 'success',
           })
         }
+        
       } else {
         this.setState({
-          loadingFace: false
+          loadingFace: false,
+          cardFailReason: result.message,
+          cardResuly: 'fail',
         })
         this.messageClick('识别失败', 'error')
       }
     } catch (err) {
       this.setState({
-        loadingFace: false
+        loadingFace: false,
+        cardFailReason: err.response.message,
+        cardResuly: 'fail',
       })
-      this.messageClick('识别失败', 'error')
+      // this.messageClick('识别失败', 'error')
     }
   }
   handleOkFacial = () => {
     if (this.state.faceCustomerType == 2) {
       if (this.state.IDtypeFrontOrBack == '请截取证件正面') {
-        this.setState({
-          facialImg: ocrImage,
-          IDtypeFrontOrBack: '请截取证件反面',
-          isFaceImage: false,
-        })
+        if(this.state.documentType == 'PASSPORT_CARD') {
+          this.setState({
+            loadingFace: true
+          })
+          this.ocrCallback(1)
+        } else {
+          this.setState({
+            facialImg: ocrImage,
+            IDtypeFrontOrBack: '请截取证件反面',
+            isFaceImage: false,
+          })
+        }
+        
       } else if (this.state.IDtypeFrontOrBack == '请截取证件反面') {
         this.setState({
           loadingFace: true
@@ -4317,6 +4391,46 @@ class Video extends Component {
       isModalVisibleFacial: false
     })
   };
+  newFaceClick=()=>{
+    callNimIM('sendCustomCmdMsg', {
+      customId: this.state.imRoomId,
+      content: JSON.stringify({
+        'typeId': 1020,
+        'sessionId': this.state.sessionId,
+        'cameraState': 2, // 1--打开前置  2--打开后置
+        "userId": this.state.faceCustomerUid
+      })
+    });
+    this.setState({
+      clickedFacial: false,
+      clickedOcr: false,
+      isFaceImage: false,
+      facialImg: ocrImage,
+      disabledIdCard: true,
+      IDtypeFrontOrBack: '请截取证件正面',
+      facialImgFront: '',
+      facialImgBack: '',
+      faceResuly: '',
+      idCardNumber: '',
+      idCardName: '',
+      cardFailReason: '',
+      cardResuly: '',
+    }, () => {
+        const videoMedia = document.getElementById('publish_video_2');
+        videoMedia.srcObject = document.getElementById(videoName).srcObject
+    })
+  }
+  ReIdentification = () =>{
+            this.setState({
+              faceResuly: '',
+            facialImg: ocrImage,
+            isFaceImage: false
+            },()=>{
+              const videoMedia = document.getElementById('publish_video_2');
+          videoMedia.srcObject = document.getElementById(videoName).srcObject
+            })
+          
+  }
   // 坐席签字
   transcribingClick = () => {
   };
@@ -4463,6 +4577,8 @@ class Video extends Component {
         faceResuly: '',
         idCardNumber: '',
         idCardName: '',
+        cardFailReason: '',
+        cardResuly: '',
       }, () => {
 
 
@@ -4471,6 +4587,9 @@ class Video extends Component {
         }, () => {
           const videoMedia = document.getElementById('publish_video_2');
           videoMedia.srcObject = document.getElementById(videoName).srcObject
+          videoMedia.onloadeddata = function() {
+            console.log('onerror')
+          }
         })
       })
     }
@@ -4588,6 +4707,8 @@ class Video extends Component {
         }
         this.setState({
           videoOneName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户1'
+        },()=>{
+          this.videoListClick()
         })
       }
       if (document.getElementById('video2').name == sid) {
@@ -4596,6 +4717,8 @@ class Video extends Component {
         }
         this.setState({
           videoTwoName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户2'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video3').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4603,6 +4726,8 @@ class Video extends Component {
         }
         this.setState({
           videoThreeName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户3'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video4').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4610,6 +4735,8 @@ class Video extends Component {
         }
         this.setState({
           videoFourName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户4'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video5').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4617,6 +4744,8 @@ class Video extends Component {
         }
         this.setState({
           videoFiveName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户5'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video6').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4624,6 +4753,8 @@ class Video extends Component {
         }
         this.setState({
           videoSixName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户6'
+        },()=>{
+          this.videoListClick()
         })
       }
       if (document.getElementById('video7').name == sid) {
@@ -4632,6 +4763,8 @@ class Video extends Component {
         }
         this.setState({
           videoSevenName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户7'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video8').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4639,6 +4772,8 @@ class Video extends Component {
         }
         this.setState({
           videoEightName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户8'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video9').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4646,6 +4781,8 @@ class Video extends Component {
         }
         this.setState({
           videoNineName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户9'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video10').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4653,6 +4790,8 @@ class Video extends Component {
         }
         this.setState({
           videoTenName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户10'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video11').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4660,6 +4799,8 @@ class Video extends Component {
         }
         this.setState({
           videoElevenName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户11'
+        },()=>{
+          this.videoListClick()
         })
       } if (document.getElementById('video12').name == sid) {
         if (typeIntranet && typeIntranet == 2) {
@@ -4667,6 +4808,8 @@ class Video extends Component {
         }
         this.setState({
           videoTwelveName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户12'
+        },()=>{
+          this.videoListClick()
         })
       }
       if (this.state.isPictureInPicture) {
@@ -5256,6 +5399,14 @@ class Video extends Component {
       isModalVisibleCustomer: false
     })
   }
+  goBackSelectCustomer=()=>{
+    this.setState({
+      documentType: '',
+      isCustomerSelect: true,
+      customerSelect: this.state.customerList.length == 1 ? 0 : '',
+      customerTitleName: '客户身份识别'
+    })
+  }
   handleOkCustomer = () => {
     if (this.state.isCustomerSelect) {
       if (this.state.customerList[this.state.customerSelect].tourist) {
@@ -5263,6 +5414,7 @@ class Video extends Component {
       } else {
         this.setState({
           isCustomerSelect: false,
+          documentError: '',
           customerTitleName: this.state.customerList[this.state.customerSelect].name
         })
       }
@@ -5271,8 +5423,11 @@ class Video extends Component {
       this.getAuthorizeResult(this.state.customerList[this.state.customerSelect].customId).then((res) => {
         if (res) {
           this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+          this.setState({
+            isModalVisibleCustomer: false,
+          })
         } else {
-          if (this.state.documentType == 0) {
+          if (this.state.documentType == 'ID_CARD') {
             this.test_controller.SendTextMsg(JSON.stringify({
               'typeId': 3300,
               "data": {
@@ -5292,7 +5447,7 @@ class Video extends Component {
               }
 
             }))
-          } else if (this.state.documentType == 1) {
+          } else {
             this.test_controller.SendTextMsg(JSON.stringify({
               'typeId': 3300,
               "data": {
@@ -5313,16 +5468,14 @@ class Video extends Component {
 
         }
       })
-      this.setState({
-        isModalVisibleCustomer: false,
-      })
       // this.customerFaceClick(this.state.customerList[this.state.customerSelect])
     }
 
   }
   onChangeDocumentType = (e) => {
     this.setState({
-      documentType: e.target.value
+      documentType: e.target.value,
+      certificateType: e.target.value
     })
   }
   getAuthorizeResult = async (appAccount) => {
@@ -5349,9 +5502,9 @@ class Video extends Component {
     try {
       let result = await API.saveAuthorize({
         activityId: this.props.businessNumber,
-        authorizeType: this.state.documentType == 0 ? 'ID' : 'NID',
+        authorizeType: this.state.documentType == 'ID_CARD' ? 'ID' : 'NID',
         appAccount: appAccount,
-        idCardAuthorize: this.state.documentType == 0 ? 'YES' : '',
+        idCardAuthorize: this.state.documentType == 'ID_CARD' ? 'YES' : '',
         pictureAuthorize: 'YES'
       });
       console.log(result)
@@ -5364,6 +5517,19 @@ class Video extends Component {
       console.log(err)
     }
   }
+  videoListClick=()=>{
+    // console.log(Math.trunc(document.getElementById("videoList").getBoundingClientRect().height),document.getElementById("videoList").scrollHeight)
+    // if(Math.trunc(document.getElementById("videoList").getBoundingClientRect().height) >= document.getElementById("videoList").scrollHeight && this.state.isVideoList) {
+    //     this.setState({
+    //       isVideoList: false
+    //     })
+      
+    // } else if (Math.trunc(document.getElementById("videoList").getBoundingClientRect().height) < document.getElementById("videoList").scrollHeight && !this.state.isVideoList) {
+    //   this.setState({
+    //     isVideoList: true
+    //   })
+    // }
+  }
   render() {
     const { meetingInfo, isTranscribing } = this.props
     var pdfChildren
@@ -5568,9 +5734,9 @@ class Video extends Component {
 
                 </div>
               </div>
-              <div className="wrapper" style={{ width: '20%', }}>
+              <div id="videoList" className={`wrapper ${this.state.isVideoList? 'videoListClass': ''}`} style={{ width: '20%' }}>
                 <div
-                  className={`itemed`}
+                  className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                 >
                   <div className="publishVideoDiv">
 
@@ -5600,7 +5766,7 @@ class Video extends Component {
 
                 </div>
                 <div
-                  className={`itemed`}
+                  className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ position: "relative", display: (this.state.videoOneName) ? '' : 'none' }}
                 >
                   {
@@ -5640,7 +5806,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`} style={{ display: (this.state.videoTwoName) ? '' : 'none', }}>
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`} style={{ display: (this.state.videoTwoName) ? '' : 'none', }}>
                   <video
                     id="video2"
                     autoPlay
@@ -5667,7 +5833,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`}
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ display: (this.state.videoThreeName) ? '' : 'none' }}>
                   <video
                     id="video3"
@@ -5695,7 +5861,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`} style={{ display: (this.state.videoFourName) ? '' : 'none', }}>
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`} style={{ display: (this.state.videoFourName) ? '' : 'none', }}>
                   <video
                     id="video4"
                     autoPlay
@@ -5722,7 +5888,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`}
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ display: (this.state.videoFiveName) ? '' : 'none' }}>
                   <video
                     id="video5"
@@ -5750,7 +5916,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`} style={{ display: (this.state.videoSixName) ? '' : 'none', }}>
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`} style={{ display: (this.state.videoSixName) ? '' : 'none', }}>
                   <video
                     id="video6"
                     autoPlay
@@ -5779,7 +5945,7 @@ class Video extends Component {
 
                 </div>
                 <div
-                  className={`itemed`}
+                  className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ position: "relative", display: (this.state.videoSevenName) ? '' : 'none' }}
                 >
                   {
@@ -5819,7 +5985,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`} style={{ display: (this.state.videoEightName) ? '' : 'none', }}>
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`} style={{ display: (this.state.videoEightName) ? '' : 'none', }}>
                   <video
                     id="video8"
                     autoPlay
@@ -5846,7 +6012,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`} style={{ display: (this.state.videoNineName) ? '' : 'none', }}>
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`} style={{ display: (this.state.videoNineName) ? '' : 'none', }}>
                   <video
                     id="video9"
                     autoPlay
@@ -5874,7 +6040,7 @@ class Video extends Component {
                   </div>
 
                 </div>
-                <div className={`itemed`}
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ display: (this.state.videoTenName) ? '' : 'none' }}>
                   <video
                     id="video10"
@@ -5902,7 +6068,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`} style={{ display: (this.state.videoElevenName) ? '' : 'none', }}>
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`} style={{ display: (this.state.videoElevenName) ? '' : 'none', }}>
                   <video
                     id="video11"
                     autoPlay
@@ -5929,7 +6095,7 @@ class Video extends Component {
                     </div>
                   </div>
                 </div>
-                <div className={`itemed`}
+                <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ display: (this.state.videoTwelveName) ? '' : 'none' }}>
                   <video
                     id="video12"
@@ -6012,9 +6178,8 @@ class Video extends Component {
           ]}>
             <div className='endModal'>是否要结束并退出会议？</div>
           </Modal>
-
-          <Modal title={this.state.titleModal} closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
-            !this.state.idCardName && this.state.faceResuly == ''  &&<div key='facial'>
+          <Modal title={this.state.titleModal} width={650} closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
+            this.state.cardResuly == '' && this.state.faceResuly == ''  &&<div key='facial'>
               <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
               <Button className="modelButtonCancel" onClick={this.sgsinImage}>截图</Button>
               {
@@ -6025,16 +6190,26 @@ class Video extends Component {
               }
 
             </div>,
-            !this.state.idCardName && this.state.faceResuly != ''  &&<div key='facial'>
+            this.state.cardResuly == '' && this.state.faceResuly != ''  &&<div key='facial'>
+              {
+                this.state.faceResuly == 'fail' && <Button className="modelButtonOk" type="primary" danger onClick={this.ReIdentification}>重新识别</Button>
+              }
+              {
+                this.state.faceResuly == 'success' && <Button className="modelButtonNo" type="primary" danger>重新识别</Button>
+              }
             <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>完成</Button>
 
           </div>,
-            this.state.idCardName && <div key='facial'>
+            this.state.cardResuly == 'success' && <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>,
+            this.state.cardResuly == 'fail' && <div key='facial'>
+              <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.newFaceClick}>返回重试</Button>
             </div>
           ]}>
             <Spin spinning={this.state.loadingFace} tip="识别中...">
@@ -6045,7 +6220,7 @@ class Video extends Component {
             <Option value="2">反面</Option>
           </Select>
             } */}
-                {!this.state.idCardName && <div className='faceCardImg'>
+                {this.state.cardResuly == '' && <div className='faceCardImg'>
 
                   {
                     this.state.titleModal == 'OCR识别' && <div className='titleDiv'>{this.state.IDtypeFrontOrBack}</div>
@@ -6064,14 +6239,24 @@ class Video extends Component {
                 </div>
                 }
                 {
-                  this.state.idCardName && <div className='resuleCard'>
-                    <div>
+                  this.state.cardResuly != '' && <div className='resuleCard'>
+                    {
+                      this.state.cardResuly == 'success' && <div className='successClassFace'>
+                        <img src={require("../../assets/img/tooltips1_pass.png").default} alt="" ></img>
+          
+                        识别成功</div>
+                    }
+                    {
+                      this.state.cardResuly == 'fail' && <div className='errorClassFace'>
+                      <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>
                       <img className="faceImgCard" src={this.state.facialImgBack} alt=""></img>
                     </div>
                     <div>证件信息确认</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><span>证件号码</span>  <input disabled={this.state.disabledIdCard} type="text" value={this.state.idCardNumber} onChange={this.handleChangeIdCardNumber} /></div>
                     <div><span>有效期</span>  <input disabled={this.state.disabledIdCard} type="text" value={this.state.certificateValidity} onChange={this.handleChangeCertificateValidity} /></div>
                   </div>
                 }
@@ -6085,18 +6270,17 @@ class Video extends Component {
                     }
                     {
                       this.state.faceResuly == 'fail' && <div className='errorClassFace'>
-                      <img src={require("../../assets/img/tooltips2_fail.png").default} alt="" ></img>人脸识别失败</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>
-                    <div><span>有效期</span>  <input disabled type="text" value={this.state.certificateValidity}/></div>
+                    <div><span>有效期</span>  <input disabled type="text" value={this.state.certificateValidityFace}/></div>
                   </div>
                 }
 
               </div>
             </Spin>
           </Modal>
-
           <Modal title="经理人员授权" closable={false} centered={true} visible={this.state.isModalVisibleSFP}
             footer={[
               <div key='end'>
@@ -6124,14 +6308,21 @@ class Video extends Component {
             </div>
             </Spin>
           </Modal>
-
-
-
           <Modal title={this.state.customerTitleName} closable={false} centered={true} visible={this.state.isModalVisibleCustomer}
             footer={[
               <div key='end'>
+                
+                
+                {
+                  !this.state.isCustomerSelect && <Button className="modelButtonCancel" onClick={this.goBackSelectCustomer}>上一步</Button>
+                }
                 <Button className="modelButtonCancel" onClick={this.handleCancelCustomer}>取消</Button>
-                <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkCustomer}>下一步</Button>
+                {/* {
+                  this.state.customerSelect == '' && <Button className="modelButtonCancel">下一步</Button>
+                } */}
+                {
+                  <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkCustomer}>下一步</Button>
+                }
               </div>
             ]}>
             <div>
@@ -6146,7 +6337,9 @@ class Video extends Component {
                         <Space direction="vertical">
                           {
                             this.state.customerList.map((item, index) => {
-                              return <Radio value={index}>{item.name}</Radio>
+                              // if(item.name.indexOf("访客") != -1) {
+                                return <Radio value={index}>{item.name}</Radio>
+                              // }
                             })
                           }
                         </Space>
@@ -6156,14 +6349,23 @@ class Video extends Component {
                 }
                 {
                   !this.state.isCustomerSelect && <div>
+                    {
+                      this.state.documentError != '' && <div className='errorClassFace'>
+                      <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}>
                         <Space direction="vertical">
-                          <Radio value={0}>身份证</Radio>
-                          <Radio value={1}>护照：或台湾来往大陆通行证；或港澳来往大陆通行证或；外国人永久居住证；或港澳台居民居住证</Radio>
+                          <Radio value={'ID_CARD'}>身份证</Radio>
+                          <Radio value={'PASSPORT_CARD'}>护照</Radio>
+                          <Radio value={'TW_PASS_CARD'}>台湾来往大陆通行证</Radio>
+                          <Radio value={'HK_MO_PASS_CARD'}>港澳来往大陆通行证</Radio>
+                          <Radio value={'HK_MO_RESIDENCE_CARD'}>港澳台居民居住证</Radio>
+                          <Radio value={'TW_RESIDENCE_CARD'}>台湾居民居住证</Radio>
+                          <Radio value={'FOREIGNER_RESIDENCE_CARD'}>外国人永久居住证</Radio>
                         </Space>
                       </Radio.Group>
                     </div>