refine: 增加兼容OC协议声明以及实现代替继承

Author: summerHearts

Example/TheRouter.xcodeproj/project.pbxproj

@@ -16,7 +16,6 @@
 		1C839BA02AA6F67A00726596 /* TheRouterControllerA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C839B922AA6F67A00726596 /* TheRouterControllerA.swift */; };
 		1C839BA12AA6F67A00726596 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1C839B932AA6F67A00726596 /* Main.storyboard */; };
 		1C839BA22AA6F67A00726596 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C839B942AA6F67A00726596 /* AppDelegate.swift */; };
-		1C839BA32AA6F67A00726596 /* TheRouterControllerB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C839B962AA6F67A00726596 /* TheRouterControllerB.swift */; };
 		1C839BA42AA6F67A00726596 /* TheRouterBController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C839B972AA6F67A00726596 /* TheRouterBController.m */; };
 		1C839BA52AA6F67A00726596 /* TheRouterControllerD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C839B982AA6F67A00726596 /* TheRouterControllerD.swift */; };
 		1C839BA62AA6F67A00726596 /* TheRouterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C839B992AA6F67A00726596 /* TheRouterController.swift */; };
@@ -54,7 +53,6 @@
 		1C839B932AA6F67A00726596 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		1C839B942AA6F67A00726596 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		1C839B952AA6F67A00726596 /* TheRouterBController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TheRouterBController.h; sourceTree = "<group>"; };
-		1C839B962AA6F67A00726596 /* TheRouterControllerB.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TheRouterControllerB.swift; sourceTree = "<group>"; };
 		1C839B972AA6F67A00726596 /* TheRouterBController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TheRouterBController.m; sourceTree = "<group>"; };
 		1C839B982AA6F67A00726596 /* TheRouterControllerD.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TheRouterControllerD.swift; sourceTree = "<group>"; };
 		1C839B992AA6F67A00726596 /* TheRouterController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TheRouterController.swift; sourceTree = "<group>"; };
@@ -138,7 +136,6 @@
 				1C839B972AA6F67A00726596 /* TheRouterBController.m */,
 				1C839B992AA6F67A00726596 /* TheRouterController.swift */,
 				1C839B922AA6F67A00726596 /* TheRouterControllerA.swift */,
-				1C839B962AA6F67A00726596 /* TheRouterControllerB.swift */,
 				F0750B132B5EA112003FD724 /* LARouterController.swift */,
 				F0750B152B5EA72A003FD724 /* AnyPrifxClassTestController.swift */,
 				1C839B8E2AA6F67A00726596 /* TheRouterControllerC.swift */,
@@ -384,7 +381,6 @@
 				F0750B142B5EA112003FD724 /* LARouterController.swift in Sources */,
 				1C839BA22AA6F67A00726596 /* AppDelegate.swift in Sources */,
 				1C41F0152B0DD793002E2F24 /* TheRouterControllerE.swift in Sources */,
-				1C839BA32AA6F67A00726596 /* TheRouterControllerB.swift in Sources */,
 				1C839BA42AA6F67A00726596 /* TheRouterBController.m in Sources */,
 				1C839B9D2AA6F67A00726596 /* TheRouterApi.swift in Sources */,
 				1C839B9E2AA6F67A00726596 /* TheRouterWebController.swift in Sources */,

Example/TheRouter/AppDelegate.swift

@@ -31,7 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // - excludeCocoapods: 是否对Cocoapods生成的组件进行动态注册
         // - excludeCocoapods = true 不对Cocoapods生成的组件进行动态注册， false 对Cocoapods生成的组件也进行遍历动态注册
         // - useCache: 是否开启本地缓存功能
