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:
  //  旅行

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

@@ -363,21 +363,7 @@ extension YHServiceCenterMainViewController {
             let a: ASAttributedString = .init("您好，\(name)，您现处于", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
             let aa: ASAttributedString = .init(NSAttributedString(string: applicant.stage_name), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
             let aaa: ASAttributedString = .init("阶段，让我们一起共同完成您的身份申请之旅吧~", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-            
-            let b: ASAttributedString = .init("阶段。为使您的身份能够顺利激活并助力后续永居规划，请依据", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-            let c: ASAttributedString = .init("《", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
-            let bb: ASAttributedString = .init("香港身份获批操作指引", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor), .underline(.single), .action {
-                //点击出现操作指引
-                let view = YHOffivialApprovalGuildLineCheckView.sheetView()
-                view.show()
-            })
-            let cc: ASAttributedString = .init("》", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
-            let bbb: ASAttributedString = .init("完成以下事项", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-            if applicant.type == 3 {
-                self.nameLabel.attributed.text = a + aa + b + c + bb + cc + bbb
-            } else {
-                self.nameLabel.attributed.text = a + aa + aaa
-            }
+            self.nameLabel.attributed.text = a + aa + aaa
         }
     }
     
@@ -385,7 +371,6 @@ extension YHServiceCenterMainViewController {
         nameBgImageView = {
             let view = UIImageView()
             view.image = UIImage(named: "service_name_bg")?.resizableImage(withCapInsets: UIEdgeInsets(top: 21, left: 68, bottom: 11, right: 14), resizingMode: .stretch)
-            view.isUserInteractionEnabled = true
             return view
         }()
         view.addSubview(nameBgImageView)

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

@@ -299,7 +299,6 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                             let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
                             token.insert(contentsOf: addtionString, at: indexToInsert)
                             url = url + "?paramO=\(self.orderID)" + "&param=" + token
-                            url = url + "&app_platform=ios" + "&app_version=" + UIDevice.appVersion()
                             printLog("UURL: \(url)")
                             let vc = YHH5WebViewVC()
                             vc.url = url

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

@@ -169,24 +169,33 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
     }
     
     func checkInfo() -> Bool {
+        var hasError = false
         for item in sectionItems {
             if item.type == .certificate {
                 if item.cerDetailModel.img_front.isEmpty || item.cerDetailModel.img_back.isEmpty {
-                    item.cerDetailModel.isNeedCheck = true
+                    hasError = true
+                    item.cerDetailModel.isNeedCheckCer = true
                     if item.cerDetailModel.type == 3 {
-                        item.cerDetailModel.checkTips = "请上港澳通行证"
+                        item.cerDetailModel.checkTips = "请上传港澳通行证"
                     }
-                    self.tableView.reloadData()
-                    return false
-                } else {
-                    item.cerDetailModel.isNeedCheck = false
-                    item.cerDetailModel.checkTips = ""
-                    self.tableView.reloadData()
-                    return true
+                }
+                    
+                if item.cerDetailModel.issue_start.isEmpty || item.cerDetailModel.issue_end.isEmpty {
+                    hasError = true
+                    item.cerDetailModel.isNeedCheckDate = true
+                }
+                
+                if !hasError {
+                    item.cerDetailModel.isNeedCheckCer = false
+                    item.cerDetailModel.isNeedCheckDate = false
                 }
             }
         }
         self.tableView.reloadData()
+        
+        if hasError {
+            return false
+        }
         return true
     }
 }
@@ -285,6 +294,13 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS
                 guard let self = self else { return }
                 self.tableView.reloadData()
             }
+            cell.templateClick = {
+                
+                // 证件类型 1-护照 2-中国旅行证 3-港澳通行证 4-存款证明 5-其他
+                [weak self] type in
+                guard let self = self else { return }
+                
+            }
         }
         return cell
     }

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

@@ -35,13 +35,15 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     var nationality : String = ""//国籍 1-中国 2-国外
     
     // 自定义
-    var isNeedCheck: Bool = false
+    var isNeedCheckCer: Bool = false
     var checkTips: String = ""
     var isNeedShowRejectReason: Bool = false
     var rejectReason: String = ""
     var latest_validaty_date : String = ""
+    var isNeedCheckDate: Bool = false
     
     required init() {
+        
     }
     
     init(type: Int, order_id: Int, order_sn: String, img_back: String, img_front: String, status: Int, issue_start: String, issue_end: String, user_id: Int, user_type: String, remark: String, nationality: String) {

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

@@ -45,6 +45,9 @@ class YHTravelCertificateUploadCell: UITableViewCell {
     
     var updateBlock: (()->())?
     
+    // type :Int 证件类型 1-护照 2-中国旅行证 3-港澳通行证 4-存款证明 5-其他
+    var templateClick: ((_ type:Int)->())?
+    
     lazy var whiteConentView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
@@ -146,6 +149,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
     
     @objc func didTemplateBtnClicked() {
         
+        templateClick?(self.dataModel.type)
     }
     
     func updateArr(_ arr: [YHCertificateDateItem]) {
@@ -163,6 +167,21 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                 [weak self] in
                 guard let self = self else { return }
                 
+                if item.id == .signDate || item.id == .deadDate {
+                    YHDatePickView.show(type: .yyyymmdd) {
+                        time in
+                        
+                        if item.id == .signDate {
+                            self.dataModel.issue_start = time
+                            
+                        } else if item.id == .deadDate {
+                            self.dataModel.issue_end = time
+                        }
+                    }
+                    
+                } else if item.id == .kind {
+                    
+                }
             }
             selectPanelContentView.addSubview(itemView)
             itemView.snp.makeConstraints { make in
@@ -207,7 +226,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             titleStr = mustTag + titleStr
         }
         if isShowTemplate {
-            title += template
+            titleStr += template
         }
         titleView.attributed.text = titleStr
         
@@ -232,7 +251,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             }
         }
         
-        let isShowCheck = (model.isNeedCheck && !model.checkTips.isEmpty)
+        let isShowCheck = (model.isNeedCheckCer && !model.checkTips.isEmpty)
         
         unvalidLabel.snp.remakeConstraints { make in
             make.top.equalTo(certificateFrontView.snp.bottom).offset(isShowCheck ? 8 : 0)
@@ -266,8 +285,8 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             
         } else {
             
-            let item1 = YHCertificateDateItem(id: .signDate, title: "签发日期", value: model.issue_start, placeHolder: "请选择", errorTips: "请选择签发日期", isShowErrorTips: false)
-            let item2 = YHCertificateDateItem(id: .deadDate, title: "届满日期", value: model.issue_end, placeHolder: "请选择", errorTips: "请选择届满日期", isShowErrorTips: false)
+            let item1 = YHCertificateDateItem(id: .signDate, title: "签发日期", value: model.issue_start, placeHolder: "请选择", errorTips: "请选择签发日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_start.isEmpty)
+            let item2 = YHCertificateDateItem(id: .deadDate, title: "届满日期", value: model.issue_end, placeHolder: "请选择", errorTips: "请选择届满日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_end.isEmpty)
             let arr:[YHCertificateDateItem] = [item1, item2]
             updateArr(arr)
         }
@@ -372,13 +391,13 @@ extension YHTravelCertificateUploadCell {
             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
+                    if let tmpModel = self.viewModel.hkMacoCardOcrInfo {
+                        self.dataModel.issue_start = tmpModel.term_begins
+                        self.dataModel.issue_end = tmpModel.end_of_term
                         let latestDate = self.dataModel.latest_validaty_date
-                        let isValid = self.compareDates(dateString1: latestDate, dateString2: tmpModel.end_time)
+                        let isValid = self.compareDates(dateString1: latestDate, dateString2: tmpModel.end_of_term)
                         if !isValid {
-                            self.dataModel.isNeedCheck = true
+                            self.dataModel.isNeedCheckCer = true
                             self.dataModel.checkTips = "有效期不足，请核查文件"
                         }
                         self.updateBlock?()

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -221,6 +221,10 @@ class YHAllApiName {
         static let updateInformation = "infoflow/order-information/update_information"
         // 主申请人国家信息
         static let countryInformation = "infoflow/country"
+        // 主申请人中国
+        static let cnIdCard = "infoflow/order-information/get_id_card"
+        // 主申请人港澳通行证
+        static let hkIdCard = "infoflow/order-information/get_hk_macao_pass"
     }
     
     struct WorkExperience {
@@ -296,12 +300,8 @@ class YHAllApiName {
     struct OCR {
         //中国身份证识别
         static let cn = "ocr/id_card/recognize"
-        //ocr港澳通行证识别 正面信息
+        //港澳通行证识别
         static let hk = "ocr/permit/recognize"
-        
-        // ocr港澳通行证 背面信息
-        static let hkmacowBackInfoApi = "infoflow/order-information/get_hk_macao_pass"
-        
         //普通文本识别 - eg：图片中扣字
         static let normal = "ocr/advanced/recognize"
         //小白条识别