赴港计划书 7项目

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/Model/YHHKPlanDocModel.swift

@@ -12,11 +12,11 @@ enum HKPlanDocQuestionType {
     case unknow
     case planDocQuestion1 //1、主要事业成就
     case planDocQuestion2 //2、专业技能成就
-    case planDocQuestion3 //3、学业成就
-    case planDocQuestion4 //4、未来发展计划
-    case planDocQuestion5 //5、专业资格及奖项
-    case planDocQuestion6 //6、其他材料
-    case planOther        //7、备注
+    case planDocQuestion3 //3、专业资格|奖项
+    case planDocQuestion4 //4、专业技能|成就
+    case planDocQuestion5 //5、对香港潜在贡献
+    case planDocQuestion6 //6、计划计划
+    case planOther        //7、其他重要资料
 }
 
 class YHHKPlanDocModel {
@@ -24,6 +24,8 @@ class YHHKPlanDocModel {
     var content : String = ""
     var type : HKPlanDocQuestionType = .unknow
     
+    var other : String = ""
+    
     //本地使用
     var canEditFlag : Bool = true
     var isFirstData : Bool = false

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/Model/YHMyDocumentDetailModel.swift

@@ -23,6 +23,8 @@ class YHMyDocumentProspectusModel: SmartCodable {
     var career_achievement: String = ""
     var professional_skills: String = ""
     var academic_achievement: String = ""
+    var visa_contribution : String = ""
+    var talent_list: String = ""
     var plan_detail: String = ""
     var created_at: String = ""
     var updated_at: String = ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -37,6 +37,35 @@ class YHHKPlanItemView: UIView {
     }()
     
     
+    private lazy var subHoldView : UIView = {
+        let view = UIView()
+        view.backgroundColor = .contentBkgColor
+        view.clipsToBounds = true
+        view.layer.cornerRadius = kCornerRadius3
+        
+        return view
+    }()
+    
+    
+    
+    private lazy var subHoldView2 : UIView = {
+        let view = UIView()
+        view.backgroundColor = .contentBkgColor
+        view.clipsToBounds = true
+        view.layer.cornerRadius = kCornerRadius3
+        return view
+    }()
+    
+    
+    private lazy var skillLabel : UILabel = {
+        let view = UILabel()
+        view.text = "所属专业名称(如有）：资深数据科学家"
+        view.font = UIFont.PFSC_R(ofSize: 14)
+        view.textColor = .init(hex: 0x6D788A)
+        return view
+    }()
+    
+    
     private lazy var myTextView : UITextView = {
         let view = UITextView()
         view.textColor = UIColor.mainTextColor
@@ -53,7 +82,7 @@ class YHHKPlanItemView: UIView {
     private lazy var nameLable : UILabel = {
         let lable0 = UILabel(text: "1、主要事业成就")
         lable0.textColor = UIColor.mainTextColor
-        lable0.font = UIFont.PFSC_M(ofSize: 17)
+        lable0.font = UIFont.PFSC_M(ofSize: 14)
         return lable0
     }()
     
@@ -134,16 +163,30 @@ private extension YHHKPlanItemView {
             make.height.width.equalTo(16)
         }
         
+        iconImageV.isHidden = true
+        
         
         let tap : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapButton(gestureRecognizer:)))
         iconImageV.isUserInteractionEnabled = true
         iconImageV.addGestureRecognizer(tap)
         
         
-        let subHoldView : UIView = UIView()
-        subHoldView.backgroundColor = UIColor.contentBkgColor
-        subHoldView.layer.cornerRadius = kCornerRadius6
-        subHoldView.clipsToBounds = true
+        //add
+        holdView.addSubview(subHoldView2)
+        subHoldView2.snp.makeConstraints { make in
+            make.top.equalTo(nameLable.snp.bottom).offset(12)
+            make.left.right.equalToSuperview()
+        }
+        
+        subHoldView2.addSubview(skillLabel)
+        skillLabel.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(12)
+            make.left.equalTo(12)
+            make.right.equalTo(-12)
+            make.bottom.equalToSuperview().offset(-12)
+        }
+        subHoldView2.isHidden = true
+        
         holdView.addSubview(subHoldView)
         subHoldView.snp.makeConstraints { make in
             make.top.equalTo(nameLable.snp.bottom).offset(12)
@@ -202,6 +245,17 @@ private extension YHHKPlanItemView {
     
     func updateUI() {
         guard let model = dataMode else { return }
+        
+        if model.type == .planDocQuestion4 {
+            iconImageV.isHidden = true
+        }
+        else if model.type == .planOther {
+            iconImageV.isHidden = true
+        }
+        else {
+            iconImageV.isHidden = false
+        }
+        
         nameLable.text = model.title
         myTextView.text = model.content
         if model.canEditFlag {
@@ -219,11 +273,8 @@ private extension YHHKPlanItemView {
         if model.type == .planOther {
             maxNumbler = 100
             tipsTxt = "在此补充其他信息，非必填"
-            
-            iconImageV.isHidden = true
         } else {
             maxNumbler = 100
-            iconImageV.isHidden = false
         }
         
         tipsLable.text = tipsTxt
@@ -260,6 +311,40 @@ private extension YHHKPlanItemView {
             }
         }
         
+        
+        //布局
+        if model.other.isEmpty {
+            subHoldView2.isHidden = true
+            
+            subHoldView.snp.removeConstraints()
+            subHoldView.snp.remakeConstraints() { make in
+                make.top.equalTo(nameLable.snp.bottom).offset(12)
+                make.left.equalTo(0)
+                make.right.equalTo(0)
+                make.bottom.equalTo(line.snp.top).offset(-18)
+            }
+            
+        } else {
+            subHoldView2.isHidden = false
+            skillLabel.text = model.other
+            
+            subHoldView.snp.removeConstraints()
+            subHoldView2.snp.removeConstraints()
+            
+            subHoldView2.snp.remakeConstraints() { make in
+                make.top.equalTo(nameLable.snp.bottom).offset(12)
+                make.left.right.equalToSuperview()
+            }
+            
+            subHoldView.snp.remakeConstraints() { make in
+                make.top.equalTo(subHoldView2.snp.bottom).offset(12)
+                make.left.equalTo(0)
+                make.right.equalTo(0)
+                make.bottom.equalTo(line.snp.top).offset(-18)
+            }
+            
+            
+        }
     }
     
     func calcTextLength(string : String) -> Int {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift

@@ -330,7 +330,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.signCallBack
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
-            guard let self = self else { return }
+            guard self != nil else { return }
             if json.code == 200 {
                 callBackBlock(true, nil)
             } else {
@@ -365,59 +365,62 @@ private extension YHMyDocumentsDetailViewModel {
             arrHKPlanData.append(tModel)
         }
         
-        //2、专业技能成就
+        //2、学业成就
         do {
             let tModel = YHHKPlanDocModel()
-            tModel.title = "2、专业技能成就"
-            tModel.content = model.professional_skills.defaultStringIfEmpty(detaultValue: "")
+            tModel.title = "2、学业成就"
+            tModel.content = model.academic_achievement.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion2
-            
             arrHKPlanData.append(tModel)
         }
         
-        //3、学业成就
+        //3、专业资格
         do {
             let tModel = YHHKPlanDocModel()
-            tModel.title = "3、学业成就"
-            tModel.content = model.academic_achievement.defaultStringIfEmpty(detaultValue: "")
+            tModel.title = "3、专业资格"
+            tModel.content = model.qualifications_and_awards.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion3
+            
             arrHKPlanData.append(tModel)
         }
         
-        //4、未来发展计划
+        //4、专业技能或人才清单内相关专业的成就
         do {
             let tModel = YHHKPlanDocModel()
-            tModel.title = "4、未来发展计划"
-            tModel.content = model.plan_detail.defaultStringIfEmpty(detaultValue: "")
+            tModel.title = "4、专业技能或人才清单内相关专业的成就"
+            tModel.content = model.professional_skills.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion4
+            tModel.other = model.talent_list.defaultStringIfEmpty(detaultValue: "")
             
             arrHKPlanData.append(tModel)
         }
+       
         
-        //5、专业资格及奖项
+        //5、对香港的潜在贡献
         do {
             let tModel = YHHKPlanDocModel()
-            tModel.title = "5、专业资格及奖项"
-            tModel.content = model.qualifications_and_awards.defaultStringIfEmpty(detaultValue: "")
+            tModel.title = "5、对香港的潜在贡献"
+            tModel.content = model.visa_contribution.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion5
             
             arrHKPlanData.append(tModel)
         }
         
-        //6、其他材料
+        //6、未来在香港发展事业的计划
         do {
             let tModel = YHHKPlanDocModel()
-            tModel.title = "6、其他材料"
-            tModel.content = model.other.defaultStringIfEmpty(detaultValue: "")
+            tModel.title = "6、未来在香港发展事业的计划"
+            tModel.content = model.plan_detail.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion6
             
             arrHKPlanData.append(tModel)
         }
-        //6、备注
+        
+        //7、认为对评核你的申请非常重要的其他资料
         do {
             let tModel = YHHKPlanDocModel()
-            tModel.title = "7、备注"
-            tModel.content = model.remark.defaultStringIfEmpty(detaultValue: "")
+            tModel.title = "7、认为对评核你的申请非常重要的其他资料"
+            tModel.content = model.other.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planOther
             tModel.isLastData = true
             

galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift

@@ -96,20 +96,21 @@ class YHWholeScreenTipsView: UIView {
             return "该栏目已对好友隐藏，若需重新开启，请前往信息授权处更新设置"
         case .nameCardWorkExperience:
             return "该栏目已对好友隐藏，若需重新开启，请前往信息授权处更新设置"
+            
         case .hkPlanQ1:
-            return "请以不超过100字简介你的主要事业成就，包括你在主要工作项目上曾担当的角色、你工作期间曾服务的知名机构/单位或你对有关工作项目及机构的重大贡献"
+            return "请以不超过100字简介你在主要工作项目上曾担当的角色、你工作期间曾服务的知名机构/单位或你对有关工作项目及机构的重大贡献"
         case .hkPlanQ2:
-            return "请以不超过100字简介你的专业技能或人才清单内相关专业的成就，以及有关技能/专业如何对香港经济或社会做出重大贡献"
+            return "请以不超过100字简介你的学业成绩或曾取得的奖项"
         case .hkPlanQ3:
-            return "请以不超过100字简介你的学业成就，包括你的学业成绩或曾取得的奖项（如有）"
+            return "请以不超过100字简介你在所属的专业界别内曾获取由国家或国际认可/著名的团体颁授的专业资格，及曾取得的奖项"
         case .hkPlanQ4:
-            return "请以不超过100字简介你未来在香港发展事业的计划，包括你与本地商业或学业机构联系及合作的详情（如有）"
+            return ""
         case .hkPlanQ5:
-            return "请以不超过100字简介你所属的专业界别内曾获取由国家或国际认可/著名团体颁奖的专业资格，及曾取得的奖项（如有）"
+            return "请以不超过100字简介你的人才清单内相关专业、专业技能或成就（例如你拥有的专利或发明、你在学术研究的领导角色、或你在专业领域获得的国际或地区奖项）如何对香港经济或社会作出重大贡献"
         case .hkPlanQ6:
-            return "请以不超过100字简介你认为对评核你的申请非常重要的其他材料"
+            return "请以不超过100字简介你与本地商业或学术机构联系及合作的详情"
         case .hkPlanQ7:
-            return "您可以在此输入因为字数限制无法输入的内容"
+            return ""
         case .renewTimeTips:
             return "入境处网址18:00之后可能会存在系统更新，为避免预约时间无法递交，请尽量选择18:00之前的时间"
         default: