赴港计划书 展示 UI调整

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -278,6 +278,7 @@
 		A582B2432BB95E20009D098C /* YHHKPlanCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B2422BB95E20009D098C /* YHHKPlanCell.swift */; };
 		A582B2452BBA4CF9009D098C /* YHHKPlanDocModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B2442BBA4CF9009D098C /* YHHKPlanDocModel.swift */; };
 		A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58556B92B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift */; };
+		A587F7C02BBADBE1002D9781 /* YHHKPlanItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A587F7BF2BBADBE1002D9781 /* YHHKPlanItemView.swift */; };
 		A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A58951C42B398D1000225C19 /* Launch Screen.storyboard */; };
 		A58A8C8F2BA6978100632765 /* YHMineCertificateEntryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58A8C8E2BA6978100632765 /* YHMineCertificateEntryViewController.swift */; };
 		A58A8C942BA6C7C600632765 /* YHCertificateEntryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58A8C932BA6C7C600632765 /* YHCertificateEntryModel.swift */; };
@@ -689,6 +690,7 @@
 		A582B2422BB95E20009D098C /* YHHKPlanCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanCell.swift; sourceTree = "<group>"; };
 		A582B2442BBA4CF9009D098C /* YHHKPlanDocModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanDocModel.swift; sourceTree = "<group>"; };
 		A58556B92B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoFillStepModel.swift; sourceTree = "<group>"; };
+		A587F7BF2BBADBE1002D9781 /* YHHKPlanItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanItemView.swift; sourceTree = "<group>"; };
 		A58951C42B398D1000225C19 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		A58A8C8E2BA6978100632765 /* YHMineCertificateEntryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineCertificateEntryViewController.swift; sourceTree = "<group>"; };
 		A58A8C932BA6C7C600632765 /* YHCertificateEntryModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryModel.swift; sourceTree = "<group>"; };
@@ -1665,6 +1667,7 @@
 				A582B2402BB95998009D098C /* YHHKPlanTipsCell.swift */,
 				044CF8D52BBA57DC00008CE8 /* YHFailPromptView.swift */,
 				A582B2422BB95E20009D098C /* YHHKPlanCell.swift */,
+				A587F7BF2BBADBE1002D9781 /* YHHKPlanItemView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2483,6 +2486,7 @@
 				045EEEEE2B9F171A0022A143 /* YHCertificateUploadVC.swift in Sources */,
 				A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */,
 				A5ACE93E2B4564F7002C94D2 /* UIImage+Extension.swift in Sources */,
