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

@@ -125,6 +125,7 @@
 		0430E68A2C77415D000511E2 /* YHAdopterAddModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0430E6892C77415D000511E2 /* YHAdopterAddModel.swift */; };
 		04358E042C77322700811928 /* YHHaveGrabbedNumberListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E032C77322700811928 /* YHHaveGrabbedNumberListCell.swift */; };
 		04358E062C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E052C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift */; };
+		04358E082C77657000811928 /* YHReAppointViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E072C77657000811928 /* YHReAppointViewController.swift */; };
 		0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
 		0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
 		0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
@@ -871,6 +872,7 @@
 		0430E6892C77415D000511E2 /* YHAdopterAddModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAdopterAddModel.swift; sourceTree = "<group>"; };
 		04358E032C77322700811928 /* YHHaveGrabbedNumberListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHaveGrabbedNumberListCell.swift; sourceTree = "<group>"; };
 		04358E052C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHaveGrabbedNumberInfoView.swift; sourceTree = "<group>"; };
+		04358E072C77657000811928 /* YHReAppointViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHReAppointViewController.swift; sourceTree = "<group>"; };
 		0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
 		0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
 		0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
@@ -1676,6 +1678,7 @@
 			isa = PBXGroup;
 			children = (
 				04256DDD2C72DA3A00A37BA4 /* YHCertificateAppointViewController.swift */,
+				04358E072C77657000811928 /* YHReAppointViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -4683,6 +4686,7 @@
 				A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */,
 				A567E5A62BD7643D00D5D5A0 /* YHHomeSearchView.swift in Sources */,
 				045EEE912B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemView.swift in Sources */,
+				04358E082C77657000811928 /* YHReAppointViewController.swift in Sources */,
 				044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */,
 				04FD856A2C21362300BEF9C5 /* YHMyIntroductionCell.swift in Sources */,
 				045EEEE62B9F171A0022A143 /* YHMySignatureListViewController.swift in Sources */,

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

@@ -78,13 +78,17 @@ class YHCertificateAppointViewController: YHBaseViewController {
     }
     
     func requestData() {
+        YHHUD.show(.progress(message: "加载中..."))
         self.requetIsGoToHK { // 请求是否赴港办证选项和是否已预约过
             self.requetAppointMembers { // 请求赴港办证人员名单
                 if self.reservationToHK == 1 { // 有历史预约人员
+                    YHHUD.show(.progress(message: "加载中..."))
                     self.requestAppointResultList { // 请求预约结果
+                        YHHUD.hide()
                         self.updateData()
                     }
                 } else { // 没有预约过
+                    YHHUD.hide()
                     self.updateData()
                 }
             }
@@ -93,6 +97,8 @@ class YHCertificateAppointViewController: YHBaseViewController {
     
     func updateData() {
         
+        YHHUD.hide()
+
         sections.removeAll()
         items1.removeAll()
         items2.removeAll()
@@ -252,6 +258,13 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
                     // 待预约赴港成员
                     let cell = tableView.dequeueReusableCell(withIdentifier: YHWaitAppointMembersCell.cellReuseIdentifier, for: indexPath) as! YHWaitAppointMembersCell
                     cell.members = waitAppointMembers
+
+                    cell.clickBlock = {
+                        [weak self] in
+                        guard let self = self else { return }
+                       let vc = YHReAppointViewController()
+                        self.navigationController?.pushViewController(vc)
+                    }
                     return cell
                     
                 }
@@ -259,6 +272,7 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
                 if item.type == .confirmGoHKInfo {
                     // 请您确认第X批赴港信息
                     let cell = tableView.dequeueReusableCell(withIdentifier: YHSelectApplicantGroupCell.cellReuseIdentifier, for: indexPath) as! YHSelectApplicantGroupCell
+                    cell.isShowSelectUserView = !self.isAllMembersGo
                     return cell
                 }
                 

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

+//
+//  YHReAppointViewController.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+// 重新预约
+class YHReAppointViewController: YHBaseViewController {
+
+    var orderId: Int = 0
+    var items:[YHAppointItem] = []
+
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame:.zero, style:.grouped)
+        tableView.estimatedSectionHeaderHeight = 16.0
+        tableView.estimatedSectionFooterHeight = 0.01
+        tableView.contentInsetAdjustmentBehavior = .never
+        tableView.showsVerticalScrollIndicator = false
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.backgroundColor = UIColor(hex: 0xF8F9FB)
+        
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHCertificateAppointOptionCell.self, forCellReuseIdentifier: YHCertificateAppointOptionCell.cellReuseIdentifier)
+        tableView.register(YHSelectApplicantGroupCell.self, forCellReuseIdentifier: YHSelectApplicantGroupCell.cellReuseIdentifier)
+        tableView.register(YHAppointWarmTipsCell.self, forCellReuseIdentifier: YHAppointWarmTipsCell.cellReuseIdentifier)
+        tableView.register(YHGrabingNumberListCell.self, forCellReuseIdentifier: YHGrabingNumberListCell.cellReuseIdentifier)
+        tableView.register(YHActivateHKVisaCell.self, forCellReuseIdentifier: YHActivateHKVisaCell.cellReuseIdentifier)
+        tableView.register(YHWaitAppointMembersCell.self, forCellReuseIdentifier: YHWaitAppointMembersCell.cellReuseIdentifier)
+        tableView.register(YHNoNeedAppointMembersCell.self, forCellReuseIdentifier: YHNoNeedAppointMembersCell.cellReuseIdentifier)
+        tableView.register(YHHaveGrabbedNumberListCell.self, forCellReuseIdentifier: YHHaveGrabbedNumberListCell.cellReuseIdentifier)
+        
+        return tableView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        createUI()
+    }
+    
+    func createUI() {
+        
+        super.viewDidLoad()
+        self.gk_navTitle = "赴港办证预约"
+        self.view.backgroundColor = .white
+        self.view.addSubview(self.tableView)
+
+        self.tableView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+        }
+        
+        updateData()
+    }
+    
+    func updateData() {
+        items.removeAll()
+        // *温馨提示
+        let item1 = YHAppointItem(type: .warmTips)
+        items.append(item1)
+        
+        let item2 = YHAppointItem(type: .confirmGoHKInfo)
+        items.append(item2)
+        
+        self.tableView.reloadData()
+    }
+    
+}
+
+extension YHReAppointViewController: UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
+        
+        if 0 <= indexPath.row, indexPath.row < items.count {
+            let item = items[indexPath.row]
+            if item.type == .warmTips {
+                // 温馨提示
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHAppointWarmTipsCell.cellReuseIdentifier, for: indexPath) as! YHAppointWarmTipsCell
+                return cell
+            }
+            if item.type == .confirmGoHKInfo {
+                // 请您确认第X批赴港信息
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHSelectApplicantGroupCell.cellReuseIdentifier, for: indexPath) as! YHSelectApplicantGroupCell
+                cell.isShowSelectUserView = false
+                return cell
+            }
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        let view = UIView()
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        let view = UIView()
+        return view
+    }
+}
+

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

