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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -690,6 +690,7 @@
 		A5D5ADEF2BB90FBC0039FA6B /* YHCheckEamilAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */; };
 		A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
 		A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
+		A5DF9C632C78733200CE48E6 /* YHHKLegaldaysModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF9C622C78733200CE48E6 /* YHHKLegaldaysModel.swift */; };
 		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
 		A5EB6C6F2C69FB9A0081FB6C /* YHOfficalLetterListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EB6C672C69FB9A0081FB6C /* YHOfficalLetterListModel.swift */; };
 		A5EB6C702C69FB9A0081FB6C /* YHOfficialApprovalResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EB6C692C69FB9A0081FB6C /* YHOfficialApprovalResultVC.swift */; };
@@ -1450,6 +1451,7 @@
 		A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCheckEamilAlertView.swift; sourceTree = "<group>"; };
 		A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; };
 		A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
+		A5DF9C622C78733200CE48E6 /* YHHKLegaldaysModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKLegaldaysModel.swift; sourceTree = "<group>"; };
 		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
 		A5EB6C672C69FB9A0081FB6C /* YHOfficalLetterListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficalLetterListModel.swift; sourceTree = "<group>"; };
 		A5EB6C692C69FB9A0081FB6C /* YHOfficialApprovalResultVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC.swift; sourceTree = "<group>"; };
@@ -1652,6 +1654,7 @@
 				04256E1A2C75C60C00A37BA4 /* YHHKMemberModel.swift */,
 				04256E1C2C75C74200A37BA4 /* YHAppointHKResultModel.swift */,
 				04358E092C7835B000811928 /* YHMakeCertificatePlaceModel.swift */,
+				A5DF9C622C78733200CE48E6 /* YHHKLegaldaysModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -4482,6 +4485,7 @@
 				045EEF102B9F171A0022A143 /* YHMainApplicantInformationViewModel.swift in Sources */,
 				044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */,
 				0493B3DC2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift in Sources */,
+				A5DF9C632C78733200CE48E6 /* YHHKLegaldaysModel.swift in Sources */,
 				0430E65A2C7436CD000511E2 /* YHAdopterNewPeopleViewModel.swift in Sources */,
 				04256E1D2C75C74200A37BA4 /* YHAppointHKResultModel.swift in Sources */,
 				04CE1ADB2C2AD91F001CB80A /* YHActivityTitleItemView.swift in Sources */,

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

+//
+//  YHHKLegaldaysModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/8/23.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHHKLegaldaysModel: SmartCodable {
+    var legaldays: [String] = []
+    required init() {
+        
+    }
+
+}

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

@@ -15,6 +15,43 @@ class YHCerAppointViewModel: NSObject {
     var placeList: [YHMakeCertificatePlaceModel] = []
     var appointResult: YHAppointHKResultModel = YHAppointHKResultModel()
     
+    //香港节假日
+    var dataModelForHkLegalDays : YHHKLegaldaysModel?
+    
+    
+    // 获取香港节假日
+    func getHKHolidays(callback:((_ success: Bool, _ error: YHErrorModel?)->())?) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.hkholidaysApi
+        
+        let _ = YHNetRequest.getRequest(url: strUrl) { [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 = YHHKLegaldaysModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                    let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    callback?(false, err)
+                    return
+                }
+                self.dataModelForHkLegalDays = resultModel
+                callback?(true, nil)
+                
+            } else {
+                
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                self.hkUsers = []
+                callback?(false, err)
+            }
+            
+        } failBlock: { err in
+            self.hkUsers = []
+            callback?(false, err)
+        }
+    }
+    
     // 获取香港服务列表
     func getServicelist(_ callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
         

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

@@ -346,10 +346,10 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             return
         }
         
-//        let vc = YHCertificateAppointViewController()
-//        vc.orderId = 151085
-//        self.navigationController?.pushViewController(vc)
-//        return
+        let vc = YHCertificateAppointViewController()
+        vc.orderId = 151085
+        self.navigationController?.pushViewController(vc)
+        return
         
         let item: PersonalModuleItem = items[indexPath.row]
         switch item.type {

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -434,7 +434,11 @@ class YHAllApiName {
         
     }
     
+    //赴港办证预约
     struct AppointHK {
+        // 获取香港节假日
+        static let hkholidaysApi = "super-app/holiday/get"
+        
         //  所有赴港人员列表
         static let hkMembers = "super-app/order/hk/user"
         // 获取港府预约结果