1、几处bug修改

2、几处优化

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -263,6 +263,7 @@
 		A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */; };
 		A53B61192BB3C9960010B573 /* YHMyDocListHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */; };
 		A53D381E2BC23794006AE6F7 /* YHMsgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D381D2BC23794006AE6F7 /* YHMsgViewController.swift */; };
+		A53D38202BC243F1006AE6F7 /* YHStartPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */; };
 		A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5112B99715000EA5973 /* YHConstantArrayData.swift */; };
 		A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
 		A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
@@ -673,6 +674,7 @@
 		A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListItemsView2.swift; sourceTree = "<group>"; };
 		A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyDocListHeaderView.swift; sourceTree = "<group>"; };
 		A53D381D2BC23794006AE6F7 /* YHMsgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMsgViewController.swift; sourceTree = "<group>"; };
+		A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHStartPageViewController.swift; sourceTree = "<group>"; };
 		A554A5112B99715000EA5973 /* YHConstantArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConstantArrayData.swift; sourceTree = "<group>"; };
 		A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
 		A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2117,6 +2119,7 @@
 				A5ACE95D2B4571BF002C94D2 /* YHHomeViewController.swift */,
 				A5C5B2FE2B55623700A7C5D1 /* YHMainContentBaseViewController.swift */,
 				A5C5B2E52B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift */,
+				A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -2596,6 +2599,7 @@
 				04A7BD132BA42F4200BD35A2 /* YHMyDocumentsDetailViewController.swift in Sources */,
 				04A671622BA058DE00C1FB91 /* YHCertificateEditSheetView.swift in Sources */,
 				A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */,
+				A53D38202BC243F1006AE6F7 /* YHStartPageViewController.swift in Sources */,
 				045EEE882B9F171A0022A143 /* YHPreviewAcademicAndProfessionalQualificationViewController.swift in Sources */,
 				0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */,
 				A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */,

galaxy/galaxy/AppDelegate.swift

@@ -149,9 +149,15 @@ extension AppDelegate {
 //        tabBarController.viewControllers = [v1,v2] //for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
         tabBarController.tabBar.backgroundColor = .white
         
+        
+        
+        
+        
         window = UIWindow(frame: UIScreen.main.bounds)
-        window?.rootViewController = tabBarController
+//        window?.rootViewController = tabBarController
+        window?.rootViewController = YHStartPageViewController()
         window?.makeKeyAndVisible()
+        
     }
     
     // 网银云信IM相关配置

galaxy/galaxy/Classes/Base/V/YHBasicContentView.swift