@@ -22,6 +22,40 @@ class YHSelectApplicantInfo {
 class YHSelectApplicantGroupCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHSelectApplicantGroupCell"
+    let detailText = "选择第一批赴港激活签证的申请人"
+    
+    var isShowSelectUserView: Bool = true {
+        
+        didSet {
+            
+            detailLabel.isHidden = !isShowSelectUserView
+            selectGroupView.isHidden = !isShowSelectUserView
+            collectionView.isHidden = !isShowSelectUserView
+            lineView.isHidden = !isShowSelectUserView
+            
+            detailLabel.text = isShowSelectUserView ? self.detailText : ""
+            detailLabel.snp.updateConstraints { make in
+                make.top.equalTo(lineView.snp.bottom).offset(isShowSelectUserView ? 16 : 0)
+            }
+            
+            selectGroupView.snp.updateConstraints { make in
+                make.top.equalTo(detailLabel.snp.bottom).offset(isShowSelectUserView ? 12 : 0)
+            }
+            
+            collectionView.snp.updateConstraints { make in
+                make.top.equalTo(isShowSelectUserView ? 14 : 0)
+                make.bottom.equalTo(isShowSelectUserView ? -14 : 0)
+                make.height.equalTo(isShowSelectUserView ? 56 : 0)
+            }
+            
+            optionsView.snp.updateConstraints { make in
+                make.top.equalTo(selectGroupView.snp.bottom).offset(isShowSelectUserView ? 16 : 0)
+            }
+            
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
+        }
+    }
 
     lazy var selecters:[YHSelectApplicantInfo] = {
         return [YHSelectApplicantInfo(name: "李小龙", isSelect: true),
@@ -57,7 +91,7 @@ class YHSelectApplicantGroupCell: UITableViewCell {
         label.numberOfLines = 0
         label.font = UIFont.PFSC_R(ofSize: 14)
         label.textColor = .mainTextColor
-        label.text = "选择第一批赴港激活签证的申请人"
+        label.text = self.detailText
         return label
     }()
     

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

@@ -11,6 +11,7 @@ import UIKit
 class YHWaitAppointMembersCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHWaitAppointMembersCell"
+    var clickBlock: (()->())?
     
     var members:[YHHKMemberModel] = [] {
         didSet {
@@ -76,7 +77,7 @@ class YHWaitAppointMembersCell: UITableViewCell {
     }
     
     @objc func didBottomBtnClicked() {
-        
+        clickBlock?()
     }
     
     func setupUI() {