Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 赴港
  //  旅行
  新增受养人细节

# Conflicts:
#	galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -276,6 +276,8 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                     var isNeedAppoint = true
                     if needGoHK == 1, reservationToHK == 1 { // 选择赴港且已预约
                         isNeedAppoint = false
+                    } else if needGoHK == 0  { // 赴港选择否
+                        isNeedAppoint = false
                     }
                     
                     if isNeedAppoint {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAddAdoptersViewController.swift

@@ -35,6 +35,13 @@ class YHAddAdoptersViewController: YHBaseViewController {
             guard let self = self else { return }
             self.clickIndex = self.viewModel.model?.has_dependent ?? 2
             tableView.reloadData()
+            if self.viewModel.model?.is_reserved_open == 1 && self.viewModel.model?.has_dependent == 0 {
+                self.bottonView.isHidden = false
+                self.nextButton.isHidden = false
+            } else {
+                self.bottonView.isHidden = true
+                self.nextButton.isHidden = true
+            }
         }
     }
     
@@ -135,7 +142,7 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
             cell.newAdopterBlock = {[weak self] in
                 guard let self = self else { return }
                 var items: [YHCertificateEditItem] = []
-                if self.viewModel.model?.has_spouse ?? false {
+                if !(self.viewModel.model?.has_spouse ?? false) {
                     items.append(YHCertificateEditItem(type:.rename, title:"新增配偶"))
                 }
                 items.append(YHCertificateEditItem(type:.preview, title:"新增子女"))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterNewPeopleViewController.swift

@@ -38,6 +38,11 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
         self.updateDataSource()
         viewModel.getDependentsData(id: id) {[weak self] success, error in
             guard let self = self else { return }
+            if self.viewModel.isCanNext(self.stepView.currentIndex) {
+                self.stepView.currentIndex = 1
+            } else {
+                self.stepView.currentIndex = 0
+            }
             self.updateDataSource()
         }
     }
@@ -48,7 +53,15 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
             self.bottomView.nextButton.setTitle("下一步", for: .normal)
         } else if self.stepView.currentIndex == 1 {
             self.cardDataSource = self.viewModel.mainModel.docList
-//            self.bottomView.nextButton.setTitle("下一步", for: .normal)
+            self.bottomView.nextButton.isEnabled = true
+            self.bottomView.saveButton.isHidden = false
+            self.bottomView.nextButton.setTitle("确认，保存", for: .normal)
+            self.bottomView.nextButton.snp.remakeConstraints { make in
+                make.right.equalTo(-16)
+                make.top.equalTo(10)
+                make.height.equalTo(44)
+                make.left.equalTo(self.bottomView.saveButton.snp.right).offset(10)
+            }
         }
         self.tableView.reloadData()
     }
@@ -146,7 +159,7 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
             bottom.saveBlock = { [weak self] in
                 guard let self = self else { return }
                 self.stepView.currentIndex = 0
-                self.getData()
+                self.updateDataSource()
                 bottom.saveButton.setTitle("上一步", for: .normal)
                 bottom.saveButton.isHidden = true
                 bottom.nextButton.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/M/YHAdopterMainModel.swift

@@ -17,6 +17,7 @@ class YHAdopterMainModel: SmartCodable {
     var spouse_id : Int = 0
     var has_spouse : Bool = false //是否有配偶
     var has_deposit : Bool = false //是否有旅行证件
+    var is_reserved_open: Int = 0 // 0 不显示 1 显示 
     var dependent: [YHAdopterDependentModel] = [] // 受养人数组
     var deposit: YHAdopterDepositModel = YHAdopterDepositModel()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardExampleView.swift

@@ -60,6 +60,33 @@ class YHAdopterCardExampleView: UIView {
                     make.height.equalTo(701)
                 }
             }
+            
+            if type == .travel {
+                titleLabel.text = "港澳通行证 (逗留D) 示例 (仅供参考)"
+                data = ["service_adopter_example_travel"]
+                centerView.snp.remakeConstraints { make in
+                    make.left.right.bottom.equalToSuperview()
+                    make.height.equalTo(689)
+                }
+            }
+            
+            if type == .chinaLife {
+                titleLabel.text = "中国居留许可签证 (仅供参考)"
+                data = ["service_adopter_example_chinalife"]
+                centerView.snp.remakeConstraints { make in
+                    make.left.right.bottom.equalToSuperview()
+                    make.height.equalTo(422)
+                }
+            }
+            
+            if type == .chinaTravel {
+                titleLabel.text = "护照示例 (仅供参考)"
+                data = ["service_adopter_example_chinatravel"]
+                centerView.snp.remakeConstraints { make in
+                    make.left.right.bottom.equalToSuperview()
+                    make.height.equalTo(659)
+                }
+            }
         }
     }
     