-        TheRouterManager.loadRouterClass(excludeCocoapods: true, useCache: true)
+        TheRouterManager.loadRouterClass(excludeCocoapods: true, useCache: false)
 
         TheRouter.lazyRegisterRouterHandle { url, userInfo in
             TheRouterManager.injectRouterServiceConfig(webRouterUrl, serivceHost)

Example/TheRouter/TheRouterApi.swift

@@ -36,17 +36,7 @@ public class TheRouterAApi: NSObject, CustomRouterInfo {
 public class TheRouterBApi: NSObject, CustomRouterInfo {
 
     public static var patternString = "scheme://router/demo2"
-    public static var routerClass = "TheRouter_Example.TheRouterControllerB"
-    public var params: [String: Any] { return [:] }
-    public var jumpType: LAJumpType = .push
-    
-    public override init() {}
-}
-
-public class TheRouterBAndroidApi: NSObject, CustomRouterInfo {
-    
-    public static var patternString = "scheme://router/demo2-Android"
-    public static var routerClass = "TheRouter_Example.TheRouterControllerB"
+    public static var routerClass = "TheRouterBController"
     public var params: [String: Any] { return [:] }
     public var jumpType: LAJumpType = .push
 

Example/TheRouter/TheRouterBController.m

@@ -7,8 +7,8 @@
 //
 
 #import "TheRouterBController.h"
-
-@interface TheRouterBController ()
+@import TheRouter;
+@interface TheRouterBController () <TheRouterableProxy>
 
 @end
 
@@ -32,4 +32,19 @@ - (UILabel *)desLabel {
     return _desLabel;
 }
 
+// 实现协议中的类方法
++ (NSArray<NSString *> *)patternString {
+    return @[@"scheme://router/demo2"];
+}
+
++ (NSUInteger)priority {
+    return TheRouterPriorityDefault;
+}
+
++ (id)registerActionWithInfo:(NSDictionary<NSString *, id> *)info {
+    TheRouterBController *vc = [[TheRouterBController alloc] init];
+    vc.desLabel.text = info.description;
+    return vc;
+}
+
 @end

Example/TheRouter/TheRouterControllerB.swift

@@ -135,9 +135,9 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
             let model = TheRouterModel.init(name: "AKyS", age: 18)
             TheRouter.openURL(("scheme://router/demo?id=2&value=3&name=AKyS&desc=通过TheRouterManager.addGloableRouter()传入registerClassPrifxArray参数，将指定遍历工程中具有特性前缀名的class，降低遍历数量级，减少性能损耗", ["model": model, "clouse": clouse]))
         case 5:
-            
-            let model = TheRouterModel.init(name: "AKyS", age: 18)
-            TheRouter.openURL(("scheme://router/demo2?id=2&value=3&name=AKyS&desc=这是一个OC类的界面，实现路由的跳转需要继承OC类，并实现TheRouterAble协议即可", ["model": model]))
+//            let model = TheRouterModel.init(name: "AKyS", age: 18)
+//            TheRouter.openURL(("scheme://router/demo2?id=2&value=3&name=AKyS&desc=这是一个OC类的界面，实现路由的跳转需要继承OC类，并实现TheRouterAble协议即可", ["model": model]))
+            TheRouter.openURL(TheRouterBApi().requiredURL)
         case 6:
 
             let model = TheRouterModel.init(name: "AKyS", age: 18)

Example/TheRouter/ViewController.swift

@@ -351,7 +351,7 @@ TheRouter.removeRouter(TheRouterViewCApi.patternString)
 @property (nonatomic, strong) UILabel *desLabel;
 @end
 
-@interface TheRouterBController ()
+@interface TheRouterBController ()<TheRouterableProxy>
 
 @end
 
@@ -363,25 +363,22 @@ TheRouter.removeRouter(TheRouterViewCApi.patternString)
     [self.view addSubview:self.desLabel];
     // Do any additional setup after loading the view.
 }
-@end
 
-public class TheRouterControllerB: TheRouterBController, TheRouterable {
+// 实现协议中的类方法
++ (NSArray<NSString *> *)patternString {
+    return @[@"scheme://router/demo2"];
+}
 
-    public static var patternString: [String] {
-        ["scheme://router/demo2",
-         "scheme://router/demo2-Android"]
-    }
-    
-    public static var descriptions: String {
-        "TheRouterControllerDemo"
-    }
++ (NSUInteger)priority {
+    return 1;
+}
 
-    public static func registerAction(info: [String : Any]) -> Any {
-        let vc =  TheRouterBController()
-        vc.desLabel.text = info.description
-        return vc
-    }
++ (id)registerActionWithInfo:(NSDictionary<NSString *, id> *)info {
+    TheRouterBController *vc = [[TheRouterBController alloc] init];
+    vc.desLabel.text = info.description;
+    return vc;
 }
+@end
 ```
 
 ### 路由根据版本号缓存能力

README.md

@@ -30,12 +30,17 @@ public extension TheRouter {
     ///   - patternString: register urlstring
     ///   - classString: the class which match the className need inherit the protocol of TheRouterable
     class func addRouterItem(_ patternString: String, priority: uint = 0, classString: String) {
+       
         let clz: AnyClass? = classString.trimmingCharacters(in: CharacterSet.whitespaces).la_matchClass()
         if let routerable = clz as? TheRouterable.Type {
             self.addRouterItem(patternString.trimmingCharacters(in: CharacterSet.whitespaces), priority: priority, handle: routerable.registerAction)
         } else {
-            shareInstance.logcat?(patternString, .logError, "\(classString) register router error， please implementation the TheRouterable Protocol")
-            assert(clz as? TheRouterable.Type != nil, "register router error， please implementation the TheRouterable Protocol")
+            if let currentCls = clz, currentCls.self.conforms(to: TheRouterableProxy.self) {
+                self.addRouterItem(patternString.trimmingCharacters(in: CharacterSet.whitespaces), priority: priority, handle: currentCls.registerAction)
+            } else {
+                shareInstance.logcat?(patternString, .logError, "\(classString) register router error， please implementation the TheRouterable Protocol")
+                assert(clz as? TheRouterable.Type != nil, "register router error， please implementation the TheRouterable Protocol")
+            }
         }
     }
 

TheRouter/Classes/TheRouter+Convenience.swift

@@ -190,14 +190,14 @@ extension TheRouterManager {
 
         for i in 0 ..< resultXLClass.count {
             let currentClass: AnyClass = resultXLClass[i]
+         
             if let cls = currentClass as? TheRouterable.Type {
                 let fullName: String = NSStringFromClass(currentClass.self)
                 if fullName.contains(kSADelegateClassSensorsSuffix)  {
                     break
                 }
 
                 for s in 0 ..< cls.patternString.count {
-                    
                     if fullName.contains(NSKVONotifyingPrefix) {
                         let range = fullName.index(fullName.startIndex, offsetBy: NSKVONotifyingPrefix.count)..<fullName.endIndex
                         let subString = fullName[range]
@@ -206,6 +206,21 @@ extension TheRouterManager {
                         registerRouterList.append([TheRouterPath: cls.patternString[s], TheRouterClassName: fullName, TheRouterPriority: "\(cls.priority)"])
                     }
                 }
+            } else if currentClass.self.conforms(to: TheRouterableProxy.self) {
+                let fullName: String = NSStringFromClass(currentClass.self)
+                if fullName.contains(kSADelegateClassSensorsSuffix)  {
+                    break
+                }
+                
+                for s in 0 ..< currentClass.patternString().count {
+                    if fullName.contains(NSKVONotifyingPrefix) {
+                        let range = fullName.index(fullName.startIndex, offsetBy: NSKVONotifyingPrefix.count)..<fullName.endIndex
+                        let subString = fullName[range]
+                        registerRouterList.append([TheRouterPath: currentClass.patternString()[s], TheRouterClassName: "\(subString)", TheRouterPriority: "\(String(describing: currentClass.priority()))"])
+                    } else {
+                        registerRouterList.append([TheRouterPath: currentClass.patternString()[s], TheRouterClassName: fullName, TheRouterPriority: "\(String(describing: currentClass.priority()))"])
+                    }
+                }
             }
         }
         let endRegisterTime = CFAbsoluteTimeGetCurrent()

TheRouter/Classes/TheRouterManager.swift

@@ -0,0 +1,29 @@
+//
+//  TheRouterableProxy.h
+//  TheRouter
+//
+//  Created by 姚亚杰 on 2024/4/8.
+//
+
+#import <Foundation/Foundation.h>
+
+typedef NS_OPTIONS(NSUInteger, TheRouterPriority) {
+    TheRouterPriorityLow = 1000,
+    TheRouterPriorityDefault = 1001,
+    TheRouterPriorityHeight = 1002
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol TheRouterableProxy <NSObject>
+
+// 使用类方法替代静态属性
++ (NSArray<NSString *> *)patternString;
+
++ (NSUInteger)priority;
+
+// 静态方法可以直接转换为类方法
++ (id)registerActionWithInfo:(NSDictionary<NSString *, id> *)info;
+@end
+
+NS_ASSUME_NONNULL_END