续签在港缴费确认在港风险弹窗提醒

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -244,6 +244,7 @@
 		044F39602CB8F3F9007CA277 /* YHVisaRenewalPaymentStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044F395F2CB8F3F9007CA277 /* YHVisaRenewalPaymentStatus.swift */; };
 		044F39622CB8FF16007CA277 /* YHVisaRenewalPayContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044F39612CB8FF16007CA277 /* YHVisaRenewalPayContentCell.swift */; };
 		044F39642CB90501007CA277 /* YHVisaRenewalItemDetailType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044F39632CB90501007CA277 /* YHVisaRenewalItemDetailType.swift */; };
+		044F39662CB9500B007CA277 /* YHVisaRenewalPayConfirmingPresenceAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044F39652CB9500B007CA277 /* YHVisaRenewalPayConfirmingPresenceAlertView.swift */; };
 		04506F552C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04506F542C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift */; };
 		045A08C02C37ABF500BCBABA /* YHSegmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045A08BF2C37ABF500BCBABA /* YHSegmentView.swift */; };
 		045A08C22C37EB8B00BCBABA /* YHMyFileListNoneCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045A08C12C37EB8B00BCBABA /* YHMyFileListNoneCell.swift */; };
@@ -1166,6 +1167,7 @@
 		044F395F2CB8F3F9007CA277 /* YHVisaRenewalPaymentStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaRenewalPaymentStatus.swift; sourceTree = "<group>"; };
 		044F39612CB8FF16007CA277 /* YHVisaRenewalPayContentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaRenewalPayContentCell.swift; sourceTree = "<group>"; };
 		044F39632CB90501007CA277 /* YHVisaRenewalItemDetailType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaRenewalItemDetailType.swift; sourceTree = "<group>"; };
+		044F39652CB9500B007CA277 /* YHVisaRenewalPayConfirmingPresenceAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaRenewalPayConfirmingPresenceAlertView.swift; sourceTree = "<group>"; };
 		04506F542C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyMemberInfoCell.swift; sourceTree = "<group>"; };
 		045A08BF2C37ABF500BCBABA /* YHSegmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSegmentView.swift; sourceTree = "<group>"; };
 		045A08C12C37EB8B00BCBABA /* YHMyFileListNoneCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileListNoneCell.swift; sourceTree = "<group>"; };
@@ -2561,6 +2563,7 @@
 			isa = PBXGroup;
 			children = (
 				044F392D2CB55050007CA277 /* YHHKVisaRenewalPaymentStepView.swift */,
+				044F39652CB9500B007CA277 /* YHVisaRenewalPayConfirmingPresenceAlertView.swift */,
 				044F39312CB64CC0007CA277 /* YHBottomPresentationController.swift */,
 				044F392F2CB55D5E007CA277 /* YHDashLineView.swift */,
 				044F39352CB6574D007CA277 /* YHVisaRenewalGuideHeaderCell.swift */,
@@ -6005,6 +6008,7 @@
 				045EEEA22B9F171A0022A143 /* YHWorkExperienceProjectModel.swift in Sources */,
 				04213B332C4A084600797900 /* YHHomeInfoClassifyModel.swift in Sources */,
 				04F316442C3568F000024164 /* YHAboutGalaxyViewController.swift in Sources */,
