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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -38,6 +38,8 @@
 		04213B2F2C49154900797900 /* YHHomeInfoDetailContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04213B2E2C49154900797900 /* YHHomeInfoDetailContainerViewController.swift */; };
 		04213B312C4917BD00797900 /* YHHomeInfoDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04213B302C4917BD00797900 /* YHHomeInfoDetailViewController.swift */; };
 		04213B332C4A084600797900 /* YHHomeInfoClassifyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04213B322C4A084600797900 /* YHHomeInfoClassifyModel.swift */; };
+		04213B352C4F85A900797900 /* YHHomeLifeCategoryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04213B342C4F85A900797900 /* YHHomeLifeCategoryModel.swift */; };
+		04213B372C4F87C600797900 /* YHHomeLifeCategoryDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04213B362C4F87C600797900 /* YHHomeLifeCategoryDetailModel.swift */; };
 		0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */; };
 		0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */; };
 		0425E6422BA95B1B00A5E763 /* YHSchemeTableFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E6412BA95B1B00A5E763 /* YHSchemeTableFooterView.swift */; };
@@ -647,6 +649,8 @@
 		04213B2E2C49154900797900 /* YHHomeInfoDetailContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeInfoDetailContainerViewController.swift; sourceTree = "<group>"; };
 		04213B302C4917BD00797900 /* YHHomeInfoDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeInfoDetailViewController.swift; sourceTree = "<group>"; };
 		04213B322C4A084600797900 /* YHHomeInfoClassifyModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeInfoClassifyModel.swift; sourceTree = "<group>"; };
+		04213B342C4F85A900797900 /* YHHomeLifeCategoryModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeLifeCategoryModel.swift; sourceTree = "<group>"; };
+		04213B362C4F87C600797900 /* YHHomeLifeCategoryDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeLifeCategoryDetailModel.swift; sourceTree = "<group>"; };
 		0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableViewCell.swift; sourceTree = "<group>"; };
 		0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScemeItemModel.swift; sourceTree = "<group>"; };
 		0425E6412BA95B1B00A5E763 /* YHSchemeTableFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableFooterView.swift; sourceTree = "<group>"; };
@@ -2663,6 +2667,8 @@
 				A5A89FD62C256B94005A71DD /* YHHomeLastMessageModel.swift */,
 				A5B6ED752C2593A1001B6732 /* YHSignerInfoModel.swift */,
 				04213B322C4A084600797900 /* YHHomeInfoClassifyModel.swift */,
+				04213B342C4F85A900797900 /* YHHomeLifeCategoryModel.swift */,
+				04213B362C4F87C600797900 /* YHHomeLifeCategoryDetailModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -3378,6 +3384,7 @@
 				044D0C062C22736F00C5CF5E /* YHSetExplainView.swift in Sources */,
 				04213B252C48C15400797900 /* YHHomeIdentityViewController.swift in Sources */,
 				045EEF002B9F171A0022A143 /* YHFormItemEnterDetailCell.swift in Sources */,
+				04213B352C4F85A900797900 /* YHHomeLifeCategoryModel.swift in Sources */,
 				04FB01CE2C23DDBD0040115D /* YHPeopleMatchNoDataView.swift in Sources */,
 				A5ACE9362B4564F7002C94D2 /* YHNetworkStatusManager.swift in Sources */,
 				048787D52BCE880B0036E221 /* YHServiceOrderListViewController.swift in Sources */,
@@ -3663,6 +3670,7 @@
 				0445E6AF2BE9CFF6003C52F9 /* YHAppVersionForceUpdateView.swift in Sources */,
 				04213B272C48C95E00797900 /* YHHomeIdentityCell.swift in Sources */,
 				04CE1AD32C2AD91F001CB80A /* YHTravelModel.swift in Sources */,
+				04213B372C4F87C600797900 /* YHHomeLifeCategoryDetailModel.swift in Sources */,
 				04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */,
 				045EEEC12B9F171A0022A143 /* YHOtherInfoFillModel.swift in Sources */,
 				047A3DF52C295AFF0048937B /* YHFriendListModel.swift in Sources */,

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHomeLifeCategoryDetailModel.swift

