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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  原则批
  打字机demo效果

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -300,6 +300,7 @@
 		047AA3F82C5CC7B0009C4554 /* YHShareStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */; };
 		047AA3FA2C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */; };
 		047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */; };
+		047AA3FF2C646844009C4554 /* YHTypingEffectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FE2C646844009C4554 /* YHTypingEffectViewController.swift */; };
 		0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */; };
 		0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */; };
 		048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; };
@@ -359,6 +360,8 @@
 		04B360EF2C620975001EB053 /* YHPrincipleUploadStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360EE2C620975001EB053 /* YHPrincipleUploadStatusCell.swift */; };
 		04B360F12C635A33001EB053 /* YHPrincipleWaitResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F02C635A33001EB053 /* YHPrincipleWaitResultModel.swift */; };
 		04B360F32C636525001EB053 /* YHPrincipleWaitResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */; };
+		04B360F52C646844001EB053 /* YHPrincipleApprovedMailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */; };
+		04B360F72C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F62C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift */; };
 		04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */; };
 		04B9EE5B2C06CC3100A4018D /* YHOtherLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */; };
 		04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
@@ -946,6 +949,7 @@
 		047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareStepView.swift; sourceTree = "<group>"; };
 		047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInvitationWithGiftsSelectItemView.swift; sourceTree = "<group>"; };
 		047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignAppendStepView.swift; sourceTree = "<group>"; };
+		047AA3FE2C646844009C4554 /* YHTypingEffectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTypingEffectViewController.swift; sourceTree = "<group>"; };
 		0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; };
 		0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateListVC.swift; sourceTree = "<group>"; };
 		048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; };
@@ -1005,6 +1009,8 @@
 		04B360EE2C620975001EB053 /* YHPrincipleUploadStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleUploadStatusCell.swift; sourceTree = "<group>"; };
 		04B360F02C635A33001EB053 /* YHPrincipleWaitResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleWaitResultModel.swift; sourceTree = "<group>"; };
 		04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleWaitResultViewController.swift; sourceTree = "<group>"; };
+		04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleApprovedMailViewController.swift; sourceTree = "<group>"; };
+		04B360F62C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleEnvelopeModel.swift; sourceTree = "<group>"; };
 		04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
 		04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherLoginViewController.swift; sourceTree = "<group>"; };
 		04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
@@ -1384,6 +1390,7 @@
 			children = (
 				0419A0992C48F87B00A5FCFA /* YHInvitationWithGiftsViewController.swift */,
 				047AA3D82C4A4A91009C4554 /* YHInvatationShareViewController.swift */,
+				047AA3FE2C646844009C4554 /* YHTypingEffectViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -2200,6 +2207,7 @@
 				0472CB9B2C5A11640096F48F /* YHPrincipleCongratulationVC.swift */,
 				0472CB9C2C5A11640096F48F /* YHPrincipleReviewListVC.swift */,
 				04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */,
