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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHInformationPerfectListVC.swift

@@ -268,7 +268,7 @@ extension YHInformationPerfectListVC {
             YHMyNewSchemeViewController.shared.goToSchemePage()
 
         } else if serviceCenterMainReqVM.application_type == 1 || serviceCenterMainReqVM.application_type == 2 || serviceCenterMainReqVM.application_type == 3 { // 高才ABC
-            let vc = YHGCMineSchemeViewController()
+            let vc = YHGCMineSchemeViewController(orderId: orderId ?? 0)
             navigationController?.pushViewController(vc)
         }
     }

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

@@ -283,7 +283,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
             
         } else if type == 202 {
             //高才我的方案
-            let vc = YHGCMineSchemeViewController()
+            let vc = YHGCMineSchemeViewController(orderId: orderId)
             UIViewController.current?.navigationController?.pushViewController(vc)
             
         } else if type == 203 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/C/YHGCMineSchemeViewController.swift

@@ -37,6 +37,15 @@ class YHGCMineSchemeViewController: YHBaseViewController {
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }
+    private let orderId: Int
+    init(orderId: Int) {
+        self.orderId = orderId
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    @MainActor required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
 }
 
 extension YHGCMineSchemeViewController: UITableViewDelegate, UITableViewDataSource {
@@ -51,42 +60,29 @@ extension YHGCMineSchemeViewController: UITableViewDelegate, UITableViewDataSour
         let cell = tableView.dequeueReusableCell(withClass: YHGCSchemeTableViewCell.self)
         let model = dataSource[indexPath.row]
         cell.dataSource = model
-        cell.schemeBlock = {
-            /*
-            if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview"), model.title == "资料清单" {
-                let vc = YHMineCertificateEntryViewController()
-                vc.orderId = orderID as? Int ?? 0
-                UIViewController.current?.navigationController?.pushViewController(vc)
+        cell.schemeBlock = { [weak self] in
+            guard let self = self else {
+                return
+            }
+            if model.title == "资料清单" {
+                if self.reqSchemeVM.schemeModel?.certificate_skip_status == true {
+                    let vc = YHMineCertificateEntryViewController()
+                    vc.orderId = orderId
+                    self.navigationController?.pushViewController(vc)
+                } else {
+                    YHHUD.flash(message: "您的资料清单正在准备中，请耐心等待。")
+                }
             }
-            */
         }
         return cell
     }
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        if indexPath.row == 0 {
-            return 199
-        } else if indexPath.row == 1 {
-            return 251
-        } else if indexPath.row == 2 {
-            return 190
-        }
-        return 0
+        return UITableView.automaticDimension
     }
 }
 
 extension YHGCMineSchemeViewController {
-    func getData() {
-        let model1 = YHScemeItemModel(title: "职业界别", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：\n商业及贸易\n", lightMessage: "\n商业及贸易\n", subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。")
-        let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "(1)港澳通如未办理，请尽快办理好反馈过来；\n(2)如为国内学校，需要尽快办理学位认证报告；\n(3)如为海外学校，需提供成绩单副本")
-        let model3 = YHScemeItemModel(title: "文书清单", buttonTitle: "文书写作", mainMessage: "这是您的文书清单，包括推荐信、赴港计划书，我写好后会发在微信里，与您一起沟通进行哈。3周-4周左右完成，需要咱们共同配合完成的噢", lightMessage: "3周-4周")
-        dataSource = [model1, model2, model3]
-        tableView.reloadData()
-    }
-
-    func updateDataSource() {
-    }
-
     func setView() {
         view.backgroundColor = .contentBkgColor
         tableView = {
@@ -113,31 +109,27 @@ extension YHGCMineSchemeViewController {
     }
 
     func loadData() {
-        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
-            let param = ["order_id": orderID]
-            reqSchemeVM.getMySchemeData(params: param) { [weak self] success, error in
-                guard let self = self else {
-                    return
-                }
-                if success == true {
-                    guard let model = self.reqSchemeVM.schemeModel else { return }
+        let param = ["order_id": orderId]
+        reqSchemeVM.getMySchemeData(params: param) { [weak self] success, error in
+            guard let self = self else {
+                return
+            }
+            if success == true {
+                guard let model = self.reqSchemeVM.schemeModel else { return }
 
-                    let industry = model.industry.defaultStringIfEmpty()
-                    let model1 = YHScemeItemModel(title: "职业界别", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：" + industry, lightMessage: industry, subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。", lightFont: UIFont.PFSC_B(ofSize: 16), hideTopLine: true)
-                    let contentStr = model.content.reduce("") { partialResult, current in
-                        partialResult.count > 0 ? partialResult + "\n" + current : partialResult + current
-                    }
-                    let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "按照您填报的学历信息， 证明文件如下：\(contentStr)")
-                    self.dataSource = [model1, model2]
-                    self.tableView.reloadData()
-                    let type = YHGCApplicationType(rawValue: model.application_type) ?? .typeA
-                    self.headView.update(type: type, name: model.username.defaultStringIfEmpty())
-                } else {
-                    YHHUD.flash(message: error?.errorMsg ?? "请求出错")
+                let industry = model.industry.defaultStringIfEmpty()
+                let model1 = YHScemeItemModel(title: "职业界别", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：" + industry, lightMessage: industry, subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。", lightFont: UIFont.PFSC_B(ofSize: 16))
+                let contentStr = model.content.reduce("") { partialResult, current in
+                    partialResult.count > 0 ? partialResult + "\n" + current : partialResult + current
                 }
+                let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "按照您填报的学历信息， 证明文件如下：\(contentStr)")
+                self.dataSource = [model1, model2]
+                self.tableView.reloadData()
+                let type = YHGCApplicationType(rawValue: model.application_type) ?? .typeA
+                self.headView.update(type: type, name: model.username.defaultStringIfEmpty())
+            } else {
+                YHHUD.flash(message: error?.errorMsg ?? "请求出错")
             }
-        } else {
-            printLog("error : orderID 为空")
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/M/YHGCMySchemeModel.swift

@@ -15,6 +15,7 @@ class YHGCMySchemeModel: SmartCodable {
     var username : String = ""
     var sex: Int = 0
     var content: [String] = []
+    var certificate_skip_status: Bool = false
     
     required init() {
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/V/YHGCSchemeTableHeadView.swift

@@ -68,7 +68,7 @@ class YHGCSchemeTableHeadView: UIView {
     
     private lazy var titleCoverView: UIView = {
         let view = UIView()
-        view.backgroundColor = .white
+        view.backgroundColor = .clear
         return view
     }()
 
@@ -120,12 +120,6 @@ class YHGCSchemeTableHeadView: UIView {
         return label
     }()
 
-    private lazy var dashLineView: UIImageView = {
-        let view = UIImageView()
-        view.image = UIImage(named: "scheme_line_image")
-        return view
-    }()
-
     override init(frame: CGRect) {
         super.init(frame: frame)
         backgroundColor = UIColor(hex: 0x070E33)
@@ -158,7 +152,6 @@ class YHGCSchemeTableHeadView: UIView {
         subContainerView.addSubview(applicationTypeResultLabel)
         addSubview(dotView)
         addSubview(infoDetailLabel)
-        addSubview(dashLineView)
         centerImageView.snp.makeConstraints { make in
             make.left.right.top.equalToSuperview()
             make.height.equalTo(416)
@@ -206,16 +199,10 @@ class YHGCSchemeTableHeadView: UIView {
             make.top.equalTo(147)
         }
         
-        dashLineView.snp.makeConstraints { make in
+        titleCoverView.snp.makeConstraints { make in
             make.left.equalTo(28)
             make.right.equalToSuperview().offset(-28)
             make.top.equalTo(234)
-            make.height.equalTo(1)
-        }
-        
-        titleCoverView.snp.makeConstraints { make in
-            make.left.right.equalTo(dashLineView)
-            make.top.equalTo(dashLineView.snp.bottom).offset(26)
             make.height.equalTo(44)
         }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/V/YHGCSchemeTableViewCell.swift

@@ -98,14 +98,24 @@ class YHGCSchemeTableViewCell: UITableViewCell {
     private func setupLayout() {
         // Center View
         contentView.addSubview(centerView)
+        // Line Image View
+        contentView.addSubview(lineImageView)
+        // Title View
+        contentView.addSubview(titleView)
+        // Title Label
+        centerView.addSubview(titleLabel)
+        // Title Button
+        centerView.addSubview(titleButton)
+        // Main Message Label
+        centerView.addSubview(mainMessageLabel)
+        // Sub Message Label
+        centerView.addSubview(subMessageLabel)
         centerView.snp.makeConstraints { make in
             make.left.equalTo(8)
             make.right.equalTo(-8)
             make.top.bottom.equalToSuperview()
         }
         
-        // Line Image View
-        contentView.addSubview(lineImageView)
         lineImageView.snp.makeConstraints { make in
             make.left.equalTo(28)
             make.top.equalTo(0)
@@ -113,8 +123,6 @@ class YHGCSchemeTableViewCell: UITableViewCell {
             make.right.equalTo(-28)
         }
         
-        // Title View
-        contentView.addSubview(titleView)
         titleView.snp.makeConstraints { make in
             make.left.equalTo(28)
             make.top.equalTo(29)
@@ -122,17 +130,13 @@ class YHGCSchemeTableViewCell: UITableViewCell {
             make.width.equalTo(3.5)
         }
         
-        // Title Label
-        centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.centerY.equalTo(titleView)
             make.left.equalTo(titleView.snp.right).offset(4)
             make.height.equalTo(24)
             make.width.equalTo(150)
         }
-        
-        // Title Button
-        centerView.addSubview(titleButton)
+       
         titleButton.snp.makeConstraints { make in
             make.centerY.equalTo(titleView)
             make.right.equalTo(-28)
@@ -140,20 +144,17 @@ class YHGCSchemeTableViewCell: UITableViewCell {
             make.width.equalTo(76)
         }
         
-        // Main Message Label
-        centerView.addSubview(mainMessageLabel)
         mainMessageLabel.snp.makeConstraints { make in
             make.top.equalTo(69)
             make.left.equalTo(28)
             make.right.equalTo(-28)
         }
         
-        // Sub Message Label
-        centerView.addSubview(subMessageLabel)
         subMessageLabel.snp.makeConstraints { make in
             make.top.equalTo(mainMessageLabel.snp.bottom).offset(12)
             make.left.equalTo(28)
             make.right.equalTo(-28)
+            make.bottom.equalToSuperview().offset(-26)
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHGCIncomeRecordWorkExperienceViewController.swift

@@ -430,9 +430,9 @@ extension YHGCIncomeRecordWorkExperienceViewController: UITableViewDelegate, UIT
                         return
                     }
                     // 转换为数字
-                    let number = Double(text) ?? 0
+                    let number = Int64(text) ?? 0
                     // 格式化为带货币符号和千分位
-                    let detail = number / self.currencyRate
+                    let detail = Double(number) / self.currencyRate
                     if isIncomeMoney {
                         self.isIncomeMoneyOK = true
                         self.viewModel.position.income = "\(number)"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHGCPreviewViewModel.swift

@@ -196,6 +196,7 @@ extension YHGCPreviewViewModel {
                 }
 
                 self.basiceInfoPreviewModel = resultModel
+                self.installDataForBasicInfo()
                 // 根据返回值 组装 真实的数据
                 callBackBlock(true, nil)
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/M/YHGCWorkExperienceModel.swift

@@ -23,12 +23,12 @@ class YHGCWorkExperienceModel: SmartCodable {
     var location: YHAddress = YHAddress()
     
     /// 公司近一年的营业额 对于高A，仅当收入类型包含 6/7/8/10 时，该字段才有效
-    var turnover: String = ""
+    var turnover: String = "0"
     /// 高A使用 收入类型 1 工资薪金所得及全年一次性奖金; 2 上市公司股票期权或股权收入; 3 持股公司分红收入; 4 个体工商户/合伙企业/独资企业经营所得收入; 5
     /// 股权转让收入; 6 内地公司收入(持股50%及以上); 7 香港公司收入(持股50%及以上); 8 其他境外公司收入(持股50%及以上); 10 澳门公司收入(持股50%及以上)
     var type_of_income: [Int] = []
     /// 高A使用 收入金额
-    var income: String = ""
+    var income: String = "0"
     
     required init() {
     }