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/Modules/Mine（我的）/C/YHMyViewController.swift

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift

@@ -451,10 +451,11 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
                 viewModel.state = two
                 self.page = 1
                 //请求刷新数据
+                self.tableView.es.resetNoMoreData()
                 self.viewModel.postRecord(page: 1) {[weak self] success, error in
                     guard let self = self else { return }
-                    self.tableView.es.stopLoadingMore()
-                    if self.viewModel.recordModel.page_count == self.page {
+//                    self.tableView.es.stopLoadingMore()
+                    if self.viewModel.recordModel.page_count == 1 {
                         self.tableView.es.noticeNoMoreData()
                         self.tableView.footer?.alpha = 1
                     }

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/VM/YHInvitationWithGiftsViewModel.swift

@@ -46,10 +46,10 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
             param.updateValue(self.startTime, forKey: "registered_date.begin_date")
         }
         if self.endTime.count != 0 {
-            param.updateValue(self.endTime, forKey: "egistered_date.end_date")
+            param.updateValue(self.endTime, forKey: "registered_date.end_date")
         }
         if self.state < 3 {
-            param.updateValue(self.state + 1, forKey: "status")
+            param.updateValue((2 - self.state) + 1, forKey: "status")
         }
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             guard let self = self else { return }
@@ -83,7 +83,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
         var param: [String: Any] = ["page": page,
                                     "pagesize": 20]
         if self.state < 3 {
-            param.updateValue(self.state + 1, forKey: "status")
+            param.updateValue((2 - self.state) + 1, forKey: "status")
         }
         if !registered_date.isEmpty {
             param.updateValue(registered_date, forKey: "registered_date")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleReviewListVC.swift

@@ -8,20 +8,7 @@
 
 import UIKit
 import SmartCodable
-
-enum YHPrincipleUploadStatus : Int {
-    // 全部
-    case all = -1
-    // 审核中
-    case review = 0
-    // 已完成
-    case finish = 1
-    // 已驳回
-    case rejected = 2
-    // 待上传
-    case preUpload = 3
-}
-
+import AttributedString
 
 class YHPrincipleReviewListVC: YHBaseViewController {
 
@@ -58,6 +45,17 @@ class YHPrincipleReviewListVC: YHBaseViewController {
         return view
     }()
     
+    lazy var uploadBtn:UIButton = {
+        let btn = UIButton()
+        btn.setTitle("确认上传".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+        btn.setTitleColor(.white, for: .normal)
+        btn.backgroundColor = UIColor.brandMainColor
+        btn.layer.cornerRadius = kCornerRadius3
+        btn.addTarget(self, action: #selector(didUploadBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.view.backgroundColor = .white
@@ -71,14 +69,24 @@ class YHPrincipleReviewListVC: YHBaseViewController {
     func createUI() {
         view.addSubview(bgView)
         view.addSubview(tableView)
+        view.addSubview(uploadBtn)
 
         bgView.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
             make.bottom.equalToSuperview()
         }
+        
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
-            make.left.right.bottom.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(uploadBtn.snp.top).offset(-8)
+        }
+        
+        uploadBtn.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-42)
+            make.height.equalTo(48.0)
         }
     }
     
@@ -88,7 +96,7 @@ class YHPrincipleReviewListVC: YHBaseViewController {
         group.enter()
         // 请求上传信息（《赴港居留同意书》、申请人意见访问、其他证明材料）
         viewModel.getPrincipleUploadDetail(orderId: orderId) { success, error in
-//            self.viewModel.uploadDetailModel
+            // self.viewModel.uploadDetailModel
             group.leave()
         }
         
@@ -115,21 +123,23 @@ class YHPrincipleReviewListVC: YHBaseViewController {
         // 赴港居留同意书
         let agreementModel = self.viewModel.uploadDetailModel.file_data.agreement
         agreementModel.customType = YHPrincipleAgreementType.agreement.rawValue
-        agreementModel.title = "《赴港居留同意书》"
         agreementModel.isMust = true
         agreementModel.isNeedTemplate = true
         self.items.append(agreementModel)
         
         // 申请人意见访问
-        let opinionModel = self.viewModel.uploadDetailModel.file_data.agreement
-        opinionModel.customType = YHPrincipleAgreementType.agreement.rawValue
-        opinionModel.title = "申请人意见访问"
+        let opinionModel = self.viewModel.uploadDetailModel.file_data.opinion
+        opinionModel.customType = YHPrincipleAgreementType.opinion.rawValue
         opinionModel.isMust = true
         opinionModel.isNeedTemplate = true
-        self.items.append(self.viewModel.uploadDetailModel.file_data.opinion)
+        self.items.append(opinionModel)
         
         // 其他证明条件
-        self.items.append(self.viewModel.uploadDetailModel.file_data.other)
+        let otherModel = self.viewModel.uploadDetailModel.file_data.other
+        otherModel.customType = YHPrincipleAgreementType.other.rawValue
+        otherModel.isMust = false
+        otherModel.isNeedTemplate = false
+        self.items.append(otherModel)
         
         // 已获得港府甄选名额
         self.items.append(self.viewModel.envelopModel)
@@ -157,7 +167,9 @@ class YHPrincipleReviewListVC: YHBaseViewController {
 
 extension YHPrincipleReviewListVC {
     
-    
+    @objc func didUploadBtnClicked() {
+        
+    }
 }
 
 extension YHPrincipleReviewListVC: UITableViewDelegate, UITableViewDataSource {
@@ -237,11 +249,11 @@ extension YHPrincipleReviewListVC: UITableViewDelegate, UITableViewDataSource {
     }
 
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
-        return 24.0
+        return UITableView.automaticDimension
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 1.0
+        return 0.01
     }
     
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
@@ -251,6 +263,43 @@ extension YHPrincipleReviewListVC: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
-        return UIView()
+        return self.getHeaderView()
+    }
+    
+    func getHeaderView() -> UIView {
+        
+        let view = UIView()
+        
+        let titleLabel = UILabel()
+        titleLabel.numberOfLines = 0
+        let title: ASAttributedString = .init("祝贺您，\(self.viewModel.waitResultModel.applicant.userName)先生！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
+        titleLabel.attributed.text = title
+        view.addSubview(titleLabel)
+        
+        let detailLabel = UILabel()
+        detailLabel.numberOfLines = 0
+        let str1: ASAttributedString = .init("您【与家人】申请的【优秀人才入境计划】，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        let str2: ASAttributedString = .init("已获得港府的甄选名额", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        let str3: ASAttributedString = .init("，请您于", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        let time: ASAttributedString = .init("\(self.viewModel.envelopModel.date)", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        let str4: ASAttributedString = .init("前补充更多文件，即可等待获得港府的正式批准！", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        detailLabel.attributed.text = str1 + str2 + str3 + time + str4
+        view.addSubview(detailLabel)
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(12)
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.height.equalTo(34)
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.bottom.equalTo(-36)
+        }
+    
+        return view
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/M/YHPrincipleUploadModel.swift

@@ -104,7 +104,7 @@ class YHPrincipleAgreementModel: SmartCodable  {
     var is_check: Int = 0
     var upload_requirement: Int = 0
     var submit_time: String = ""
-    var check_status: Int = 0
+    var check_status: Int = YHPrincipleUploadStatus.preUpload.rawValue
     var audit_content: String = ""
     var audit_content_crm: String = ""
     var sort: Int = 0
@@ -157,9 +157,15 @@ class YHPrincipleAgreementModel: SmartCodable  {
     // 自定义属性
     var customType: Int = YHPrincipleAgreementType.none.rawValue
     var isMust: Bool = false // 是否必须
-    var title: String = ""
-    var isNeedTemplate: Bool = true
-    var isNeedUploadBtn: Bool = true
+    var isNeedTemplate: Bool = false
+    var isNeedUploadBtn: Bool {
+        return self.check_status == YHPrincipleUploadStatus.preUpload.rawValue ||
+               self.check_status == YHPrincipleUploadStatus.rejected.rawValue
+    }
+    // 是否展示上传状态
+    var isNeedUploadStatus: Bool {
+        return self.check_status != YHPrincipleUploadStatus.preUpload.rawValue
+    }
     
     // 灰色或红色提示语
     var tips: String = ""
@@ -171,15 +177,6 @@ class YHPrincipleAgreementModel: SmartCodable  {
     var isUnfold: Bool = false
     //
     var fileList:[String] = []
-
-    
-//    static func getTips() -> ASAttributedString {
-//        let a: ASAttributedString = .init("请【下载模板】，填写信息，贵单位", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.mainTextColor))
-//        let b: ASAttributedString = .init("签字盖章", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x3570DC)))
-//        let c: ASAttributedString = .init("后，拍照or扫描上传", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.mainTextColor))
-//        return a + b + c
-//    }
-    
     
     required init() {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleUploadFileCell.swift

@@ -33,6 +33,7 @@ class YHPrincipleUploadFileCell: UITableViewCell {
     
     func setupUI() {
         
+        self.selectionStyle = .none
         iconImgV = UIImageView(image: UIImage(named: "my_cer_type_pdf"))
         self.addSubview(iconImgV)
         

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -100,7 +100,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
 //            let vc = YHMySettingViewController()
 //            self.navigationController?.pushViewController(vc)
             
-            
+        
             let vc = YHOfficialApprovalResultVC2()
             self?.navigationController?.pushViewController(vc) //for test hjl
         }