@@ -217,6 +244,15 @@ extension YHAdopterCardExampleView: UITableViewDelegate, UITableViewDataSource {
         if type == .marry {
             return 968 + 20
         }
+        if type == .travel {
+            return 508 + 20
+        }
+        if type == .chinaLife {
+            return 238 + 20
+        }
+        if type == .chinaTravel {
+            return 476 + 20
+        }
         if type == .other {
             if indexPath.row == 0 {
                 return 204 + 20

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardTableViewCell.swift

@@ -63,6 +63,7 @@ class YHAdopterCardTableViewCell: UITableViewCell {
             label.font = UIFont.PFSC_R(ofSize: 17)
             label.textColor = UIColor.mainTextColor
             label.text = "主申请人资料"
+            label.numberOfLines = 0
             let str = "*" + "受养人信息核实"
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 17),
@@ -77,9 +78,9 @@ class YHAdopterCardTableViewCell: UITableViewCell {
         centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(20)
-            make.top.equalTo(20)
-            make.height.equalTo(22)
-            make.right.equalTo(-18)
+            make.top.equalToSuperview()
+            make.bottom.equalToSuperview()
+            make.right.equalTo(-80)
         }
         
         selectLabel = {
@@ -141,13 +142,7 @@ class YHAdopterCardTableViewCell: UITableViewCell {
             questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.failColor, range: starRange)
             titleLabel.attributedText = questionAttrStr
         } else {
-            let str = data.dep_name
-            let attributes: [NSAttributedString.Key: Any] = [
-                .font: UIFont.PFSC_R(ofSize: 16),
-                .foregroundColor: UIColor.mainTextColor
-            ]
-            let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
-            titleLabel.attributedText = questionAttrStr
+            titleLabel.text = data.dep_name
         }
         
         if data.dep_type == 1 {
@@ -175,9 +170,9 @@ class YHAdopterCardTableViewCell: UITableViewCell {
             selectLabel.attributed.text = a
             titleLabel.snp.remakeConstraints { make in
                 make.left.equalTo(20)
-                make.top.equalTo(20)
-                make.height.equalTo(22)
-                make.right.equalTo(-18)
+                make.top.equalToSuperview()
+                make.bottom.equalToSuperview()
+                make.right.equalTo(-80)
             }
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterIncomeTableViewCell.swift

@@ -134,7 +134,7 @@ class YHAdopterIncomeTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(moreButton)
         moreButton.snp.makeConstraints { make in
-            make.bottom.equalTo(-16)
+            make.centerY.equalTo(selectLabel.snp.centerY)
             make.right.equalTo(-20)
             make.height.equalTo(20)
             make.width.equalTo(69)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterItemView.swift

@@ -59,7 +59,7 @@ class YHAdopterItemView: UIView {
         addSubview(explainLabel)
         explainLabel.snp.makeConstraints { make in
             make.right.equalTo(-24)
-            make.left.equalTo(titleLabel.snp.right)
+            make.left.equalToSuperview()
             make.height.equalTo(20)
             make.centerY.equalToSuperview()
         }
@@ -116,7 +116,7 @@ class YHAdopterItemView: UIView {
         }
         titleLabel.text = spouse + "(\(dataSource.dep_name))"
         if dataSource.status == 0 {
-            explainLabel.text = "待上传"
+            explainLabel.text = "待完善"
             explainLabel.textColor = UIColor.brandMainColor
             nextStepImageView.image = UIImage(named: "service_adopter_income_start")
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHCardUploadView.swift

@@ -10,22 +10,6 @@ import UIKit
 
 class YHCardUploadView: UIView {
     
-    var titleHeight: CGFloat = 22.0 {
-        didSet {
-            self.frontLabel.snp.updateConstraints { make in
-                make.height.equalTo(titleHeight)
-            }
-        }
-    }
-    
-    var imgHeight: CGFloat = 99.0 {
-        didSet {
-            frontImageButton.snp.updateConstraints { make in
-                make.height.equalTo(90.0)
-            }
-        }
-    }
-    
     typealias UrlBlock = (_ url: String, _ index: Int) -> ()
     var urlBlock: UrlBlock?
     var deleteBlock: UrlBlock?
@@ -169,3 +153,32 @@ class YHCardUploadView: UIView {
     }
     
 }
+
+extension YHCardUploadView {
+    
+    func remakeUploadViewConstraints() {
+        
+        frontLabel.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(0)
+            make.height.equalTo(20)
+        }
+        
+        frontImageButton.snp.remakeConstraints { make in
+            make.top.equalTo(frontLabel.snp.bottom).offset(12.0)
+            make.left.bottom.equalToSuperview()
+            make.height.equalTo(90)
+            make.right.equalTo(-10)
+        }
+        
+        frontDeleteButton.snp.remakeConstraints { make in
+            make.centerX.equalTo(frontImageButton.snp.right)
+            make.centerY.equalTo(frontImageButton.snp.top)
+            make.height.equalTo(21)
+            make.width.equalTo(21)
+        }
+        
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
+    }
+}

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

@@ -138,6 +138,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
             for model in list {
                 let item2 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
                 if let model = model {
+                    model.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
                     item2.cerDetailModel = model
                     sectionItems.append(item2)
                 }
@@ -152,10 +153,11 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                     userId = Int(uid) ?? 0
                 }
                 let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: 3, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)")
+                cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
+
                 item.cerDetailModel = cerModel1
                 sectionItems.append(item)
             }
-           
         }
         tableView.reloadData()
     }
@@ -278,6 +280,11 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS
         if 0 <= indexPath.section && indexPath.section < sectionItems.count {
             let item = sectionItems[indexPath.section]
             cell.updateModel(item.cerDetailModel)
+            cell.updateBlock = {
+                [weak self] in
+                guard let self = self else { return }
+                self.tableView.reloadData()
+            }
         }
         return cell
     }

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

@@ -39,6 +39,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     var checkTips: String = ""
     var isNeedShowRejectReason: Bool = false
     var rejectReason: String = ""
+    var latest_validaty_date : String = ""
     
     required init() {
     }

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

@@ -53,12 +53,18 @@ class YHTravelCertificateItemView: UIView {
                 detailLabel.text = self.placeHolder
                 detailLabel.textColor = .placeHolderColor
                 detailLabel.textAlignment = .left
+                self.setNeedsLayout()
+                self.layoutIfNeeded()
                 return
             }
             detailLabel.text = detail
             detailLabel.textColor = .mainTextColor
             detailLabel.textAlignment = .left
+            
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
         }
+       
     }
     
     

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

