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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -397,6 +397,7 @@
 		A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */; };
 		A5D0012A2BABC84A001F003C /* YHFileListHeaerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */; };
 		A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001292BABC84A001F003C /* YHFileListBottomView.swift */; };
+		A5D335F92BCE51E700236F21 /* YHServiceCenterProgressModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D335F82BCE51E700236F21 /* YHServiceCenterProgressModel.swift */; };
 		A5D5ADEF2BB90FBC0039FA6B /* YHCheckEamilAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */; };
 		A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
 		A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
@@ -848,6 +849,7 @@
 		A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChoiceButtonHoldView.swift; sourceTree = "<group>"; };
 		A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListHeaerView.swift; sourceTree = "<group>"; };
 		A5D001292BABC84A001F003C /* YHFileListBottomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListBottomView.swift; sourceTree = "<group>"; };
+		A5D335F82BCE51E700236F21 /* YHServiceCenterProgressModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterProgressModel.swift; sourceTree = "<group>"; };
 		A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCheckEamilAlertView.swift; sourceTree = "<group>"; };
 		A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
 		A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
@@ -2091,6 +2093,7 @@
 				A5FD63C02B62616D00D1D9DA /* YHInformationPerfectModel.swift */,
 				A5FD63C22B63438A00D1D9DA /* YHContactMainItemStatusModel.swift */,
 				A58556B92B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift */,
+				A5D335F82BCE51E700236F21 /* YHServiceCenterProgressModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -2850,6 +2853,7 @@
 				0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */,
 				A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */,
 				0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */,
+				A5D335F92BCE51E700236F21 /* YHServiceCenterProgressModel.swift in Sources */,
 				045EEECC2B9F171A0022A143 /* YHScoreResultModel.swift in Sources */,
 				045EEEDC2B9F171A0022A143 /* YHQualificationDetailVC.swift in Sources */,
 				045EEEF52B9F171A0022A143 /* YHSpouseInfoContainerVC.swift in Sources */,
@@ -2956,7 +2960,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2976,7 +2980,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.9;
+				MARKETING_VERSION = 0.2.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3157,7 +3161,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3177,7 +3181,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.9;
+				MARKETING_VERSION = 0.2.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3199,7 +3203,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3219,7 +3223,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.9;
+				MARKETING_VERSION = 0.2.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/AppDelegate.swift

@@ -134,7 +134,7 @@ extension AppDelegate {
         
         v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
         
-        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
+        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
         
         v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
         

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift

@@ -107,7 +107,7 @@ private extension YHStartPageViewController {
         
         v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
         
-        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
+        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
         
         v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -85,8 +85,7 @@ extension YHServiceCenterMainViewController {
     }
     
     func setupUI() {
-        title = "服务中心"
-        gk_navTitle = "服务中心"
+        gk_navTitle = "服务"
         gk_navBarAlpha = 1.0
         
         loginTipsView.clickLoginBtnCallBackBlock = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHServiceCenterProgressModel.swift

+//
+//  YHServiceCenterProgressModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/16.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHServiceCenterProgressModel : YHBaseModel {
+    var name : String = ""
+    var percentage : Int = 0
+    var status : Int = 0 // 0未知 1待开始 2进行中 3 已完成
+    var num : Int = 0
+    var type : Int = 0 // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -24,12 +24,48 @@ class YHServiceCenterMainViewModel: YHBaseViewModel {
     //我的评分
     var myScoreResultData : YHScoreResultModel?//网络请求的结果数据
     var localScoreData : YHScoreDataModel? //本地缓存的数据
-    
     var allInfoScoreModel: YHContactInfoScoreModel? //提交信息获取 得分
+    
+    //服务中心进度模型
+    var arrDataForSeviceCenterProgress  : [YHServiceCenterProgressModel] = []
+    
 }
 
 //请求接口
 extension YHServiceCenterMainViewModel {
+    //服务中心进度列表
+    func getServiceCenterProgressList( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        
+        /*
+         orderId integer 订单id 可选
+         status integer 可选   0全部 1待开始 2进行中 3 已完成
+         let arr = ["orderId":id,"status"]
+         */
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.serviceCenterProgressApi
+        
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [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 result = [YHServiceCenterProgressModel].deserialize(from: dic as? [Any]) else {
+                    callBackBlock(false,nil)
+                    return
+                }
+                self.arrDataForSeviceCenterProgress = result as! [YHServiceCenterProgressModel]
+                callBackBlock(true, nil)
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callBackBlock(false,err)
+            }
+        } failBlock: { err in
+            callBackBlock(false,err)
+        }
+    }
+    
     //获取我的评分结果
     func getMyScoreDetail( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         

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

@@ -61,6 +61,8 @@ class YHAllApiName {
         //保存其他资料信息
         static let  updateOtherInfoApi = "infoflow/order/updateOrderOtherInformation"
         
+        //服务中心进度列表
+        static let  serviceCenterProgressApi = "infoflow/order/service-list"
     }
     
     struct Family {