Skip to content

G
galaxy-iOS
Commit 2fb5b501 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge commit 'ae5fd8d7' into davidhuang 

* commit 'ae5fd8d7':
  // 旅行证件
  //  OCR
  //  旅行
parents 8e1447fa ae5fd8d7
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 44 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift
View file @ 2fb5b501
...@@ -220,51 +220,58 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController { ...@@ -220,51 +220,58 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
var hasError = false var hasError = false
for item in sectionItems { for item in sectionItems {
if item.type == .certificate { if item.type == .certificate {
item.cerDetailModel.isNeedCheckCer = false item.cerDetailModel.isNeedCheckCer = false
var noCerInfo = false
if item.cerDetailModel.type == 3 { // 只有港澳通行证有正反面 if item.cerDetailModel.isOCR_failed {
noCerInfo = (item.cerDetailModel.img_front.isEmpty || item.cerDetailModel.img_back.isEmpty)
} else {
noCerInfo = item.cerDetailModel.img_front.isEmpty
}
if noCerInfo {
hasError = true hasError = true
item.cerDetailModel.isNeedCheckCer = true item.cerDetailModel.isNeedCheckCer = true
if item.cerDetailModel.type == 3 { // 港澳通行证 item.cerDetailModel.checkTips = "无法识别，请核查文件"
item.cerDetailModel.checkTips = item.cerDetailModel.img_front.isEmpty ? "请上传港澳通行证正面" : "请上传港澳通行证反面"
} else if item.cerDetailModel.type == 1 { // 中国护照
item.cerDetailModel.checkTips = "请上传护照"
} else if item.cerDetailModel.type == 2 { // 中国居留许可签证
item.cerDetailModel.checkTips = "请上传中国居留许可签证"
}
} else { } else {
item.cerDetailModel.isNeedCheckDate = false var noCerInfo = false
if item.cerDetailModel.issue_start.isEmpty || item.cerDetailModel.issue_end.isEmpty { if item.cerDetailModel.type == 3 { // 只有港澳通行证有正反面
noCerInfo = (item.cerDetailModel.img_front.isEmpty || item.cerDetailModel.img_back.isEmpty)
} else {
noCerInfo = item.cerDetailModel.img_front.isEmpty
}
if noCerInfo {
hasError = true hasError = true
item.cerDetailModel.isNeedCheckDate = true item.cerDetailModel.isNeedCheckCer = true
if item.cerDetailModel.type == 3 { // 港澳通行证
item.cerDetailModel.checkTips = item.cerDetailModel.img_front.isEmpty ? "请上传港澳通行证正面" : "请上传港澳通行证反面"
} else if item.cerDetailModel.type == 1 { // 中国护照
item.cerDetailModel.checkTips = "请上传护照"
} else if item.cerDetailModel.type == 2 { // 中国居留许可签证
item.cerDetailModel.checkTips = "请上传中国居留许可签证"
}
} else { } else {
if !item.cerDetailModel.isValidCer() { item.cerDetailModel.isNeedCheckDate = false
if item.cerDetailModel.issue_start.isEmpty || item.cerDetailModel.issue_end.isEmpty {
hasError = true hasError = true
item.cerDetailModel.isNeedCheckCer = true item.cerDetailModel.isNeedCheckDate = true
if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validate_date.isEmpty {
// 这个情况直接弹toast } else {
if !item.cerDetailModel.isValidCer() {
} else { hasError = true
item.cerDetailModel.checkTips = "有效期不足，请核查文件" item.cerDetailModel.isNeedCheckCer = true
if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validate_date.isEmpty {
// 这个情况直接弹toast
} else {
item.cerDetailModel.checkTips = "有效期不足，请核查文件"
}
} }
} }
} }
}
if !hasError { if !hasError {
item.cerDetailModel.isNeedCheckCer = false item.cerDetailModel.isNeedCheckCer = false
item.cerDetailModel.isNeedCheckDate = false item.cerDetailModel.isNeedCheckDate = false
}
} }
} }
} }
...@@ -390,9 +397,7 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS ...@@ -390,9 +397,7 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS
if !self.isDisableEdit { if !self.isDisableEdit {
_ = self.checkInfo() _ = self.checkInfo()
} else { } else {
if needCheck { _ = self.checkInfo()
_ = self.checkInfo()
}
} }
self.tableView.reloadData() self.tableView.reloadData()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift
View file @ 2fb5b501
...@@ -41,7 +41,9 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable { ...@@ -41,7 +41,9 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
// 证件错误信息 // 证件错误信息
var checkTips: String = "" var checkTips: String = ""
// 是否显示被拒理由 // 是否显示被拒理由
var isNeedShowRejectReason: Bool = false var isNeedShowRejectReason: Bool = false
var latest_validaty_date : String = "" //有效期最晚时间 var latest_validaty_date : String = "" //有效期最晚时间
var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间 var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
...@@ -49,6 +51,8 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable { ...@@ -49,6 +51,8 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
var isNeedCheckDate: Bool = false var isNeedCheckDate: Bool = false
// 是否可编辑 // 是否可编辑
var isCanEdit: Bool = true var isCanEdit: Bool = true
// OCR识别失败
var isOCR_failed: Bool = false
required init() { required init() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift
View file @ 2fb5b501
...@@ -12,8 +12,6 @@ import AttributedString ...@@ -12,8 +12,6 @@ import AttributedString
enum YHCertificateID: Int { enum YHCertificateID: Int {
case signDate = 0 // 签发日期 case signDate = 0 // 签发日期
case deadDate = 1 // 届满日期 case deadDate = 1 // 届满日期
case kind = 2 //
} }
class YHCertificateDateItem { class YHCertificateDateItem {
...@@ -143,6 +141,8 @@ class YHTravelCertificateUploadCell: UITableViewCell { ...@@ -143,6 +141,8 @@ class YHTravelCertificateUploadCell: UITableViewCell {
if self.dataModel.type == 3 { // 港澳通行证 if self.dataModel.type == 3 { // 港澳通行证
self.dataModel.img_front = "" self.dataModel.img_front = ""
self.dataModel.isOCR_failed = false
} else { } else {
self.dataModel.img_front = "" self.dataModel.img_front = ""
self.dataModel.img_back = "" self.dataModel.img_back = ""
...@@ -162,9 +162,6 @@ class YHTravelCertificateUploadCell: UITableViewCell { ...@@ -162,9 +162,6 @@ class YHTravelCertificateUploadCell: UITableViewCell {
if self.dataModel.type == 3 { // 港澳通行证 if self.dataModel.type == 3 { // 港澳通行证
self.dataModel.img_back = url self.dataModel.img_back = url
if self.dataModel.isCanEdit {
self.getOCR(url: url, isBack: 1)
}
} else { } else {
self.dataModel.img_front = url self.dataModel.img_front = url
...@@ -243,9 +240,6 @@ class YHTravelCertificateUploadCell: UITableViewCell { ...@@ -243,9 +240,6 @@ class YHTravelCertificateUploadCell: UITableViewCell {
} }
self.updateBlock?(false) self.updateBlock?(false)
} }
} else if item.id == .kind {
} }
} }
selectPanelContentView.addSubview(itemView) selectPanelContentView.addSubview(itemView)
...@@ -522,10 +516,13 @@ extension YHTravelCertificateUploadCell { ...@@ -522,10 +516,13 @@ extension YHTravelCertificateUploadCell {
self.viewModel.getHKCardBackInfoByOcr(url, isBack: isBack) { success, result in self.viewModel.getHKCardBackInfoByOcr(url, isBack: isBack) { success, result in
YHHUD.hide() YHHUD.hide()
if success, let result = result { if success, let result = result {
self.dataModel.isOCR_failed = false
self.dataModel.issue_start = result.term_begins self.dataModel.issue_start = result.term_begins
self.dataModel.issue_end = result.end_of_term self.dataModel.issue_end = result.end_of_term
self.updateBlock?(true) self.updateBlock?(true)
} else { } else {
// OCR 无法识别
self.dataModel.isOCR_failed = true
self.updateBlock?(true) self.updateBlock?(true)
} }
} }
...@@ -539,6 +536,8 @@ extension YHTravelCertificateUploadCell { ...@@ -539,6 +536,8 @@ extension YHTravelCertificateUploadCell {
self.dataModel.issue_end = result.end_of_term self.dataModel.issue_end = result.end_of_term
self.updateBlock?(true) self.updateBlock?(true)
} else { } else {
// OCR 无法识别
self.dataModel.isOCR_failed = true
self.updateBlock?(true) self.updateBlock?(true)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment