赴港计划书

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -272,6 +272,8 @@
 		A57F1F252B48F09200B644E6 /* ATAuthSDK_D.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04808C032B4686510056D53C /* ATAuthSDK_D.framework */; };
 		A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */; };
 		A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */; };
+		A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */; };
+		A582B2412BB95998009D098C /* YHHKPlanTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B2402BB95998009D098C /* YHHKPlanTipsCell.swift */; };
 		A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58556B92B6BCF1A003746B2 /* YHPersonInfoFillStepModel.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 */; };
@@ -678,6 +680,8 @@
 		A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractMainItemStatusCell.swift; sourceTree = "<group>"; };
 		A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeViewModel.swift; sourceTree = "<group>"; };
 		A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeModel.swift; sourceTree = "<group>"; };
+		A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanDoctumentVC.swift; sourceTree = "<group>"; };
+		A582B2402BB95998009D098C /* YHHKPlanTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanTipsCell.swift; sourceTree = "<group>"; };
 		A58556B92B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoFillStepModel.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>"; };
@@ -1072,6 +1076,7 @@
 			children = (
 				045EEDFA2B9F171A0022A143 /* YHMyDocumentsListViewController.swift */,
 				04A7BD122BA42F4200BD35A2 /* YHMyDocumentsDetailViewController.swift */,
+				A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -1650,6 +1655,7 @@
 				A517A4E02BB573EB000DEECD /* YHDocListCell.swift */,
 				A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */,
 				A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */,
+				A582B2402BB95998009D098C /* YHHKPlanTipsCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2373,6 +2379,7 @@
 				045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */,
 				A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
 				04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,
+				A582B2412BB95998009D098C /* YHHKPlanTipsCell.swift in Sources */,
 				A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */,
 				A5FD63C52B637EE000D1D9DA /* YHSubmitAllInfoCheckView.swift in Sources */,
 				045EEF222B9F171A0022A143 /* YHImagePickerView.swift in Sources */,
@@ -2564,6 +2571,7 @@
 				045EEEE62B9F171A0022A143 /* YHMySignatureListViewController.swift in Sources */,
 				049537852BA9B28500AF7E59 /* YHCertificateTemplateCell.swift in Sources */,
 				A5C5B3292B57CCBE00A7C5D1 /* YHDavidCell4.swift in Sources */,
+				A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */,
 				045EEEE12B9F171A0022A143 /* YHMySignatureListViewModel.swift in Sources */,
 				04A7BD152BA4361700BD35A2 /* YHMyDocumentDetailModel.swift in Sources */,
 				045EEEA02B9F171A0022A143 /* YHWorkItemListModel.swift in Sources */,

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

+//
+//  YHHKPlanDoctumentVC.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/31.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+/*
+ 赴港计划书
+ */
+
+class YHHKPlanDoctumentVC: YHBaseViewController {
+    var tableView: UITableView!
+    
+    var viewModel: YHMyDocumentsDetailViewModel = {
+        let vm = YHMyDocumentsDetailViewModel()
+        return vm
+    }()
+    var supplement_id: Int = 0
+    
+    private var isEditFlag : Bool = false
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "赴港计划书"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1.0
+        
+        setView()
+        getData()
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        getData()
+    }
+}
+
+extension YHHKPlanDoctumentVC {
+    func getData() {
+        viewModel.requestDocumentsDetail("\(supplement_id)", callBackBlock: {[weak self] success, error in
+            guard let self = self else { return }
+//            if self.viewModel.mainModel?.prospectus.id != 0 {
+//                self.stepView.snp.remakeConstraints { make in
+//                    make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+//                    make.left.right.equalTo(self.view)
+//                    make.height.equalTo(0)
+//                }
+//                self.bottomView.isHidden = true
+//            }
+//            if self.viewModel.mainModel?.writing_document.doc_sign.supplement_id == 0 {
+//                self.stepView.currentIndex = 0
+//                self.bottomView.isHidden = true
+//            } else {
+//                let state = self.viewModel.mainModel?.writing_document.doc_sign.status
+//                // 0-待上传，1-未发送, 2-发送中，3-已发送，4-已签收，5-审核通过，6-驳回
+//                if state == 0 || state == 1 || state == 2 {
+//                    
+//                } else if state == 3 || state == 4 || state == 5 {
+//                    
+//                } else {
+//                    
+//                }
+//                self.stepView.currentIndex = 1
+//            }
+            self.tableView.reloadData()
+        })
+    }
+    
+    func updateDataSource() {
+        
+        self.tableView.reloadData()
+    }
+    
+    func setView() {
+//        view.addSubview(headSessionView)
+//        headSessionView.snp.makeConstraints { make in
+//            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+//            make.left.equalToSuperview().offset(kMargin)
+//            make.right.equalToSuperview().offset(-kMargin)
+//            make.height.equalTo(YHMyDocListHeaderView.viewH)
+//        }
+        
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.plain)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .clear
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHDocListCell.self)
+            tableView.register(cellWithClass: YHHKPlanTipsCell.self)
+            return tableView
+        }()
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview()
+        }
+    }
+}
+
+extension YHHKPlanDoctumentVC: UITableViewDelegate, UITableViewDataSource {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0 {
+            return 1
+        }
+        return 6
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0 {
+            let cell = tableView.dequeueReusableCell(withClass: YHHKPlanTipsCell.self)
+            cell.selectionStyle = .none
+            return cell
+        }
+        
+        
+        let cell = tableView.dequeueReusableCell(withClass: YHDocListCell.self)
+        cell.selectionStyle = .none
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+}

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

