modification

v5xiaopeng · Aug 23, 2018 · d08b617 · d08b617
1 parent 11187cf
commit d08b617
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/CTMediator/CTMediator/CTMediator.h b/CTMediator/CTMediator/CTMediator.h
@@ -8,6 +8,8 @@
 
 #import <UIKit/UIKit.h>
 
+extern NSString * const kCTMediatorParamsKeySwiftTargetModuleName;
+
 @interface CTMediator : NSObject
 
 + (instancetype)sharedInstance;

diff --git a/CTMediator/CTMediator/CTMediator.m b/CTMediator/CTMediator/CTMediator.m
@@ -9,6 +9,8 @@
 #import "CTMediator.h"
 #import <objc/runtime.h>
 
+NSString * const kCTMediatorParamsKeySwiftTargetModuleName = @"kCTMediatorParamsKeySwiftTargetModuleName";
+
 @interface CTMediator ()
 
 @property (nonatomic, strong) NSMutableDictionary *cachedTarget;
@@ -65,17 +67,23 @@ - (id)performActionWithUrl:(NSURL *)url completion:(void (^)(NSDictionary *))com
 
 - (id)performTarget:(NSString *)targetName action:(NSString *)actionName params:(NSDictionary *)params shouldCacheTarget:(BOOL)shouldCacheTarget
 {
+    NSString *swiftModuleName = params[kCTMediatorParamsKeySwiftTargetModuleName];
 
-    NSString *targetClassString = [NSString stringWithFormat:@"Target_%@", targetName];
-    NSString *actionString = [NSString stringWithFormat:@"Action_%@:", actionName];
-    Class targetClass;
-
+    // generate target
+    NSString *targetClassString = nil;
+    if (swiftModuleName.length > 0) {
+        targetClassString = [NSString stringWithFormat:@"%@.Target_%@", swiftModuleName, targetName];
+    } else {
+        targetClassString = [NSString stringWithFormat:@"Target_%@", targetName];
+    }
     NSObject *target = self.cachedTarget[targetClassString];
     if (target == nil) {
-        targetClass = NSClassFromString(targetClassString);
+        Class targetClass = NSClassFromString(targetClassString);
         target = [[targetClass alloc] init];
     }
-
+
+    // generate action
+    NSString *actionString = [NSString stringWithFormat:@"Action_%@:", actionName];
     SEL action = NSSelectorFromString(actionString);
 
     if (target == nil) {
@@ -91,22 +99,15 @@ - (id)performTarget:(NSString *)targetName action:(NSString *)actionName params:
     if ([target respondsToSelector:action]) {
         return [self safePerformAction:action target:target params:params];
     } else {
-        // 有可能target是Swift对象
-        actionString = [NSString stringWithFormat:@"Action_%@WithParams:", actionName];
-        action = NSSelectorFromString(actionString);
+        // 这里是处理无响应请求的地方，如果无响应，则尝试调用对应target的notFound方法统一处理
+        SEL action = NSSelectorFromString(@"notFound:");
         if ([target respondsToSelector:action]) {
             return [self safePerformAction:action target:target params:params];
         } else {
-            // 这里是处理无响应请求的地方，如果无响应，则尝试调用对应target的notFound方法统一处理
-            SEL action = NSSelectorFromString(@"notFound:");
-            if ([target respondsToSelector:action]) {
-                return [self safePerformAction:action target:target params:params];
-            } else {
-                // 这里也是处理无响应请求的地方，在notFound都没有的时候，这个demo是直接return了。实际开发过程中，可以用前面提到的固定的target顶上的。
-                [self NoTargetActionResponseWithTargetString:targetClassString selectorString:actionString originParams:params];
-                [self.cachedTarget removeObjectForKey:targetClassString];
-                return nil;
-            }
+            // 这里也是处理无响应请求的地方，在notFound都没有的时候，这个demo是直接return了。实际开发过程中，可以用前面提到的固定的target顶上的。
+            [self NoTargetActionResponseWithTargetString:targetClassString selectorString:actionString originParams:params];
+            [self.cachedTarget removeObjectForKey:targetClassString];
+            return nil;
         }
     }
 }