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:
  //  赴港行程指南
  //  赴港

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -385,6 +385,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 */; };
+		0480582F2C7CA77900502CAA /* YHDisappointHKAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.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 */; };
@@ -1150,6 +1151,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>"; };
+		0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDisappointHKAlertView.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>"; };
@@ -2635,6 +2637,7 @@
 				0430E63C2C72DB48000511E2 /* AddAdopters(2新增受养人) */,
 				04256DD72C72D9C200A37BA4 /* AppointCertificate(3 赴港办证预约) */,
 				04256E0F2C75BD2400A37BA4 /* VisaPayment(4电子签字缴费) */,
+				0480582C2C7CA6CD00502CAA /* GuideToHongKong(5 赴港行程指南) */,
 				A5CA3F4C2C74471C00EB22F5 /* UploadCertificate(7上传过关证件) */,
 			);
 			path = "Certificate(办证段)";
@@ -2838,6 +2841,22 @@
 			path = VM;
 			sourceTree = "<group>";
 		};
+		0480582C2C7CA6CD00502CAA /* GuideToHongKong(5 赴港行程指南) */ = {
+			isa = PBXGroup;
+			children = (
+				0480582D2C7CA73600502CAA /* View */,
+			);
+			path = "GuideToHongKong(5 赴港行程指南)";
+			sourceTree = "<group>";
+		};
+		0480582D2C7CA73600502CAA /* View */ = {
+			isa = PBXGroup;
+			children = (
+				0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		04808C022B4686510056D53C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -4262,6 +4281,7 @@
 				0430E6802C75966D000511E2 /* YHAdopterCardExampleView.swift in Sources */,
 				A5ACE9332B4564F7002C94D2 /* NetBaseModel.swift in Sources */,
 				04256DF62C736A0800A37BA4 /* YHServiceItemCell.swift in Sources */,
+				0480582F2C7CA77900502CAA /* YHDisappointHKAlertView.swift in Sources */,
 				A5FF0F3A2C32F20A0069852B /* YHActivityDetailCell0.swift in Sources */,
 				045EEE9B2B9F171A0022A143 /* YHWorkExperienceViewModel.swift in Sources */,
 				04AD31772C22DE6600DF5655 /* YHEditInterestViewController.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHReAppointViewController.swift

@@ -103,6 +103,7 @@ class YHReAppointViewController: YHBaseViewController {
         item2.itemIndex = 0
         let group1 = YHSelectGroupMemberModel()
         group1.isAllMembersGoHK = true
+        group1.isShowReAppointView = true
         group1.arr = waitAppointMembers
         item2.model = group1
         item2.placeList = self.viewModel.placeList
@@ -145,8 +146,6 @@ extension YHReAppointViewController: UITableViewDelegate, UITableViewDataSource
             if item.type == .confirmGoHKInfo {
                 // 请您确认第X批赴港信息
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHSelectApplicantGroupCell.cellReuseIdentifier, for: indexPath) as! YHSelectApplicantGroupCell
-                cell.isShowSelectUserView = false
-                cell.isShowRepointNameView = true
                 cell.repointMembersNameLabel.text = self.getReAppointMemberNameText()
                 cell.dataModel = item
                 cell.refreshBlock = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHAppointItem.swift

@@ -68,4 +68,7 @@ class YHSelectGroupMemberModel {
     
     // 是否统一赴港
     var isAllMembersGoHK: Bool = false
+    
+    // 是否显示重新预约人员名单
+    var isShowReAppointView: Bool = false
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHCertificateAppointOptionView.swift

@@ -33,7 +33,6 @@ class YHCertificateAppointOptionView: UIView {
         let label = UILabel()
         label.numberOfLines = 0
         label.font = UIFont.PFSC_M(ofSize: 14)
-        label.text = "张全蛋"
         label.textColor = UIColor.mainTextColor
         return label
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHHaveGrabbedNumberInfoView.swift

@@ -75,7 +75,8 @@ class YHHaveGrabbedNumberInfoView: UIView {
         self.addSubview(intentionInfoView)
         
         lineView.snp.makeConstraints { make in
-            make.left.right.top.equalToSuperview()
+            make.top.equalTo(-0.5)
+            make.left.right.equalToSuperview()
             make.height.equalTo(0.5)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHInfoItemOptionView.swift

@@ -159,7 +159,7 @@ class YHInfoItemOptionView: UIView {
         lineView.snp.makeConstraints { make in
             make.left.equalTo(0)
             make.right.equalTo(0)
-            make.top.equalTo(0)
+            make.top.equalTo(-0.5)
             make.height.equalTo(0.5)
         }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectApplicantGroupCell.swift

@@ -41,10 +41,12 @@ class YHSelectApplicantGroupCell: UITableViewCell {
                 }
             }
             
+            reAppontNameView.isHidden = !isShowRepointNameView
             reAppontNameView.snp.remakeConstraints { make in
                 make.top.equalTo(lineView.snp.bottom)
                 make.left.equalTo(18)
                 make.right.equalTo(-18)
+                make.bottom.equalTo(selectPanelView.snp.top)
                 if !isShowRepointNameView {
                     make.height.equalTo(0)
                 }
@@ -63,14 +65,31 @@ class YHSelectApplicantGroupCell: UITableViewCell {
     
     var isShowRepointNameView: Bool = false {
         didSet {
+            
+            selectPanelView.isHidden = !isShowSelectUserView
+            selectPanelView.snp.remakeConstraints { make in
+                make.top.equalTo(reAppontNameView.snp.bottom)
+                make.left.equalTo(0)
+                make.right.equalTo(0)
+                make.bottom.equalTo(optionsView.snp.top)
+                if !isShowSelectUserView {
+                    make.height.equalTo(0)
+                }
+            }
+            
+            optionsView.lineView.isHidden = (!isShowSelectUserView && !isShowRepointNameView)
+
+            reAppontNameView.isHidden = !isShowRepointNameView
             reAppontNameView.snp.remakeConstraints { make in
                 make.top.equalTo(lineView.snp.bottom)
                 make.left.equalTo(18)
                 make.right.equalTo(-18)
+                make.bottom.equalTo(selectPanelView.snp.top)
                 if !isShowRepointNameView {
                     make.height.equalTo(0)
                 }
             }
+            
             self.setNeedsLayout()
             self.layoutIfNeeded()
         }
@@ -231,22 +250,14 @@ class YHSelectApplicantGroupCell: UITableViewCell {
     lazy var reAppontNameView: UIView = {
         let view = UIView()
         
-        let lineView = UIView()
-        lineView.backgroundColor = .separatorColor
-        view.addSubview(lineView)
-        
         let grayView = UIView()
         grayView.backgroundColor = .init(hex: 0xF8F9FB)
         grayView.addSubview(repointMembersNameLabel)
         view.addSubview(grayView)
         
-        lineView.snp.makeConstraints { make in
-            make.left.right.top.equalTo(0)
-            make.height.equalTo(1)
-        }
         grayView.snp.makeConstraints { make in
             make.left.right.equalTo(0)
-            make.top.equalTo(lineView.snp.bottom).offset(12)
+            make.top.equalTo(12)
             make.bottom.equalTo(-12)
         }
         repointMembersNameLabel.snp.makeConstraints { make in
@@ -413,8 +424,8 @@ private extension YHSelectApplicantGroupCell {
         
         if let model = dataModel?.model {
             
-            let isShowSelectList = !model.isAllMembersGoHK
-            self.isShowSelectUserView = isShowSelectList
+            self.isShowSelectUserView = !model.isAllMembersGoHK
+            self.isShowRepointNameView = model.isShowReAppointView
             
             if model.isAllMembersGoHK {
                 let a: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.failColor))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/GuideToHongKong(5 赴港行程指南)/View/YHDisappointHKAlertView.swift

+//
+//  YHDisappointHKAlertView.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/26.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHDisappointHKAlertView: UIView {
+
+    var confirmBlock:(()->())?
+    
+    lazy var blackMaskView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .alertMaskColor
+        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: "guide_no_appoint_hk"))
+        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 detailLabel: UILabel = {
+        var label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_R(ofSize: 14.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 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 closeBtn:UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "update_close"), for: .normal)
+        btn.addTarget(self, action: #selector(didCloseBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
+    static func alertView() -> YHDisappointHKAlertView {
+        let view = YHDisappointHKAlertView(frame: UIScreen.main.bounds)
+        return view
+    }
+    
+    @objc func show() {
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+    }
+    
+    @objc func dismiss() {
+        self.removeFromSuperview()
+    }
+    
+    @objc func didCloseBtnClicked() {
+        dismiss()
+    }
+    
+    @objc func didConfirmBtnClicked() {
+        confirmBlock?()
+        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)
+        self.addSubview(closeBtn)
+        whiteContentView.addSubview(iconImgView)
+        whiteContentView.addSubview(titleLabel)
+        whiteContentView.addSubview(detailLabel)
+        whiteContentView.addSubview(confirmBtn)
+        
+        blackMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        whiteContentView.snp.makeConstraints { make in
+            make.left.equalTo(38)
+            make.right.equalTo(-38)
+            make.centerY.equalToSuperview().offset(-24)
+        }
+        
+        iconImgView.snp.makeConstraints { make in
+            make.width.height.equalTo(100)
+            make.top.equalTo(32)
+            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)
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
+        }
+        
+        confirmBtn.snp.makeConstraints { make in
+            make.top.equalTo(detailLabel.snp.bottom).offset(42)
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+            make.bottom.equalTo(-21)
+            make.height.equalTo(45)
+        }
+        
+        closeBtn.snp.makeConstraints { make in
+            make.width.height.equalTo(24)
+            make.top.equalTo(whiteContentView.snp.bottom).offset(24)
+            make.centerX.equalTo(whiteContentView)
+        }
+    }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/5 赴港行程指南/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/5 赴港行程指南/guide_no_appoint_hk.imageset/Contents.json

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