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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -33,8 +33,15 @@ class YHFileListViewController: YHBaseViewController {
     private lazy var myScrollView : UIScrollView = {
         let view = UIScrollView()
         view.backgroundColor = .red
+        return view
+    }()
     
     
+    private lazy var myContentView : UIView = {
+        let view = UIView()
+        view.backgroundColor = .yellow
+        view.layer.cornerRadius = kCornerRadius6
+        view.clipsToBounds = true
         return view
     }()
     
@@ -79,25 +86,60 @@ extension YHFileListViewController {
         gk_navBarAlpha = 1.0
         gk_navBackgroundColor = .white
         
-        view.addSubview(topBkg)
-        topBkg.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
-            make.left.right.equalToSuperview()
-            make.height.equalTo(312)
-        }
-        
-        
-        
-        
         view.addSubview(bottomView)
         bottomView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(YHFileListBottomView.viewH)
         }
+        
         bottomView.block = { flag in
             if flag == 1 {
                 printLog("生成清单")
             }
         }
+        
+        view.addSubview(myScrollView)
+        myScrollView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(bottomView.snp.top)
+        }
+        
+        myScrollView.addSubview(topBkg)
+        topBkg.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.equalToSuperview()
+            make.width.equalTo(KScreenWidth)
+            make.height.equalTo(312)
+        }
+        
+        myScrollView.addSubview(myContentView)
+        myContentView.snp.makeConstraints { make in
+            make.top.equalTo(217)
+            make.left.equalTo(kMargin)
+            make.width.equalTo(KScreenWidth - 2*kMargin)
+            make.height.equalTo(1700) //for test hjl
+//            make.bottom.equalToSuperview().offset(-50)
+        }
+        
+        let footLable = UILabel()
+        footLable.text = "*感谢您对银河移民的信赖，以上信息均用于香港优才签证申 请银河移民承诺对您所提供的信息将绝对保密"
+        footLable.textColor = .white
+        footLable.font = UIFont.PFSC_R(ofSize: 12)
+        footLable.numberOfLines = 0
+        footLable.lineBreakMode = .byWordWrapping
+        
+        myScrollView.addSubview(footLable)
+        footLable.snp.makeConstraints { make in
+            make.top.equalTo(myContentView.snp.bottom).offset(29)
+            make.left.equalTo(28)
+            make.width.equalTo(KScreenWidth - 2*28)
+            make.bottom.equalToSuperview().offset(-41)
+        }
+        
+        myScrollView.layoutIfNeeded()
+        
+        printLog(myScrollView.contentSize)
+        return
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListBottomView.swift

@@ -56,7 +56,7 @@ private extension YHFileListBottomView {
             let button = UIButton(type: .custom)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
             button.contentHorizontalAlignment = .center
-            button.setTitle("生成清单", for: .normal)
+            button.setTitle("保存清单图", for: .normal)
             button.setTitleColor(.white, for: .normal)
             button.layer.cornerRadius = kCornerRadius6
             button.clipsToBounds = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHMineCertificateEntryViewController.swift

@@ -172,15 +172,5 @@ extension YHMineCertificateEntryViewController : UITableViewDelegate,UITableView
             vc.categoryInfo = model.category_data[indexPath.section]
         }
         self.navigationController?.pushViewController(vc)
-
-        
-//        //获取订单号
-//        let orderId = serviceCenterMainReqVM.arrContactList[indexPath.section].id
-//        UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
-//        UserDefaults.standard.synchronize()
-//        
-//        let vc = YHServiceCenterSecondViewController()
-//        vc.orderId = orderId
-//        self.navigationController?.pushViewController(vc)
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/M/YHCertificateEntryModel.swift

@@ -15,6 +15,11 @@ class YHCertificateEntryModel: SmartCodable {
     var to_be_audit_num : Int = 0 //待审核
     var to_be_submit_num : Int = 0 //待提交
     var category_data : [YHCategoryData] = []
+    
+    
+    var sex : Int = 0 //1-男 2-女
+    var user_name : String = ""
+    
     required init() {
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/M/YHCertificateModel.swift

@@ -42,7 +42,7 @@ class YHCategoryData: SmartCodable {
         case categoryId = "category_id"
         case checkStatus = "check_status"
         case sex = "sex"
-        case userName = "User_name"
+        case userName = "user_name"
     }
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryCell.swift

@@ -49,7 +49,11 @@ class YHCertificateEntryCell: UITableViewCell {
 extension YHCertificateEntryCell {
     func updateUI() {
         guard let dataModel = dataModel else { return }
-        contractNameLable.text = dataModel.applicantName + "(" + dataModel.userName + ")"
+        var name = ""
+        if dataModel.userName.isEmpty == false {
+            name = "(" + dataModel.userName + ")"
+        }
+        contractNameLable.text = dataModel.applicantName + name
         
         //0：未审核，1：通过 2：驳回,3：未提交',
         var title = ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryHeadView.swift

@@ -84,8 +84,42 @@ private extension YHCertificateEntryHeadView {
 
     }
     
-    
     func updateUI() {
+        guard let dataModel = dataModel else { return }
+        var tmp = ""
+        if dataModel.user_name.isEmpty {
+            tmp = "尊敬的用户"
+        } else {
+            tmp = dataModel.user_name
+            if dataModel.sex == 1 {
+                tmp = tmp + "先生"
+            } else if dataModel.sex == 2 {
+                tmp = tmp + "女士"
+            } else {
+                
+            }
+        }
+        nameLable.text = "您好," + tmp
+        
+        let a: ASAttributedString = .init("待上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
+        let aa: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_submit_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        
+        
+        let b: ASAttributedString = .init("件，已驳回", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
+        let bb: ASAttributedString = .init(NSAttributedString(string: String(dataModel.reject_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        
+        
+        let c: ASAttributedString = .init("件，审核中", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
+        let cc: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_audit_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        
+        
+        let d: ASAttributedString = .init("件，已通过", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
+        let dd: ASAttributedString = .init(NSAttributedString(string: String(dataModel.pass_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        
+        
+        let e: ASAttributedString = .init("件", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
+        statiticLable.attributed.text = a + aa + b + bb + c + cc + d + dd + e
+        
         
     }
 }