Merge commit 'ae5fd8d7' into davidhuang

* commit 'ae5fd8d7':
  // 旅行证件
  //  OCR
  //  旅行

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift

@@ -220,8 +220,14 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
         var hasError = false
         for item in sectionItems {
             if item.type == .certificate {
-                
                 item.cerDetailModel.isNeedCheckCer = false
+
+                if item.cerDetailModel.isOCR_failed {
+                    hasError = true
+                    item.cerDetailModel.isNeedCheckCer = true
+                    item.cerDetailModel.checkTips = "无法识别，请核查文件"
+                    
+                } else {
                     var noCerInfo = false
                     if item.cerDetailModel.type == 3 { // 只有港澳通行证有正反面
                         noCerInfo = (item.cerDetailModel.img_front.isEmpty || item.cerDetailModel.img_back.isEmpty)
@@ -268,6 +274,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                     }
                 }
             }
+        }
         self.tableView.reloadData()
         
         if hasError {
@@ -390,10 +397,8 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS
                 if !self.isDisableEdit {
                     _ = self.checkInfo()
                 } else {
-                    if needCheck {
                     _ = self.checkInfo()
                 }
-                }
                 self.tableView.reloadData()
             }
             cell.templateClick = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift

@@ -42,6 +42,8 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     var checkTips: String = ""
     // 是否显示被拒理由
     var isNeedShowRejectReason: Bool = false  
+    
+    
     var latest_validaty_date : String = "" //有效期最晚时间
     var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
 
@@ -49,6 +51,8 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     var isNeedCheckDate: Bool = false
     // 是否可编辑
     var isCanEdit: Bool = true
+    // OCR识别失败
+    var isOCR_failed: Bool = false
     
     required init() {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift

@@ -12,8 +12,6 @@ import AttributedString
 enum YHCertificateID: Int {
     case signDate = 0 // 签发日期
     case deadDate = 1 // 届满日期
-    case kind = 2 //
-    
 }
 
 class YHCertificateDateItem {
@@ -143,6 +141,8 @@ class YHTravelCertificateUploadCell: UITableViewCell {
 
             if self.dataModel.type == 3 { // 港澳通行证
                 self.dataModel.img_front = ""
+                self.dataModel.isOCR_failed = false
+
             } else {
                 self.dataModel.img_front = ""
                 self.dataModel.img_back = ""
@@ -162,9 +162,6 @@ class YHTravelCertificateUploadCell: UITableViewCell {
 
             if self.dataModel.type == 3 { // 港澳通行证
                 self.dataModel.img_back = url
-                if self.dataModel.isCanEdit {
-                    self.getOCR(url: url, isBack: 1)
-                }
 
             } else {
                 self.dataModel.img_front = url
@@ -243,9 +240,6 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                         }
                         self.updateBlock?(false)
                     }
-                    
-                } else if item.id == .kind {
-                    
                 }
             }
             selectPanelContentView.addSubview(itemView)
@@ -522,10 +516,13 @@ extension YHTravelCertificateUploadCell {
                 self.viewModel.getHKCardBackInfoByOcr(url, isBack: isBack) { success, result in
                     YHHUD.hide()
                     if success, let result = result {
+                        self.dataModel.isOCR_failed = false
                         self.dataModel.issue_start = result.term_begins
                         self.dataModel.issue_end = result.end_of_term
                         self.updateBlock?(true)
                     } else {
+                        // OCR 无法识别
+                        self.dataModel.isOCR_failed = true
                         self.updateBlock?(true)
                     }
                 }
@@ -539,6 +536,8 @@ extension YHTravelCertificateUploadCell {
                         self.dataModel.issue_end = result.end_of_term
                         self.updateBlock?(true)
                     } else {
+                        // OCR 无法识别
+                        self.dataModel.isOCR_failed = true
                         self.updateBlock?(true)
                     }
                 }