+				A587F7C02BBADBE1002D9781 /* YHHKPlanItemView.swift in Sources */,
 				A5ACE94C2B4564F7002C94D2 /* YHHUDErrorView.swift in Sources */,
 				A5EF21332BA6E030005027E6 /* YHFileListViewController.swift in Sources */,
 				045EEF1E2B9F171A0022A143 /* YHBottomNextView.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift

@@ -159,7 +159,7 @@ extension YHHKPlanDoctumentVC {
         
         
         tableView = {
-            let tableView = UITableView(frame:.zero, style:.plain)
+            let tableView = UITableView(frame:.zero, style:.grouped)
             tableView.contentInsetAdjustmentBehavior = .never
             tableView.backgroundColor = .clear
             tableView.separatorStyle = .none
@@ -200,10 +200,7 @@ extension YHHKPlanDoctumentVC: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if section == 0 {
-            return 1
-        }
-        return viewModel.arrHKPlanData.count
+       return 1
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -216,11 +213,30 @@ extension YHHKPlanDoctumentVC: UITableViewDelegate, UITableViewDataSource {
         
         let cell = tableView.dequeueReusableCell(withClass: YHHKPlanCell.self)
         cell.selectionStyle = .none
-        cell.dataMode = viewModel.arrHKPlanData[indexPath.row]
+        cell.arrData = viewModel.arrHKPlanData
         return cell
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return UITableView.automaticDimension
     }
+    
+    
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: kMargin))
+        return view
+    }
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.01))
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.001
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return kMargin
+    }
 }

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

@@ -25,4 +25,6 @@ class YHHKPlanDocModel {
     
     //本地使用
     var canEditFlag : Bool = true
+    var isFirstData : Bool = false
+    var isLastData : Bool = false
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHHKPlanCell.swift

@@ -24,59 +24,22 @@ class YHHKPlanCell: UITableViewCell {
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         initView()
-        
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     
-    
-    private lazy var line : UIView = {
+    lazy var holdView : UIView = {
         let view = UIView()
-        view.backgroundColor = .separatorColor
+        view.backgroundColor = .white
+        view.clipsToBounds = true
+        view.layer.cornerRadius = kCornerRadius12
         return view
     }()
     
     
-    private lazy var numberLabel : UILabel = {
-        let view = UILabel()
-        view.text = "82/100"
-        view.font = UIFont.PFSC_R(ofSize: 12)
-        view.textColor = UIColor.placeHolderColor
-        view.textAlignment = .right
-        return view
-    }()
-    
-    
-    private lazy var myTextView : UITextView = {
-        let view = UITextView()
-        view.textColor = UIColor.mainTextColor
-        view.font = UIFont.PFSC_R(ofSize: 14)
-        view.backgroundColor = .clear
-//        view.isScrollEnabled = false // 关闭滚动，允许自动增高
-        return view
-    }()
-    
-    
-    
-    private lazy var nameLable : UILabel = {
-        let lable0 = UILabel(text: "1、主要事业成就")
-        lable0.textColor = UIColor.mainTextColor
-        lable0.font = UIFont.PFSC_M(ofSize: 17)
-        return lable0
-    }()
-    
-    
-    private lazy var iconImageV : UIImageView = {
-        let view = UIImageView()
-        view.image = UIImage(named: "other_info_warning")
-        view.contentMode = .scaleAspectFill
-        return view
-    }()
-    
-    
-    var dataMode : YHHKPlanDocModel? {
+    var arrData : [YHHKPlanDocModel] = [] {
         didSet {
             updateUI()
         }
@@ -88,130 +51,45 @@ private extension YHHKPlanCell {
     func initView() {
         backgroundColor = .clear
         contentView.backgroundColor = .clear
-        
-        //应香港入境处最新要求，
-        //赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)
-        //。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。
-        
-        
-        contentView.addSubview(line)
-        line.snp.makeConstraints { make in
-            make.left.equalTo(kMargin)
-            make.right.equalTo(-kMargin)
-            make.height.equalTo(0.5)
-            make.bottom.equalToSuperview()
-        }
-        
-        let holdView : UIView = UIView()
-        holdView.backgroundColor = UIColor.white
-        holdView.clipsToBounds = true
-        holdView.layer.cornerRadius = kCornerRadius6
         contentView.addSubview(holdView)
-        
         holdView.snp.makeConstraints { make in
-            make.top.equalTo(18)
-            make.left.equalTo(12)
-            make.right.equalTo(-12)
-            make.bottom.equalTo(line.snp.top)
-        }
-        
-        holdView.addSubview(nameLable)
-        nameLable.snp.makeConstraints { make in
-            make.top.left.equalTo(18)
-            make.height.equalTo(20)
-        }
-        
-        
-        holdView.addSubview(iconImageV)
-        iconImageV.snp.makeConstraints { make in
-            make.left.equalTo(nameLable.snp.right).offset(4)
-            make.centerY.equalTo(nameLable)
-            make.height.width.equalTo(16)
-        }
-        
-        
-        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
-        holdView.addSubview(subHoldView)
-        subHoldView.snp.makeConstraints { make in
-            make.top.equalTo(nameLable.snp.bottom).offset(12)
-            make.left.equalTo(18)
-            make.right.equalTo(-18)
-            make.bottom.equalTo(line.snp.top).offset(-18)
-        }
-        
-        subHoldView.addSubview(numberLabel)
-        numberLabel.snp.makeConstraints { make in
-            make.right.equalTo(-12)
-            make.height.equalTo(18)
-            make.bottom.equalToSuperview().offset(-8)
-        }
-        
-        subHoldView.addSubview(myTextView)
-        myTextView.snp.makeConstraints { make in
-            make.top.left.equalToSuperview().offset(12)
-            make.right.equalTo(-12)
-            make.height.greaterThanOrEqualTo(80)
-            make.bottom.equalTo(numberLabel.snp.top).offset(-2)
+            make.top.bottom.equalToSuperview()
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
         }
-        myTextView.delegate = self
-//        myTextView.wrapToContent()
     }
     
-    @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
-        guard let model = dataMode else { return }
-        switch model.type  {
-        case .planDocQuestion1:
-            YHWholeScreenTipsView.show(type: .hkPlanQ1, targetView: iconImageV)
-        case .planDocQuestion2:
-            YHWholeScreenTipsView.show(type: .hkPlanQ2, targetView: iconImageV)
-        case .planDocQuestion3:
-            YHWholeScreenTipsView.show(type: .hkPlanQ3, targetView: iconImageV)
-        case .planDocQuestion4:
-            YHWholeScreenTipsView.show(type: .hkPlanQ4, targetView: iconImageV)
-        case .planDocQuestion5:
-            YHWholeScreenTipsView.show(type: .hkPlanQ5, targetView: iconImageV)
-        case .planDocQuestion6:
-            YHWholeScreenTipsView.show(type: .hkPlanQ6, targetView: iconImageV)
-        case .unknow:
-            printLog("")
-        }
-    }
     
     func updateUI() {
-        guard let model = dataMode else { return }
-        nameLable.text = model.title
-        myTextView.text = model.content
-        if model.canEditFlag {
-            myTextView.isEditable = true
-            myTextView.isSelectable = true
-        } else {
-            myTextView.isEditable = false
-            myTextView.isSelectable = false
+        holdView.removeSubviews()
+        var tagView : UIView?
+        for item in arrData {
+            let view = YHHKPlanItemView()
+            view.dataMode = item
+            holdView.addSubview(view)
             
-            myTextView.wrapToContent()
+            if item.isFirstData {
+                view.snp.makeConstraints { make in
+                    make.top.equalToSuperview()
+                    make.left.equalTo(kMargin)
+                    make.right.equalTo(-kMargin)
+                }
+            } else if item.isLastData {
+                view.snp.makeConstraints { make in
+                    make.top.equalTo(tagView!.snp.bottom)
+                    make.left.equalTo(kMargin)
+                    make.right.equalTo(-kMargin)
+                    make.bottom.equalToSuperview()
+                }
+            } else {
+                view.snp.makeConstraints { make in
+                    make.top.equalTo(tagView!.snp.bottom)
+                    make.left.equalTo(kMargin)
+                    make.right.equalTo(-kMargin)
+                }
+            }
+            tagView = view
         }
-        numberLabel.text = myTextView.text.count.string + "/100"
     }
 }
 
-
-extension YHHKPlanCell : UITextViewDelegate {
-    func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
-        let newLength = (textView.text as NSString).length + text.count - range.length
-        return newLength <= 100
-    }
-    
-    func textViewDidChange(_ textView: UITextView) {
-        guard let model = dataMode else { return }
-        guard let text = textView.text else { return }
-        model.content = text
-    }
-}

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

+//
+//  YHHKPlanItemView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/1.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHHKPlanItemView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    private lazy var line : UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+    
+    
+    private lazy var numberLabel : UILabel = {
+        let view = UILabel()
+        view.text = "--/100"
+        view.font = UIFont.PFSC_R(ofSize: 12)
+        view.textColor = UIColor.placeHolderColor
+        view.textAlignment = .right
+        return view
+    }()
+    
+    
+    private lazy var myTextView : UITextView = {
+        let view = UITextView()
+        view.textColor = UIColor.mainTextColor
+        view.font = UIFont.PFSC_R(ofSize: 14)
+        view.backgroundColor = .clear
+        return view
+    }()
+    
+    
+    
+    private lazy var nameLable : UILabel = {
+        let lable0 = UILabel(text: "1、主要事业成就")
+        lable0.textColor = UIColor.mainTextColor
+        lable0.font = UIFont.PFSC_M(ofSize: 17)
+        return lable0
+    }()
+    
+    
+    private lazy var iconImageV : UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "other_info_warning")
+        view.contentMode = .scaleAspectFill
+        return view
+    }()
+    
+    
+    var dataMode : YHHKPlanDocModel? {
+        didSet {
+            updateUI()
+        }
+    }
+    let holdView : UIView = UIView()
+}
+
+private extension YHHKPlanItemView {
+    func initView() {
+        backgroundColor = .clear
+        
+        //应香港入境处最新要求，
+        //赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)
+        //。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。
+        
+        addSubview(line)
+        line.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.right.equalTo(0)
+            make.height.equalTo(1)
+            make.bottom.equalToSuperview()
+        }
+        
+        holdView.backgroundColor = UIColor.white
+        addSubview(holdView)
+        
+        holdView.snp.makeConstraints { make in
+            make.top.equalTo(0)
+            make.left.equalTo(0)
+            make.right.equalTo(0)
+            make.bottom.equalTo(line.snp.top)
+        }
+        
+        holdView.addSubview(nameLable)
+        nameLable.snp.makeConstraints { make in
+            make.top.equalTo(18)
+            make.left.equalTo(0)
+            make.height.equalTo(20)
+        }
+        
+        
+        holdView.addSubview(iconImageV)
+        iconImageV.snp.makeConstraints { make in
+            make.left.equalTo(nameLable.snp.right).offset(4)
+            make.centerY.equalTo(nameLable)
+            make.height.width.equalTo(16)
+        }
+        
+        
+        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
+        holdView.addSubview(subHoldView)
+        subHoldView.snp.makeConstraints { 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)
+        }
+        
+        subHoldView.addSubview(numberLabel)
+        numberLabel.snp.makeConstraints { make in
+            make.right.equalTo(-12)
+            make.height.equalTo(18)
+            make.bottom.equalToSuperview().offset(-8)
+        }
+        
+        subHoldView.addSubview(myTextView)
+        myTextView.snp.makeConstraints { make in
+            make.top.left.equalToSuperview().offset(12)
+            make.right.equalTo(-12)
+            make.height.greaterThanOrEqualTo(80)
+            make.bottom.equalTo(numberLabel.snp.top).offset(-2)
+        }
+        myTextView.delegate = self
+//        myTextView.wrapToContent()
+    }
+    
+    @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
+        guard let model = dataMode else { return }
+        switch model.type  {
+        case .planDocQuestion1:
+            YHWholeScreenTipsView.show(type: .hkPlanQ1, targetView: iconImageV)
+        case .planDocQuestion2:
+            YHWholeScreenTipsView.show(type: .hkPlanQ2, targetView: iconImageV)
+        case .planDocQuestion3:
+            YHWholeScreenTipsView.show(type: .hkPlanQ3, targetView: iconImageV)
+        case .planDocQuestion4:
+            YHWholeScreenTipsView.show(type: .hkPlanQ4, targetView: iconImageV)
+        case .planDocQuestion5:
+            YHWholeScreenTipsView.show(type: .hkPlanQ5, targetView: iconImageV)
+        case .planDocQuestion6:
+            YHWholeScreenTipsView.show(type: .hkPlanQ6, targetView: iconImageV)
+        case .unknow:
+            printLog("")
+        }
+    }
+    
+    func updateUI() {
+        guard let model = dataMode else { return }
+        nameLable.text = model.title
+        myTextView.text = model.content
+        if model.canEditFlag {
+            myTextView.isEditable = true
+            myTextView.isSelectable = true
+        } else {
+            myTextView.isEditable = false
+            myTextView.isSelectable = false
+            
+            myTextView.wrapToContent()
+        }
+        numberLabel.text = myTextView.text.count.string + "/100"
+        
+        if model.isLastData {
+            line.isHidden = true
+        } else {
+            line.isHidden = false
+        }
+    }
+}
+
+
+extension YHHKPlanItemView : UITextViewDelegate {
+    func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        let newLength = (textView.text as NSString).length + text.count - range.length
+        return newLength <= 100
+    }
+    
+    func textViewDidChange(_ textView: UITextView) {
+        guard let model = dataMode else { return }
+        guard let text = textView.text else { return }
+        model.content = text
+        
+        numberLabel.text = myTextView.text.count.string + "/100"
+    }
+}

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

@@ -308,7 +308,7 @@ private extension YHMyDocumentsDetailViewModel {
             tModel.title = "1、主要事业成就"
             tModel.content = model.career_achievement.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion1
-            
+            tModel.isFirstData = true
             arrHKPlanData.append(tModel)
         }
         
@@ -322,7 +322,6 @@ private extension YHMyDocumentsDetailViewModel {
             arrHKPlanData.append(tModel)
         }
         
-        
         //3、学业成就
         do {
             let tModel = YHHKPlanDocModel()
@@ -353,13 +352,13 @@ private extension YHMyDocumentsDetailViewModel {
             arrHKPlanData.append(tModel)
         }
         
-        
         //6、其他材料
         do {
             let tModel = YHHKPlanDocModel()
             tModel.title = "6、其他材料"
             tModel.content = model.other.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion6
+            tModel.isLastData = true
             
             arrHKPlanData.append(tModel)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureListViewController.swift

@@ -90,6 +90,7 @@ extension YHMySignatureListViewController {
     func getData() {
         viewModel.requestSignatureList("\(orderId)", callBackBlock: {[weak self] success, error in
             guard let self = self else { return }
+            self.headSessionView.canShowDownLoadBtnFlag = true
             self.tableView.reloadData()
         })
     }