+				04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -2209,6 +2217,7 @@
 			children = (
 				0472CB9E2C5A11640096F48F /* YHPrincleGroupModel.swift */,
 				04B360F02C635A33001EB053 /* YHPrincipleWaitResultModel.swift */,
+				04B360F62C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -3767,6 +3776,7 @@
 				045EEE8C2B9F171A0022A143 /* YHPreviewMainViewController.swift in Sources */,
 				049663BA2BF6105C003C8295 /* YHRefreshHeaderAnimator.swift in Sources */,
 				A5C382D12B5FAAB300C5E65C /* YHContactItemModel.swift in Sources */,
+				04B360F52C646844001EB053 /* YHPrincipleApprovedMailViewController.swift in Sources */,
 				04CE1ADE2C2AD91F001CB80A /* YHActivityTravelCell.swift in Sources */,
 				A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */,
 				045EEF072B9F171A0022A143 /* YHBasicInfoFillViewModel.swift in Sources */,
@@ -3775,6 +3785,7 @@
 				04FB01D42C2404F50040115D /* YHMyFriendsNoDataView.swift in Sources */,
 				04D144762C0452E200EE3758 /* YHOneKeyLoginManager.swift in Sources */,
 				A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */,
+				04B360F72C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift in Sources */,
 				048B2A4A2BC7D9DC00A93BF0 /* YHMyLikeViewController.swift in Sources */,
 				A567E5AE2BD7643D00D5D5A0 /* YHHomeKingKongBlockItem.swift in Sources */,
 				045EEED92B9F171A0022A143 /* YHEducationDetailVC.swift in Sources */,
@@ -3952,6 +3963,7 @@
 				044CF8D42BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift in Sources */,
 				A567E5B02BD7643D00D5D5A0 /* YHHomeWebBottomView.swift in Sources */,
 				045EEF0D2B9F171A0022A143 /* YHBasicInfoFillCell.swift in Sources */,
+				047AA3FF2C646844009C4554 /* YHTypingEffectViewController.swift in Sources */,
 				044D0C1A2C22B40B00C5CF5E /* YHEditPersonalProfileViewController.swift in Sources */,
 				047AA3E82C4A6D69009C4554 /* YHListViewController.swift in Sources */,
 				048787D92BCF68530036E221 /* YHProgressView.swift in Sources */,

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/C/YHTypingEffectViewController.swift

+//
+//  YHTypingEffectViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/8.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHTypingEffectViewController: YHBaseViewController {
+
+    private let label: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.systemFont(ofSize: 18)
+        label.textColor = .white
+        label.textAlignment = .center
+        return label
+    }()
+    
+    private var displayLink: CADisplayLink?
+    private var currentIndex: Int = 0
+    private var fullText: String = "恭喜您申请的【优秀人才入境计划】"
+    private var centerText: String = "已获得港府的正式批准！"
+    private var lastText: String = "从递交资料伊始，经历了235天，感谢您这一路以来对银河的信赖与包容！"
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .black
+        
+        view.addSubview(label)
+        label.frame = view.bounds
+        
+        startTypingEffect()
+    }
+    
+    private func startTypingEffect() {
+        displayLink = CADisplayLink(target: self, selector: #selector(handleDisplayLink(_:)))
+        displayLink?.preferredFramesPerSecond = Int(1 / 0.1) // 设置帧率
+        displayLink?.add(to: .current, forMode: .common)
+    }
+    
+    @objc private func handleDisplayLink(_ displayLink: CADisplayLink) {
+        if currentIndex < fullText.count + centerText.count + lastText.count {
+            var index = currentIndex
+            if currentIndex >= fullText.count {
+                index = fullText.count
+            }
+            let attributedString = NSMutableAttributedString(string: String(fullText[..<index]),
+                                                             attributes: [
+                                                                NSAttributedString.Key.foregroundColor: UIColor.white,
+                                                                NSAttributedString.Key.paragraphStyle: {
+                                                                    let style = NSMutableParagraphStyle()
+                                                                    style.lineSpacing = 8 //控制行间距
+                                                                    style.alignment = .center
+                                                                    return style
+                                                                }()
+                                                             ])
+            var centerIndex = 0
+            if currentIndex >= fullText.count + centerText.count {
+                centerIndex = centerText.count
+            } else if currentIndex >= fullText.count {
+                centerIndex = currentIndex - fullText.count
+            }
+            let centerattributedString = NSMutableAttributedString(string: String(centerText[..<centerIndex]),
+                                                             attributes: [
+                                                                NSAttributedString.Key.foregroundColor: UIColor.red,
+                                                                NSAttributedString.Key.paragraphStyle: {
+                                                                    let style = NSMutableParagraphStyle()
+                                                                    style.lineSpacing = 8 //控制行间距
+                                                                    style.alignment = .center
+                                                                    return style
+                                                                }()
+                                                             ])
+            var lastIndex = 0
+            if currentIndex >= fullText.count + centerText.count {
+                lastIndex = currentIndex - fullText.count - centerText.count
+            }
+            let lastattributedString = NSMutableAttributedString(string: String(lastText[..<lastIndex]),
+                                                             attributes: [
+                                                                NSAttributedString.Key.foregroundColor: UIColor.white,
+                                                                NSAttributedString.Key.paragraphStyle: {
+                                                                    let style = NSMutableParagraphStyle()
+                                                                    style.lineSpacing = 8 //控制行间距
+                                                                    style.alignment = .center
+                                                                    return style
+                                                                }()
+                                                             ])
+            var result = NSMutableAttributedString(attributedString: attributedString)
+            result.append(centerattributedString)
+            result.append(lastattributedString)
+            label.attributedText = result
+            currentIndex += 1
+        } else {
+            displayLink.invalidate()
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/VM/YHInvitationWithGiftsViewModel.swift

@@ -85,7 +85,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
         if self.state < 3 {
             param.updateValue(self.state + 1, forKey: "status")
         }
-        if registered_date.isEmpty {
+        if !registered_date.isEmpty {
             param.updateValue(registered_date, forKey: "registered_date")
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/C/YHPrincipleApprovedMailViewController.swift

+
+//  YHPrincipleApprovedMailViewController.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+import AttributedString
+
+// 【原则批已获批 - 所有材料已一键发邮件】
+class YHPrincipleApprovedMailViewController: YHBaseViewController {
+
+    var orderId: Int = 0
+    var status: Int = 11
+    var items: [SmartCodable] = []
+    let viewModel = YHPrincleViewModel()
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame:.zero, style:.grouped)
+        tableView.contentInsetAdjustmentBehavior = .never
+        tableView.estimatedSectionHeaderHeight = 24.0
+        tableView.estimatedSectionFooterHeight = 1.0
+        tableView.showsVerticalScrollIndicator = false
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.backgroundColor = .clear
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHPrincipleUnapprovedCell.self, forCellReuseIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier)
+        tableView.register(YHPrincipleEnvelopeCell.self, forCellReuseIdentifier: YHPrincipleEnvelopeCell.cellReuseIdentifier)
+        return tableView
+    }()
+    
+    lazy var bgView:UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor.init(hex: 0xF8F8F8)
+        let imgView = UIImageView(image: UIImage(named: "principle_detail_head_bg"))
+        view.addSubview(imgView)
+        imgView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.height.equalTo(imgView.snp.width)
+        }
+        return view
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+        self.gk_navTitle = "原则批"
+        gk_navigationBar.backgroundColor = .clear
+        createUI()
+        requestData()
+    }
+    
+    func createUI() {
+        view.addSubview(bgView)
+        view.addSubview(tableView)
+        bgView.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.bottom.equalToSuperview()
+        }
+        tableView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.bottom.equalToSuperview()
+        }
+    }
+}
+
+extension YHPrincipleApprovedMailViewController {
+    
+    func requestData() {
+        
+        let group = DispatchGroup()
+        
+        group.enter()
+        let params: [String : Any] = ["order_id" : orderId,
+                                      "search_type" : 1]
+        viewModel.getPrincipleWaitReviewResult(params: params) { success, error in
+            group.leave()
+        }
+        group.enter()
+        viewModel.getEnvelopeInfo(orderId: orderId) { success, error in
+            group.leave()
+        }
+        
+        group.notify(queue: .main) {
+            self.updateData()
+        }
+    }
+    
+    func updateData() {
+        self.items.removeAll()
+        
+        // 已获得港府甄选名额
+        self.items.append(self.viewModel.envelopModel)
+        
+        let waitResultModel = self.viewModel.waitResultModel
+        // 入境处已认收受理
+        let model2 = waitResultModel.copy()
+        model2.type = .entry
+        model2.title = "入境处已认收受理"
+        model2.subTitle = "申请确认通知书：(来自香港入境处)"
+        model2.isUnfold = false
+        self.items.append(model2)
+        
+        // 申请资料已递交港府留档
+        let model3 = waitResultModel.copy()
+        model3.type = .profile
+        model3.title = "申请资料已递交港府留档"
+        model3.subTitle = "档案号："
+        model3.isUnfold = false
+        self.items.append(model3)
+        
+        self.tableView.reloadData()
+    }
+}
+
+extension YHPrincipleApprovedMailViewController: UITableViewDelegate, UITableViewDataSource {
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    
+        if 0 <= indexPath.row && indexPath.row < items.count {
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleUnapprovedCell
+            let m = items[indexPath.row]
+            if m is YHPrincipleWaitResultModel {
+                let model = m as! YHPrincipleWaitResultModel
+                if model.type == .profile || model.type == .entry {
+                    cell.updateModel(model)
+                    cell.expandClick = {
+                        [weak self] isUnfold in
+                        guard let self = self else { return }
+                        model.isUnfold = isUnfold
+                        self.tableView.reloadData()
+                    }
+                }
+                return cell
+            }
+        }
+        
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleEnvelopeCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleEnvelopeCell
+        if 0 <= indexPath.row && indexPath.row < items.count {
+            let m = items[indexPath.row]
+            if m is YHPrincipleEnvelopeModel {
+                let model = m as! YHPrincipleEnvelopeModel
+                cell.updateModel(model)
+                cell.expandClick = {
+                    [weak self] isUnfold in
+                    guard let self = self else { return }
+                    model.isUnfold = isUnfold
+                    self.tableView.reloadData()
+                }
+            }
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+        if 0 <= indexPath.section && indexPath.section < items.count {
+        }
+    }
+
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        return self.getApproveHeaderView()
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+}
+
+extension YHPrincipleApprovedMailViewController {
+    
+    func getApproveHeaderView() -> UIView {
+        
+        let view = UIView()
+        
+        let titleLabel = UILabel()
+        titleLabel.numberOfLines = 0
+        let title: ASAttributedString = .init("祝贺您，\(self.viewModel.waitResultModel.applicant.userName)先生！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
+        titleLabel.attributed.text = title
+        view.addSubview(titleLabel)
+        
+        let detailLabel = UILabel()
+        detailLabel.numberOfLines = 0
+        let str1: ASAttributedString = .init("您【与家人】申请的【优秀人才入境计划】，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        let str2: ASAttributedString = .init("已获得港府的甄选名额～", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        detailLabel.attributed.text = str1 + str2
+        view.addSubview(detailLabel)
+        
+        let imgView = UIImageView(image: UIImage(named: "principle_approved_mail"))
+        view.addSubview(imgView)
+        
+        let tipsLabel = UILabel()
+        tipsLabel.font = UIFont.PFSC_M(ofSize: 16)
+        tipsLabel.textColor = .mainTextColor
+        tipsLabel.text = "补充资料已邮件港府"
+        tipsLabel.textAlignment = .center
+        view.addSubview(tipsLabel)
+        
+        let tips2Label = UILabel()
+        tips2Label.font = UIFont.PFSC_R(ofSize: 12)
+        tips2Label.textColor = .mainTextColor(alpha: 0.5)
+        tips2Label.text = "请耐心等待港府审核噢~"
+        tips2Label.textAlignment = .center
+        view.addSubview(tips2Label)
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(12)
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.height.equalTo(34)
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+        }
+        
+        imgView.snp.makeConstraints { make in
+            make.top.equalTo(detailLabel.snp.bottom).offset(36)
+            make.width.height.equalTo(128)
+            make.centerX.equalToSuperview()
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.top.equalTo(imgView.snp.bottom).offset(6)
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.height.equalTo(24)
+        }
+        
+        tips2Label.snp.makeConstraints { make in
+            make.top.equalTo(tipsLabel.snp.bottom).offset(9)
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.height.equalTo(18)
+            make.bottom.equalTo(-60)
+        }
+        return view
+    }
+}
+
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift

@@ -91,7 +91,7 @@ extension YHPrincipleWaitResultViewController {
             model2.isUnfold = false
             self.items.append(model2)
             
-            // 入境处已认收受理
+            // 申请资料已递交港府留档
             let model3 = waitResultModel.copy()
             model3.type = .profile
             model3.title = "申请资料已递交港府留档"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/M/YHPrincipleEnvelopeModel.swift

+//
+//  YHPrincipleEnvelopeModel.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/8.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHPrincipleEnvelopeModel: SmartCodable {
+    
+    // 自定义属性
+    var isUnfold:Bool = false // 是否展开
+
+    var name: String = ""
+    var url: String = ""
+    var date: String = ""
+    var sex: Int = 0
+    
+    
+    
+    required init() {
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/V/YHPrincipleEnvelopeCell.swift

@@ -11,15 +11,14 @@ import UIKit
 class YHPrincipleEnvelopeCell: UITableViewCell {
     
     static let cellReuseIdentifier = "YHPrincipleEnvelopeCell"
-    var itemModel:YHPrincleGroupModel?
-    var items: [String] = []
+    var itemModel:YHPrincipleEnvelopeModel?
     var expandClick:((Bool)->())?
 
     lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.font = UIFont.PFSC_R(ofSize: 15)
         label.textColor = UIColor.mainTextColor
-        label.text = "申请资料已递交港府留档"
+        label.text = "已获得港府甄选名额"
         return label
     }()
     
@@ -59,7 +58,6 @@ class YHPrincipleEnvelopeCell: UITableViewCell {
         let label = UILabel()
         label.font = UIFont.PFSC_M(ofSize: 18)
         label.textColor = UIColor(hex: 0xB75E24)
-        label.text = "XXXX"
         return label
     }()
     
@@ -74,20 +72,18 @@ class YHPrincipleEnvelopeCell: UITableViewCell {
     
     @objc func didExpandBtnClicked() {
         guard let model = itemModel else { return }
-        expandClick?(!model.isExpand)
+        expandClick?(!model.isUnfold)
     }
     
-    func updateModel(_ model:YHPrincleGroupModel) {
+    func updateModel(_ model:YHPrincipleEnvelopeModel) {
         
         itemModel = model
-        items.removeAll()
-        items.append(contentsOf: model.fileList)
-        whiteView.isHidden = !model.isExpand
-        let imgName = model.isExpand ? "custom_service_expand_1" : "custom_service_expand_0"
+        whiteView.isHidden = !model.isUnfold
+        let imgName = model.isUnfold ? "custom_service_expand_1" : "custom_service_expand_0"
         expandBtn.setImage(UIImage(named: imgName), for: .normal)
-        expandBtn.isHidden = items.count <= 0
+        nameLabel.text = model.name
         
-        if !model.isExpand || items.count <= 0 {
+        if !model.isUnfold {
             whiteView.removeSubviews()
             whiteView.snp.remakeConstraints { make in
                 make.top.equalTo(titleLabel.snp.bottom).offset(0.0)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHPrincleViewModel: NSObject {
     
     var waitResultModel = YHPrincipleWaitResultModel()
+    var envelopModel = YHPrincipleEnvelopeModel()
     
     func getPrincipleWaitReviewResult(params:[String : Any], callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
         
@@ -46,6 +47,46 @@ class YHPrincleViewModel: NSObject {
         }
     }
     
+    func getEnvelopeInfo(orderId:Int, callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.getReviewResult
+        
+        let params: [String : Any] = ["order_id": orderId]
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                let dic = json.data
+                guard let resultModel = YHPrincipleEnvelopeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                    let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    self.envelopModel = self.getEnvelopModel()
+                    callback?(false, err)
+                    return
+                }
+                self.envelopModel = resultModel
+                self.envelopModel = self.getEnvelopModel()
+                callback?(true, nil)
+                
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callback?(false, err)
+            }
+            
+        } failBlock: { err in
+            callback?(false, err)
+        }
+    }
+    
+    func getEnvelopModel() -> YHPrincipleEnvelopeModel {
+        let model = YHPrincipleEnvelopeModel()
+        model.name = "黄金龙"
+        model.sex = 1
+        model.date = "2024-12-12"
+        return model
+    }
+    
     func getTestModel() -> YHPrincipleWaitResultModel {
         
         var files: [YHFileNumberList] = []

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -343,8 +343,8 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         if true {
             
 //            YHPrincipleCongratulationAlertView.alertView().show()
-            
-            let vc = YHPrincipleWaitResultViewController()
+            // YHPrincipleWaitResultViewController
+            let vc = YHPrincipleApprovedMailViewController()
             vc.orderId = 123456
             self.navigationController?.pushViewController(vc)
             return

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/原则批/principle_approved_mail.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 2033194701@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 2033194701@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}