lujiuyin/suixinkan_ios_uikit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate CYLTabBar center scan button and unify UIKit navigation.

Browse Source 
Add CYLTabBarController with a global scan entry, promote MainTabBarController to the window root after login, replace RouterPath-based navigation with AppNavigator, and fix Profile diffable cell reconfiguration crashes.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
汉秋
2026-06-26 16:36:18 +08:00
parent 24a7339b68
commit a1c031c9b7
31 changed files with 838 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
suixinkan_ios/App/Navigation/TabNavigationController.swift
View File

@ -6,25 +6,19 @@
import UIKit
@MainActor
/// 单个 Tab 的导航栈，与 `AppRouter` 路径同步并在 push 时隐藏底部 TabBar。
final class TabNavigationController: UINavigationController, UINavigationControllerDelegate {
/// 单个 Tab 的 UIKit 导航栈，负责承载该 Tab 内部页面层级。
final class TabNavigationController: UINavigationController {
let appTab: AppTab
private let services: AppServices
private var isSyncingStack = false
/// 初始化实例。
init(tab: AppTab, services: AppServices) {
self.appTab = tab
self.services = services
super.init(nibName: nil, bundle: nil)
delegate = self
navigationBar.prefersLargeTitles = false
setViewControllers([tab.makeRootViewController(services: services)], animated: false)
registerNavigationBridge()
services.appRouter.router(for: appTab).onChange = { [weak self] in
self?.syncFromRouterPath()
}
}
@available(*, unavailable)
@ -32,76 +26,10 @@ final class TabNavigationController: UINavigationController, UINavigationControl
fatalError("init(coder:) has not been implemented")
}
/// Push 指定应用路由，并同步写入 RouterPath。
func pushRoute(_ route: AppRoute, animated: Bool = true) {
/// Push 指定应用路由，并统一设置底部 TabBar 隐藏策略。
func push(route: AppRoute, animated: Bool = true) {
let viewController = AppRouteViewControllerFactory.makeViewController(for: route, services: services)
viewController.hidesBottomBarWhenPushed = route.hidesTabBarWhenPushed
isSyncingStack = true
services.appRouter.router(for: appTab).navigate(to: route)
isSyncingStack = false
pushViewController(viewController, animated: animated)
}
/// navigationController相关逻辑。
func navigationController(
_ navigationController: UINavigationController,
didShow viewController: UIViewController,
animated: Bool
) {
syncRouterPathFromStack()
}
/// 注册NavigationBridge。
private func registerNavigationBridge() {
switch appTab {
case .home:
UIKitAppNavigation.homeNavigationController = self
case .profile:
UIKitAppNavigation.profileNavigationController = self
default:
break
}
}
/// 同步FromRouterPath状态。
private func syncFromRouterPath() {
guard !isSyncingStack else { return }
let routerPath = services.appRouter.router(for: appTab)
let targetDepth = routerPath.path.count
let currentDepth = max(viewControllers.count - 1, 0)
if targetDepth > currentDepth {
// Router 路径变深：按路径依次 push 缺失页面
for index in currentDepth..<targetDepth {
let route = routerPath.path[index]
let viewController = AppRouteViewControllerFactory.makeViewController(for: route, services: services)
viewController.hidesBottomBarWhenPushed = route.hidesTabBarWhenPushed
pushViewController(viewController, animated: true)
}
return
}
if targetDepth < currentDepth {
// Router 路径变浅：pop 至目标深度
if targetDepth == 0 {
popToRootViewController(animated: true)
} else if targetDepth < viewControllers.count {
popToViewController(viewControllers[targetDepth], animated: true)
}
}
}
/// 同步RouterPathFromStack状态。
private func syncRouterPathFromStack() {
guard !isSyncingStack else { return }
let routerPath = services.appRouter.router(for: appTab)
let depth = max(viewControllers.count - 1, 0)
if depth < routerPath.path.count {
isSyncingStack = true
routerPath.path = Array(routerPath.path.prefix(depth))
isSyncingStack = false
}
}
}