@@ -317,7 +317,9 @@ extension YHMyDocumentsListViewController: UITableViewDelegate, UITableViewDataS
             if model.file_type == "doc" {
                 if model.template_id == 195 {
                     //跳转赴港计划书
-                    
+                    let vc = YHHKPlanDoctumentVC()
+                    vc.supplement_id = model.id
+                    self.navigationController?.pushViewController(vc)
                 } else {
                     let vc = YHMyDocumentsDetailViewController()
                     vc.id = model.id 

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

+//
+//  YHHKPlanTipsCell.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/31.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHHKPlanTipsCell: UITableViewCell {
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+    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 extension YHHKPlanTipsCell {
+    func initView() {
+        backgroundColor = .clear
+        contentView.backgroundColor = .clear
+        
+        //应香港入境处最新要求，
+        //赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)
+        //。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。
+        
+        let holdView : UIView = UIView()
+        holdView.backgroundColor = .white
+        holdView.clipsToBounds = true
+        holdView.layer.cornerRadius = kCornerRadius6
+        contentView.addSubview(holdView)
+        
+        holdView.snp.makeConstraints { make in
+            make.top.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
+            make.bottom.equalTo(0)
+        }
+        
+        
+        
+        let iconImagV = UIImageView(image: UIImage(named: "tips_icon"))
+        iconImagV.contentMode = .scaleAspectFill
+        holdView.addSubview(iconImagV)
+        iconImagV.snp.makeConstraints { make in
+            make.height.width.equalTo(14)
+            make.left.equalTo(kMargin)
+            make.top.equalTo(kMargin)
+        }
+        let tipsLabel = UILabel()
+        tipsLabel.text = "温馨提示："
+        tipsLabel.textColor = UIColor.brandMainColor
+        tipsLabel.font = UIFont.PFSC_M(ofSize: 12)
+        
+        holdView.addSubview(tipsLabel)
+        tipsLabel.snp.makeConstraints { make in
+            make.height.width.equalTo(18)
+            make.left.equalTo(iconImagV.snp.right).offset(8)
+            make.right.equalTo(-kMargin)
+            make.centerY.equalTo(iconImagV.snp.centerY)
+        }
+        
+        
+        
+        
+        let a: ASAttributedString = .init("应香港入境处最新要求，", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
+        
+        let b: ASAttributedString = .init("赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
+        
+        let c: ASAttributedString = .init("。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
+        
+        
+        
+        let contentLable = UILabel()
+        contentLable.numberOfLines = 0
+        contentLable.lineBreakMode = .byWordWrapping
+        contentLable.attributed.text = a + b + c
+        holdView.addSubview(contentLable)
+        contentLable.snp.makeConstraints { make in
+            make.top.equalTo(tipsLabel.snp.bottom).offset(6)
+            make.right.equalTo(-kMargin)
+            make.left.equalTo(kMargin)
+            make.bottom.equalToSuperview().offset(-kMargin)
+        }
+        holdView.layoutIfNeeded()
+        
+        
+        let imageV44 = UIImageView()
+        imageV44.frame = holdView.bounds
+        imageV44.image = UIImage(named: "tips_cell_bkg")
+        imageV44.contentMode = .scaleAspectFill
+        imageV44.layer.zPosition = -1
+        holdView.addSubview(imageV44)
+    }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/tips_cell_bkg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Rectangle 2461@2x.png",
+      "filename" : "背景图@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Rectangle 2461@3x.png",
+      "filename" : "背景图@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }