commit: update module route

Author: GIKICoder

Example/ModuleRouteExample/AppDelegate.swift

@@ -10,14 +10,23 @@ import ModuleRoute
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
-    
-    private let navigator: MRNavigator = MRNavigator()
+
+    private var navigator: MRNavigator = MRNavigator()
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         setupRoute()
         return true
     }
 
+    private func setupRoute() {
+        
+        navigator.register(module: DetailModule())
+        navigator.register(dependencyFactory: {
+            ServiceA()
+        }, forType: ServiceAInterface.self)
+    }
+
+
     // MARK: UISceneSession Lifecycle
 
     func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
@@ -32,15 +41,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
     }
 
-    private func setupRoute() {
-    
-        navigator.register(routeHandler: AppRouteFacotry())
-        navigator.register(dependencyFactory: {
-            ServiceA()
-        }, forType: ServiceAInterface.self)
-        
-    }
-
-
+   
 }
 

Example/ModuleRouteExample/AppRouteFacotry.swift

@@ -9,11 +9,17 @@ import Foundation
 import ModuleRoute
 import UIKit
 class AppRouteFacotry:RouteFactory {
+    
     var supportedRoutes: [MRRoute.Type] {
-        return []
+        return [
+            DetailRoute.self
+        ]
     }
 
     func destinationModule(for route: MRRoute, from viewController: UIViewController) -> MRModule.Type? {
+        if route is DetailRoute {
+            return  DetailModule.self
+        }
         return nil
     }
 }

Example/ModuleRouteExample/DetailModule.swift

@@ -0,0 +1,33 @@
+//
+//  DetailModule.swift
+//  ModuleRouteExample
+//
+//  Created by GIKI on 2025/2/14.
+//
+
+import Foundation
+import ModuleRoute
+import UIKit
+
+class DetailModule: MRModule {
+
+    var supportedRoutes: [MRRoute.Type] {
+        return [
+            DetailRoute.self
+        ]
+    }
+    
+    
+    public init() {}
+
+    public func handle(route: MRRoute) -> RouteResult {
+        // 根据具体路由做出响应
+        switch route {
+        case is DetailRoute:
+            let detail = DetailViewController()
+            return .viewController(detail)
+        default:
+            return .none
+        }
+    }
+}

Example/ModuleRouteExample/DetailRoute.swift

@@ -0,0 +1,20 @@
+//
+//  DetailRoute.swift
+//  ModuleRouteExample
+//
+//  Created by GIKI on 2025/2/14.
+//
+
+import Foundation
+import ModuleRoute
+
+struct DetailRoute: MRRoute {
+    static var name: String = "detail"
+    
+    public var parameters: [String: Any] = [:]
+    
+    init(parameters: [String: Any]) {
+        self.parameters = parameters
+    }
+
+}

Example/ModuleRouteExample/ServiceA.swift

@@ -6,7 +6,50 @@
 //
 
 import Foundation
+import UIKit
 