@@ -41,6 +41,9 @@ class YHTravelCertificateUploadCell: UITableViewCell {
     static let cellReuseIdentifier = "YHTravelCertificateUploadCell"
     
     var dataModel: YHTravelDocsPreparationDetailItemModel = YHTravelDocsPreparationDetailItemModel()
+    let viewModel: YHBaseViewModel = YHBaseViewModel()
+    
+    var updateBlock: (()->())?
     
     lazy var whiteConentView: UIView = {
         let view = UIView()
@@ -100,32 +103,38 @@ class YHTravelCertificateUploadCell: UITableViewCell {
     
     lazy var certificateFrontView: YHCardUploadView = {
         let view = YHCardUploadView(frame: .zero)
+        view.remakeUploadViewConstraints()
         view.urlBlock = {
             [weak self] url, index in
             guard let self = self else { return }
             self.dataModel.img_front = url
-            self.updateModel(self.dataModel)
+            self.getOCR(url: url, isBack: 0)
+            self.updateBlock?()
         }
         view.deleteBlock = {
             [weak self] url, index in
             guard let self = self else { return }
             self.dataModel.img_front = ""
+            self.updateBlock?()
         }
         return view
     }()
     
     lazy var certificateBackView: YHCardUploadView = {
         let view = YHCardUploadView(frame: .zero)
+        view.remakeUploadViewConstraints()
         view.urlBlock = {
             [weak self] url, index in
             guard let self = self else { return }
             self.dataModel.img_back = url
-            self.updateModel(self.dataModel)
+            self.getOCR(url: url, isBack: 1)
+            self.updateBlock?()
         }
         view.deleteBlock = {
             [weak self] url, index  in
             guard let self = self else { return }
             self.dataModel.img_back = ""
+            self.updateBlock?()
         }
         return view
     }()
@@ -147,9 +156,9 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             let itemView = YHTravelCertificateItemView(frame: .zero)
             itemView.title = item.title
             itemView.placeHolder = item.placeHolder
-            itemView.detail = item.value
             itemView.isNeedShowErrorTips = item.isShowErrorTips
             itemView.errorTips = item.errorTips
+            itemView.detail = item.value
             itemView.clickBlock = {
                 [weak self] in
                 guard let self = self else { return }
@@ -213,7 +222,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         // 需要显示被拒原因
         let isShowReason = (model.isNeedShowRejectReason && !model.rejectReason.isEmpty)
         
-        rejectReasonLabel.snp.makeConstraints { make in
+        rejectReasonLabel.snp.remakeConstraints { make in
             make.left.equalTo(18)
             make.right.equalTo(-18)
             make.top.equalTo(lineView.snp.bottom).offset(isShowReason ? 18 : 0)
@@ -247,7 +256,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             make.bottom.equalTo(0)
             make.left.equalTo(18)
             make.right.equalTo(-10)
-            if !hasNoCertiInfo {
+            if hasNoCertiInfo {
                 make.height.equalTo(0)
             }
         }
@@ -319,19 +328,15 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             make.bottom.equalTo(certificateFrontView.snp.top).offset(-18)
         }
         
-        certificateFrontView.titleHeight = 20.0
-        certificateFrontView.imgHeight = 90.0
         certificateFrontView.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.right.equalTo(certificateBackView.snp.left).offset(-2)
+            make.right.equalTo(certificateBackView.snp.left).offset(0)
             make.width.equalTo(certificateBackView.snp.width)
             make.height.equalTo(122)
         }
         
-        certificateBackView.titleHeight = 20.0
-        certificateBackView.imgHeight = 90.0
         certificateBackView.snp.makeConstraints { make in
-            make.right.equalTo(-18)
+            make.right.equalTo(-8)
             make.top.equalTo(certificateFrontView)
             make.height.equalTo(122)
         }
@@ -351,3 +356,51 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         
     }
 }
+
+
+extension YHTravelCertificateUploadCell {
+    
+    func getOCR(url: String, isBack:Int) {
+        self.viewModel.getPublicImageUrl(url) {
+            
+            [weak self] success, error in
+            guard let self = self else { return }
+            guard let url = success else { return }
+                                    
+            //进行ocr识别
+            YHHUD.show(.progress(message: "识别中..."))
+            self.viewModel.getHKCardInfoByOcr(url, isBack: isBack) { success, error in
+                YHHUD.hide()
+                if success {
+                    if let tmpModel = self.viewModel.smallWhiteBarInfo {
+                        self.dataModel.issue_start = tmpModel.start_time
+                        self.dataModel.issue_end = tmpModel.end_time
+                        let latestDate = self.dataModel.latest_validaty_date
+                        let isValid = self.compareDates(dateString1: latestDate, dateString2: tmpModel.end_time)
+                        if !isValid {
+                            self.dataModel.isNeedCheck = true
+                            self.dataModel.checkTips = "有效期不足，请核查文件"
+                        }
+                        self.updateBlock?()
+                    }
+                }
+            }
+        }
+    }
+    
+    // 比较 dateString1 与 dateString2 的日期大小
+    func compareDates(dateString1: String, dateString2: String) -> Bool {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd"
+        
+        guard let date1 = dateFormatter.date(from: dateString1),
+              let date2 = dateFormatter.date(from: dateString2) else {
+            return false
+        }
+        
+        if date1 <= date2 {
+            return false
+        }
+        return true
+    }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_example_chinalife.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_example_chinalife@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_example_chinalife@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_example_chinatravel.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_example_chinatravel@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_example_chinatravel@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_example_travel.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_example_travel@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_example_travel@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}