+				044F39662CB9500B007CA277 /* YHVisaRenewalPayConfirmingPresenceAlertView.swift in Sources */,
 				041470922C898EB700B7B688 /* YHGalaxyManagerTipsItemView.swift in Sources */,
 				0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */,
 				045EEECA2B9F171A0022A143 /* YHMyDocumentsListViewController.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalPaymentVC.swift

@@ -187,8 +187,11 @@ extension YHHKVisaRenewalPaymentVC {
         let confirmingPresenceSection: [YHVisaRenewalItemDetailType] = [.sectionHeader("确认申请人在港", nil), .tips(confirmingPresenceTips), .residenceAction("欧阳唯一", .approvalPending, .mid, {
             printLog("欧阳唯一 approvalPending")
             YHHUD.flash(message: approvalPendingMsg)
-        }), .residenceAction("欧阳唯二", .confirmingPresence, .mid, {
+        }), .residenceAction("欧阳唯二", .confirmingPresence, .mid, { [weak self] in
             printLog("欧阳唯二 confirmingPresence")
+            self?.showAlertView(confirmBlock: {
+                //
+            })
         }), .residenceAction("欧阳唯三", .confirmedPresence, .bottom, {
             printLog("欧阳唯三 confirmedPresence")
             YHHUD.flash(message: confirmedPresenceMsg)
@@ -221,6 +224,14 @@ extension YHHKVisaRenewalPaymentVC {
         tableView.reloadData()
     }
     
+    private func showAlertView(confirmBlock: (() -> Void)?) {
+        let alert = YHVisaRenewalPayConfirmingPresenceAlertView.alertView()
+        alert.confirmBlock = {
+            confirmBlock?()
+        }
+        alert.show()
+    }
+    
     private func showGuideVC() {
         let vc = YHVisaRenewalGuideVC()
         let pc = YHBottomPresentationController(presentedViewController: vc, presenting: self)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/V/YHHKVisaRenewalPaymentStepView.swift

@@ -146,7 +146,7 @@ extension YHHKVisaRenewalPaymentStepView {
     
     private func getStepLabel(_ title: String) -> UILabel {
         let label = UILabel()
-        label.font = UIFont(name: "DIN Alternate Bold", size: 12)
+        label.font = UIFont(name: "DINAlternate-Bold", size: 12)
         label.textColor = .brandMainColor
         label.layer.cornerRadius = stepLabelHeight / 2.0
         label.clipsToBounds = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/V/YHVisaRenewalPayConfirmingPresenceAlertView.swift

+//
+//  YHVisaRenewalPayConfirmingPresenceAlertView.swift
+//  galaxy
+//
+//  Created by alexzzw on 2024/10/11.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHVisaRenewalPayConfirmingPresenceAlertView: UIView {
+     
+    var confirmBlock:(()->())?
+    
+    var cancelBlock:(()->())?
+    
+    lazy var blackMaskView: UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor.init(hex: 0x000000, alpha: 0.68)
+        return view
+    }()
+    
+    lazy var whiteContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = kCornerRadius6
+        return view
+    }()
+    
+    lazy var iconImgView: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "cs_family_risk"))
+        return view
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textAlignment = .center
+        label.font = UIFont.PFSC_M(ofSize: 17)
+        label.textColor = UIColor.mainTextColor
+        label.text = "风险提示"
+        return label
+    }()
+    
+    lazy var firstDetailLabel: UILabel = {
+        var label = UILabel()
+        label.numberOfLines = 0
+        let a: ASAttributedString = .init("请申请人", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        let b: ASAttributedString = .init("务必已进入到香港境内后，再进行确认", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        let c: ASAttributedString = .init("，避免签证被锁", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        label.attributed.text = a+b+c
+        return label
+    }()
+    
+    lazy var secondDetailLabel: UILabel = {
+        var label = UILabel()
+        label.numberOfLines = 0
+        let a: ASAttributedString = .init("建议入境香港后，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        let b: ASAttributedString = .init("远离海关，并延迟20分钟后再进行确认", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        let c: ASAttributedString = .init("，避免香港海关系统还未识别到已入境!", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        label.attributed.text = a+b+c
+        return label
+    }()
+    
+    lazy var confirmBtn: UIButton = {
+        let button = UIButton()
+        button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        button.setTitle("我已知悉，确认", for: .normal)
+        button.setTitleColor(UIColor.white, for: .normal)
+        button.backgroundColor = .brandMainColor
+        button.addTarget(self, action: #selector(didConfirmBtnClicked), for: .touchUpInside)
+        button.layer.cornerRadius = kCornerRadius3
+        return button
+    }()
+    
+    lazy var cancelBtn: UIButton = {
+        let button = UIButton()
+        button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        button.setTitle("还未", for: .normal)
+        button.setTitleColor(UIColor.brandMainColor, for: .normal)
+        button.layer.borderWidth = 1
+        button.layer.borderColor = UIColor.brandMainColor.cgColor
+        button.addTarget(self, action: #selector(didCancelBtnClicked), for: .touchUpInside)
+        button.layer.cornerRadius = kCornerRadius3
+        return button
+    }()
+    
+    static func alertView() -> YHVisaRenewalPayConfirmingPresenceAlertView {
+        let view = YHVisaRenewalPayConfirmingPresenceAlertView(frame: UIScreen.main.bounds)
+        return view
+    }
+    
+    @objc func show() {
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+    }
+    
+    @objc func dismiss() {
+        self.removeFromSuperview()
+    }
+    
+    @objc func didConfirmBtnClicked() {
+        confirmBlock?()
+        self.dismiss()
+    }
+    
+    @objc func didCancelBtnClicked() {
+        cancelBlock?()
+        self.dismiss()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    func createUI() {
+        
+        self.addSubview(blackMaskView)
+        self.addSubview(whiteContentView)
+        whiteContentView.addSubview(iconImgView)
+        whiteContentView.addSubview(titleLabel)
+        whiteContentView.addSubview(firstDetailLabel)
+        whiteContentView.addSubview(secondDetailLabel)
+        whiteContentView.addSubview(confirmBtn)
+        whiteContentView.addSubview(cancelBtn)
+        
+        blackMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        whiteContentView.snp.makeConstraints { make in
+            make.left.equalTo(38)
+            make.right.equalTo(-38)
+            make.centerY.equalToSuperview()
+        }
+        
+        iconImgView.snp.makeConstraints { make in
+            make.width.height.equalTo(53)
+            make.top.equalTo(30)
+            make.centerX.equalToSuperview()
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(iconImgView.snp.bottom).offset(16)
+            make.height.equalTo(24)
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+        }
+        
+        firstDetailLabel.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
+        }
+        
+        secondDetailLabel.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+            make.top.equalTo(firstDetailLabel.snp.bottom).offset(8)
+        }
+        
+        cancelBtn.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.bottom.equalTo(-16)
+            make.height.equalTo(45)
+            make.top.equalTo(secondDetailLabel.snp.bottom).offset(21)
+        }
+        
+        confirmBtn.snp.makeConstraints { make in
+            make.top.bottom.equalTo(cancelBtn)
+            make.left.equalTo(cancelBtn.snp.right).offset(10)
+            make.right.equalTo(-21)
+            make.height.equalTo(45)
+            make.width.equalTo(cancelBtn)
+        }
+    }
+}