@@ -13,14 +13,14 @@ class YHBasicContentView: ESTabBarItemContentView {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-//        textColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
-//        highlightTextColor = .brandMainColor
-//        
-//        iconColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
-//        highlightIconColor = .brandMainColor
+        textColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
+        highlightTextColor = .brandMainColor
+        
+        iconColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
+        highlightIconColor = .brandMainColor
         
 
-        titleLabel.font = UIFont.PFSC_R(ofSize: 10)
+        titleLabel.font = UIFont.PFSC_R(ofSize: 14)
     }
     
     public required init?(coder aDecoder: NSCoder) {

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

+//
+//  YHStartPageViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import ESTabBarController_swift
+/*
+ 启动页 自带倒计时
+ */
+
+class YHStartPageViewController: UIViewController {
+    
+    private var MaxTime : Int = 10 //for test hjl
+    private var timer : Timer?
+    
+    lazy var imagV: UIImageView = {
+        let imagV  = UIImageView()
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let button = UIButton(type: .custom)
+        button.titleLabel?.font = UIFont.PFSC_R(ofSize: 12)
+        button.setTitle("跳过 5", for: .normal)
+        button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+        button.setBackgroundColor(color: UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 0.3), forState: .normal)
+        return button
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        initView()
+        self.startTimer()
+    }
+}
+
+
+private extension YHStartPageViewController {
+    
+    func cancelTimer() {
+        guard self.timer != nil else {
+            return
+        }
+        self.timer!.invalidate()
+        self.timer = nil
+    }
+    
+    
+    func startTimer() {
+        cancelTimer()
+        self.timer = Timer.scheduledTimer(timeInterval: TimeInterval(1), target: self, selector: #selector(downTimerOp), userInfo: nil, repeats:  true)
+        RunLoop.current.add(self.timer!, forMode: .common)
+    }
+    
+    @objc func downTimerOp() {
+        MaxTime = MaxTime - 1
+        if MaxTime < 0 {
+            cancelTimer()
+            clickCancelBtn()
+            return
+        }
+        
+        let title = "跳过 " + MaxTime.string
+        closeBtn.setTitle(title, for: .normal)
+    }
+    
+    func initView() {
+        imagV.image = UIImage(named: "start_page_bkg")
+        view.addSubview(imagV)
+        imagV.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        
+        view.addSubview(closeBtn)
+        closeBtn.layer.zPosition = 10
+        closeBtn.clipsToBounds = true
+        closeBtn.layer.cornerRadius = 14
+        closeBtn.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.right.equalTo(-10)
+            make.width.equalTo(56)
+            make.height.equalTo(28)
+        }
+        closeBtn.addTarget(self, action: #selector(clickCancelBtn), for: .touchUpInside)
+    }
+    
+    @objc func clickCancelBtn() {
+        cancelTimer()
+        setupRootVC()
+    }
+    
+    //1.设置主窗口
+    func setupRootVC() {
+        let tabBarController = YHTabBarViewController()
+        let v0 = YHNavigationController(rootVC:YHHomeViewController())
+        let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
+        let v2 = YHNavigationController(rootVC:YHMsgViewController())
+        let v3 = YHNavigationController(rootVC:YHMyViewController())
+        
+        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"))
+        
+        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
+        
+        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
+        
+        tabBarController.viewControllers = [v0,v1,v2,v3]
+        //        tabBarController.viewControllers = [v1,v2] //for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
+        tabBarController.tabBar.backgroundColor = .white
+        
+        
+        let window = UIApplication.shared.yhKeyWindow()
+        window?.rootViewController = tabBarController
+        window?.makeKeyAndVisible()
+    }
+}

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

@@ -28,7 +28,7 @@ class YHContactMainItemStatusModel {
                 iconName = "service_center_sfsq_wdqz_icon"
                 itemName = "我的签字"
             } else if type == 6 {
-                iconName = "service_center_sfsq_wdpf_icon"
+                iconName = "service_center_sfsq_wdfa_icon"
                 itemName = "我的方案"
             } else {
                 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift

@@ -79,6 +79,7 @@ extension YHHKPlanDoctumentVC {
     
     
     fileprivate func startTimer() {
+        cancelTimer()
         self.timer = Timer.scheduledTimer(timeInterval: TimeInterval(3), target: self, selector: #selector(self.flipNext(sender:)), userInfo: nil, repeats:  false)
         RunLoop.current.add(self.timer!, forMode: .common)
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift

@@ -259,6 +259,8 @@ extension YHMyDocumentsListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalTo(bottomView.snp.top)
             }
+            
+            gk_navTitle = "批量下载"
         } else if type == .cancel {
             bottomView.isHidden = true
             tableView.snp.remakeConstraints { make in
@@ -266,6 +268,10 @@ extension YHMyDocumentsListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalToSuperview()
             }
+            
+            gk_navTitle = "我的文书"
+        } else {
+            gk_navTitle = "我的文书"
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureListViewController.swift

@@ -254,6 +254,7 @@ extension YHMySignatureListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalTo(bottomView.snp.top)
             }
+            gk_navTitle = "批量下载"
         } else if type == .cancel {
             bottomView.isHidden = true
             tableView.snp.remakeConstraints { make in
@@ -261,6 +262,9 @@ extension YHMySignatureListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalToSuperview()
             }
+            gk_navTitle = "我的签字"
+        } else {
+            gk_navTitle = "我的签字"
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHContractMainItemStatusCell.swift

@@ -95,7 +95,7 @@ extension YHContractMainItemStatusCell {
         } else if dataModel?.type == 2 {
             gofinishHoldView.isHidden = !(dataModel?.isFinished ?? false)
             goUnfinishHoldView.isHidden = dataModel?.isFinished ?? false
-        } else if dataModel?.type == 3 {
+        } else {
             myNextImgV.isHidden = false
         }
     }

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

@@ -151,11 +151,7 @@ extension YHServiceCenterMainViewModel {
                     }
                     
                    
-                    //我的评分
-                    let model3 = YHContactMainItemStatusModel()
-                    model3.type = 3
-                    model3.isFinished = true
-                    arrContactStausItmes.append(model3)
+                   
                     
                     if resultModel.my_document {
                         //我的文书
@@ -174,6 +170,13 @@ extension YHServiceCenterMainViewModel {
                         arrContactStausItmes.append(model5)
                     }
                     
+                    
+                    //我的评分
+                    let model3 = YHContactMainItemStatusModel()
+                    model3.type = 3
+                    model3.isFinished = true
+                    arrContactStausItmes.append(model3)
+                    
                     if resultModel.scheme_position_switch == 1 {
                         //我的方案
                         let model6 = YHContactMainItemStatusModel()

galaxy/galaxy/Res/Assets.xcassets/StartPage/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/StartPage/start_page_bkg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}