首页 UI修改

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -38,7 +38,6 @@
 		043D2C8A2C0EEF3F00172438 /* YHOrderSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043D2C892C0EEF3F00172438 /* YHOrderSearchViewController.swift */; };
 		043D2C8C2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043D2C8B2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift */; };
 		044378A42BFC848C001F95AE /* loginBkg.mov in Resources */ = {isa = PBXBuildFile; fileRef = 044378A32BFC848C001F95AE /* loginBkg.mov */; };
-		044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FC2BC386DA00784A14 /* YHServiceViewController.swift */; };
 		044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FE2BC391F000784A14 /* YHServiceListViewController.swift */; };
 		044414012BC3979800784A14 /* YHServerHKLifeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */; };
 		044414032BC39B8D00784A14 /* YHServerTableHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044414022BC39B8D00784A14 /* YHServerTableHeadView.swift */; };
@@ -619,7 +618,6 @@
 		043D2C892C0EEF3F00172438 /* YHOrderSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOrderSearchViewController.swift; sourceTree = "<group>"; };
 		043D2C8B2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderSearchViewModel.swift; sourceTree = "<group>"; };
 		044378A32BFC848C001F95AE /* loginBkg.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = loginBkg.mov; sourceTree = "<group>"; };
-		044413FC2BC386DA00784A14 /* YHServiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceViewController.swift; sourceTree = "<group>"; };
 		044413FE2BC391F000784A14 /* YHServiceListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceListViewController.swift; sourceTree = "<group>"; };
 		044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServerHKLifeViewController.swift; sourceTree = "<group>"; };
 		044414022BC39B8D00784A14 /* YHServerTableHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServerTableHeadView.swift; sourceTree = "<group>"; };
@@ -2824,7 +2822,6 @@
 				A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */,
 				04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */,
 				048787D42BCE880B0036E221 /* YHServiceOrderListViewController.swift */,
-				044413FC2BC386DA00784A14 /* YHServiceViewController.swift */,
 				04F5F85F2C1944D5004A463C /* YHHKCenterViewController.swift */,
 				044413FE2BC391F000784A14 /* YHServiceListViewController.swift */,
 				04F5F8612C1945C0004A463C /* YHHKIdentityCardViewController.swift */,
@@ -3642,7 +3639,6 @@
 				045EEE822B9F171A0022A143 /* YHPersonInfoIdentityCardModel.swift in Sources */,
 				045EEE952B9F171A0022A143 /* YHPreviewInfoCertificateInformationItemsView.swift in Sources */,
 				044D0C042C2180B700C5CF5E /* YHInformationAuthorizationStepTwoViewController.swift in Sources */,
-				044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */,
 				045EEEBB2B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift in Sources */,
 				045EEEED2B9F171A0022A143 /* YHParentInfoVC.swift in Sources */,
 				04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,

galaxy/galaxy/AppDelegate.swift