-class ServiceA {
+class ServiceA: ServiceAInterface {
 
+    func showAlertWithTap() {
+        // 创建 UIAlertController
+        let alertController = UIAlertController(
+            title: "点击了我了",
+            message: nil,
+            preferredStyle: .alert
+        )
+        
+        // 创建确认按钮
+        let okAction = UIAlertAction(
+            title: "知道了",
+            style: .default,
+            handler: nil
+        )
+        
+        // 添加按钮到 alertController
+        alertController.addAction(okAction)
+        
+        // 获取当前最顶层的 ViewController 并显示 alert
+        if let topViewController = UIApplication.shared.keyWindow?.rootViewController?.topMostViewController() {
+            topViewController.present(alertController, animated: true, completion: nil)
+        }
+    }
+}
+
+// 辅助扩展，用于获取最顶层的 ViewController
+extension UIViewController {
+    func topMostViewController() -> UIViewController {
+        if let presented = presentedViewController {
+            return presented.topMostViewController()
+        }
+        
+        if let navigation = self as? UINavigationController {
+            return navigation.visibleViewController?.topMostViewController() ?? navigation
+        }
+        
+        if let tab = self as? UITabBarController {
+            return tab.selectedViewController?.topMostViewController() ?? tab
+        }
+        
+        return self
+    }
 }

Example/ModuleRouteExample/ServiceAInterface.swift

@@ -7,6 +7,6 @@
 
 import Foundation
 
-protocol  ServiceAInterface {
-    
+public protocol  ServiceAInterface {
+    func showAlertWithTap() 
 }

Example/ModuleRouteExample/ViewController.swift

@@ -6,9 +6,13 @@
 //
 
 import UIKit
+import ModuleRoute
 
 class ViewController: UIViewController {
 
+    @MRInject var navigator: MRNavigator
+    @MRInject var alertService: ServiceAInterface
+    
     // MARK: - Properties
     private var collectionView: UICollectionView!
     private let cellIdentifier = "Cell"
@@ -70,11 +74,17 @@ extension ViewController: UICollectionViewDataSource {
 extension ViewController: UICollectionViewDelegate {
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let item = items[indexPath.item]
+        if indexPath.item == 1 {
+            alertService.showAlertWithTap()
+        } else {
+            navigator.navigate(to: DetailRoute(parameters: [:]), from: self, using: PushPresentation())
+        }
 
-        // 创建详情页面并跳转
-        let detailVC = DetailViewController()
-        detailVC.item = item
-        navigationController?.pushViewController(detailVC, animated: true)
+//
+//        // 创建详情页面并跳转
+//        let detailVC = DetailViewController()
+//        detailVC.item = item
+//        navigationController?.pushViewController(detailVC, animated: true)
     }
 }
 

Sources/ModuleRoute/DependencyContainer.swift

@@ -15,6 +15,8 @@ public protocol DependencyContainer {
 }
 
 public class DefaultDependencyContainer: DependencyContainer {
+    
+    public static let shared = DefaultDependencyContainer()
 
     private var factories = [String: DependencyFactory]()
     private var instances = [String: Any]()
@@ -32,7 +34,6 @@ public class DefaultDependencyContainer: DependencyContainer {
         if let instance = instances[key] as? T {
             return instance
         }
-
         // 使用工厂创建新实例
         if let factory = factories[key] {
             let instance = factory()

Sources/ModuleRoute/MRInject.swift

@@ -8,24 +8,22 @@
 import Foundation
 
 @propertyWrapper
-public class MRInject<T>: Resolvable {
+public class MRInject<T> {
     private var dependency: T?
+
     public var wrappedValue: T {
-        guard let dependency = dependency else {
-            fatalError("Dependency \(T.self) not resolved")
+        get {
+            if dependency == nil {
+                dependency = DefaultDependencyContainer.shared.resolve(T.self)
+                if dependency == nil {
+                    fatalError("Dependency \(T.self) not resolved")
+                }
+            }
+            return dependency!
         }
-        return dependency
     }
 
     public init() {}
-
-    public func resolve(using container: DependencyContainer) {
-        dependency = container.resolve(T.self)
-    }
 }
 
 
-public protocol Resolvable {
-    func resolve(using container: DependencyContainer)
-}
-

Sources/ModuleRoute/MRModule.swift

@@ -7,26 +7,30 @@
 
 import UIKit
 
+// 路由处理结果枚举
+public enum RouteResult {
+    case viewController(UIViewController)  // 返回控制器
+    case handler(() -> Void)              // 执行闭包
+    case service(Any)                     // 返回服务实例
+    case value(Any)                       // 返回值
+    case none                             // 无返回
+}
+
 public protocol MRModule {
-    func build(from route: MRRoute?) -> UIViewController
-    func resolveDependencies(using container: DependencyContainer)
-    func isEnabled(route: MRRoute?) -> Bool
-    func fallbackModule(for route: MRRoute?) -> MRModule.Type?
-    init()
+    
+    var supportedRoutes: [MRRoute.Type] { get }
+    // 处理路由请求
+    func handle(route: MRRoute) -> RouteResult
 }
 
 extension MRModule {
-    
-    public func resolveDependencies(using container: DependencyContainer) {
-        let mirror = Mirror(reflecting: self)
-        for child in mirror.children {
-            if let resolvable = child.value as? Resolvable {
-                resolvable.resolve(using: container)
-            }
+    // 如果路由处理结果为 .viewController，则返回构造的目标控制器，否则返回 nil
+    func build(from route: MRRoute) -> UIViewController? {
+        switch handle(route: route) {
+        case .viewController(let vc):
+            return vc
+        default:
+            return nil
         }
     }
-
-    public func isEnabled(route: MRRoute?) -> Bool { return true }
-    public func fallbackModule(for route: MRRoute?) -> MRModule.Type? { return nil }
 }
-