+//
+//  YHHomeLifeCategoryDetailModel.swift
+//  galaxy
+//
+//  Created by edy on 2024/7/23.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHHomeLifeCategoryDetailModel: SmartCodable {
+    var products: [YHProductModel] = []
+    var imageURLDefault: String = ""
+    var imageURLDefaultDownload: String = ""
+
+    enum CodingKeys: String, CodingKey {
+        case products
+        case imageURLDefault = "imageUrlDefault"
+        case imageURLDefaultDownload = "imageUrlDefaultDownload"
+    }
+
+    required init() {
+        
+    }
+}
+
+// MARK: - Product
+class YHProductModel: SmartCodable {
+    var name: String = ""
+    var description: String = ""
+    var image: String = ""
+    var banner: [String] = []
+    var details: [YHDetailModel] = []
+
+    required init() {
+        
+    }
+}
+
+// MARK: - Detail
+class YHDetailModel: SmartCodable {
+    var name: String = ""
+    var image: String = ""
+   
+    required init() {
+        
+    }
+}

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHomeLifeCategoryModel.swift

+//
+//  YHHomeLifeCategoryModel.swift
+//  galaxy
+//
+//  Created by edy on 2024/7/23.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+
+class YHHomeLifeCategoryModel: SmartCodable {
+    var id: String = ""
+    var name: String = ""
+    var image: String = ""
+
+    required init() {
+        
+    }
+    
+    enum CodingKeys: String, CodingKey {
+        case id, name, image
+    }
+}

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -16,7 +16,9 @@ class YHHomePageViewModel : YHBaseViewModel {
     var classify: [YHHomeClassifyModel]?
     var hkList: [YHHKEventModel]? //香港办事 也是静态数据的入口
     var classifyArr:[YHHomeInfoClassifyModel?] = []
-    
+    var categoryArr:[YHHomeLifeCategoryModel?] = []
+    var detailModel: YHHomeLifeCategoryDetailModel = YHHomeLifeCategoryDetailModel()
+ 
     //首页相关参数
     private var curPageIndex : Int = 1
     private var page_Size : Int = 50
@@ -488,4 +490,59 @@ extension YHHomePageViewModel {
             callBackBlock(false,err)
         }
     }
+    
+    func getGoodsCategory(params :[String:Any] = [:], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.homeLifeCategory
+        let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
+            guard let self = self else { return }
+            //1. json字符串 转 对象
+            if json.code == 200 {
+                let dic = json.data
+                guard let result = [YHHomeLifeCategoryModel].deserialize(array: dic as? [Any]) else {
+                    let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    self.categoryArr = []
+                    callBackBlock(false, error)
+                    return
+                }
+                self.categoryArr = result
+                callBackBlock(true, nil)
+                
+            } else {
+                self.categoryArr = []
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            self.categoryArr = []
+            callBackBlock(false, err)
+        }
+        
+        func getGoodsCategoryDetail(params :[String:Any] = [:], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+            
+            let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.homeLifeDetail
+            let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
+                guard let self = self else { return }
+                //1. json字符串 转 对象
+                if json.code == 200 {
+                    let dic = json.data
+                    guard let result = YHHomeLifeCategoryDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                        self.detailModel = YHHomeLifeCategoryDetailModel()
+                        callBackBlock(false, nil)
+                        return
+                    }
+                    self.detailModel = result
+                    callBackBlock(true, nil)
+                    
+                } else {
+                    self.detailModel = YHHomeLifeCategoryDetailModel()
+                    let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                    callBackBlock(false, error)
+                }
+            } failBlock: { err in
+                self.detailModel = YHHomeLifeCategoryDetailModel()
+                callBackBlock(false, err)
+            }
+        }
+    }
 }

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

@@ -68,6 +68,10 @@ class YHAllApiName {
         static let likeCollect = "infoflow/article/myArticleRecord"
         // 首页资讯栏目
         static let homeInfoClassifies = "infoflow/classify/classifies"
+        // 首页身份、生活(类别)
+        static let homeLifeCategory = "super-app/goods-category-info"
+        // 首页身份、生活(详情)
+        static let homeLifeDetail = "super-app/goods-info"
     }