@@ -160,7 +160,8 @@ extension AppDelegate {
     func setupRootVCWithTabBar() {
 //        gk_navigationBar.isHidden = false
         let tabBarController = YHTabBarViewController()
-        let homeVC = YHHomePageViewController()
+//        let homeVC = YHHomePageViewController() //for test hjl
+        let homeVC = YHHomeHoldViewPageViewController()
         tabBarController.delegate = homeVC
         let v0 = YHNavigationController(rootVC:homeVC)
         let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())

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

@@ -173,7 +173,8 @@ private extension YHStartPageViewController {
     func setupRootVC() {
         gk_navigationBar.isHidden = false
         let tabBarController = YHTabBarViewController()
-        let homeVC = YHHomePageViewController()
+//        let homeVC = YHHomePageViewController()
+        let homeVC = YHHomeHoldViewPageViewController()
         tabBarController.delegate = homeVC
         let v0 = YHNavigationController(rootVC:homeVC)
         let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())

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

@@ -208,6 +208,8 @@ extension YHServiceListViewController : CollectionViewWaterfallLayoutDelegate {
     }
 }
 
+
+//JXSegmentedListContainerViewListDelegate
 extension YHServiceListViewController: JXSegmentedListContainerViewListDelegate {
     func listView() -> UIView {
         return view

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

-//
-//  YHServiceViewController.swift
-//  galaxy
-//
-//  Created by EDY on 2024/4/8.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-import JXSegmentedView
-
-class YHServiceViewController: YHBaseViewController, UIGestureRecognizerDelegate {
-    
-    var defaltIndex: Int = 0
-    
-    let arrItemTitles = ["香港身份","香港生活"]
-    
-    var arrItemVCs : [YHBaseViewController] = []
-    var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48))
-    lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
-        let dataSource = JXSegmentedTitleDataSource()
-        dataSource.isTitleColorGradientEnabled = true
-        dataSource.titles = arrItemTitles
-        
-        dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 15)
-        dataSource.titleNormalColor = .labelTextColor2
-        
-        dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
-        dataSource.titleSelectedColor = .mainTextColor
-        
-        dataSource.isItemSpacingAverageEnabled = false
-        dataSource.itemWidth = JXSegmentedViewAutomaticDimension
-        dataSource.itemSpacing = 90
-        return dataSource
-    }()
-    
-    lazy var navBar: UIView = {
-        let bar = UIView()
-        let backBtn = UIButton()
-        backBtn.setImage(UIImage(named: "back_icon"), for: .normal)
-        backBtn.addTarget(self, action: #selector(didBackBtnClicked), for: .touchUpInside)
-        backBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
-        bar.addSubview(backBtn)
-        backBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(21)
-            make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(16)
-        }
-        return bar
-    }()
-    
-    //分类title 所对应的VC
-    lazy var listContainerView: JXSegmentedListContainerView! = {
-        return JXSegmentedListContainerView(dataSource: self, type: .scrollView)
-    }()
-
-    @objc func didBackBtnClicked() {
-        self.navigationController?.popViewController(animated: true)
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        gk_navBarAlpha = 0
-        gk_navigationBar.isHidden = true
-        view.backgroundColor = .white
-        
-        for i in 0..<arrItemTitles.count {
-            if i == 0 {
-                let vc = YHServiceListViewController()
-                arrItemVCs.append(vc)
-            } else {
-                let vc = YHServerHKLifeViewController()
-                arrItemVCs.append(vc)
-            }
-        }
-        
-        //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
-        segmentedView.dataSource = segmentedDataSource
-        segmentedView.collectionView.backgroundColor = .white
-        view.addSubview(segmentedView)
-
-        segmentedView.listContainer = listContainerView
-        view.addSubview(listContainerView)
-        
-        
-        //分类Title
-        segmentedView.dataSource = segmentedDataSource
-        segmentedView.delegate = self
-        
-        //配置指示器
-        let indicator = JXSegmentedIndicatorLineView()
-        indicator.indicatorWidth = 16
-        indicator.indicatorColor = UIColor.brandMainColor
-        segmentedView.indicators = [indicator]
-        segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
-        
-        view.addSubview(navBar)
-        navBar.snp.makeConstraints { make in
-            make.left.equalToSuperview()
-//            make.top.equalToSuperview().offset(k_Height_statusBar())
-            make.height.equalTo(k_Height_NavContentBar)
-            make.width.equalTo(47)
-            make.centerY.equalTo(segmentedView.snp.centerY)
-        }
-        
-        segmentedView.defaultSelectedIndex = defaltIndex
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-
-        //处于第一个item的时候，才允许屏幕边缘手势返回
-        navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-
-        //离开页面的时候，需要恢复屏幕边缘手势，不能影响其他页面
-        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
-    }
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-
-        segmentedView.frame = CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: view.bounds.size.width, height: 48)
-        listContainerView.frame = CGRect(x: 0, y: k_Height_safeAreaInsetsTop() + 48, width: view.bounds.size.width, height: view.bounds.size.height - 48 - k_Height_safeAreaInsetsTop())
-    }
-}
-
-extension YHServiceViewController: JXSegmentedViewDelegate {
-    func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
-        navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
-    }
-}
-
-extension YHServiceViewController {
-    func jumpToItemIndex(itemIndex : Int) {
-        self.segmentedView.selectItemAt(index: itemIndex)
-    }
-}
-
-extension YHServiceViewController: JXSegmentedListContainerViewDataSource {
-    func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int {
-        if let titleDataSource = segmentedView.dataSource as? JXSegmentedBaseDataSource {
-            return titleDataSource.dataSource.count
-        }
-        return 0
-    }
-
-    func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
-        return arrItemVCs[index] as! JXSegmentedListContainerViewListDelegate
-    }
-}

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/M/YHAppVersionManager.swift

@@ -54,7 +54,7 @@ class YHAppVersionManager {
     func needShowAlertViewOfSuggestVersionUpdate() -> Bool {
         var isShow = false
         if let configModel = YHConfigManager.shared.reqVM.configModel, configModel.suggest_updating == true {
-            if let alertLatestVersion = UserDefaults.standard.object(forKey: kShowAlertOfSuggestLatestVersion) as? String {
+            if let alertLatestVersion = UserDefaults.standard.object(forKey: YhConstant.kShowAlertOfSuggestLatestVersion) as? String {
                 if !configModel.max_version.isEmpty, configModel.max_version != alertLatestVersion  {
                     isShow = true
                 }
@@ -81,7 +81,7 @@ class YHAppVersionManager {
     // 保存显示过的最新建议升级弹窗的app版本
     func saveShowLatestUpdateVersion () {
         if let configModel = YHConfigManager.shared.reqVM.configModel {
-            UserDefaults.standard.set(configModel.max_version, forKey: kShowAlertOfSuggestLatestVersion)
+            UserDefaults.standard.set(configModel.max_version, forKey: YhConstant.kShowAlertOfSuggestLatestVersion)
             UserDefaults.standard.synchronize()
         }
     }

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -162,10 +162,7 @@ func goToMessagePage() {
 }
 
 
-
-
-
-
+// MARK: - 常量定义
 class YhConstant {
     // MARK: - 登录信息
     static let KLoginedInfoKey = "KLoginedInfoKey"
@@ -173,6 +170,9 @@ class YhConstant {
     //登录后的用户信息
     static let kLoginUserInfo = "loginUserInfo"
     
+    
+    static let kShowAlertOfSuggestLatestVersion = "show_alert_suggest_latest_version"
+    
 }
 
 extension YhConstant {