0.0.3

CandyDeng · Jan 4, 2017 · 60b2d34 · 60b2d34
1 parent dc98c7e
commit 60b2d34
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/CTMediator.podspec b/CTMediator.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "CTMediator"
-  s.version      = "0.0.2"
+  s.version      = "0.0.3"
   s.summary      = "CTMediator."
 
   # This description is used to generate tags and improve search results.

diff --git a/CTMediator/CTMediator/CTMediator.m b/CTMediator/CTMediator/CTMediator.m
@@ -7,6 +7,7 @@
 //
 
 #import "CTMediator.h"
+#import <objc/runtime.h>
 
 @interface CTMediator ()
 
@@ -67,10 +68,11 @@ - (id)performTarget:(NSString *)targetName action:(NSString *)actionName params:
 
     NSString *targetClassString = [NSString stringWithFormat:@"Target_%@", targetName];
     NSString *actionString = [NSString stringWithFormat:@"Action_%@:", actionName];
+    Class targetClass;
 
-    id target = self.cachedTarget[targetClassString];
+    NSObject *target = self.cachedTarget[targetClassString];
     if (target == nil) {
-        Class targetClass = NSClassFromString(targetClassString);
+        targetClass = NSClassFromString(targetClassString);
         target = [[targetClass alloc] init];
     }
 
@@ -84,24 +86,34 @@ - (id)performTarget:(NSString *)targetName action:(NSString *)actionName params:
     if (shouldCacheTarget) {
         self.cachedTarget[targetClassString] = target;
     }
-    
+
     if ([target respondsToSelector:action]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
         return [target performSelector:action withObject:params];
 #pragma clang diagnostic pop
     } else {
-        // 这里是处理无响应请求的地方，如果无响应，则尝试调用对应target的notFound方法统一处理
-        SEL action = NSSelectorFromString(@"notFound:");
+        // 有可能target是Swift对象
+        actionString = [NSString stringWithFormat:@"Action_%@WithParams:", actionName];
+        action = NSSelectorFromString(actionString);
         if ([target respondsToSelector:action]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
             return [target performSelector:action withObject:params];
 #pragma clang diagnostic pop
         } else {
-            // 这里也是处理无响应请求的地方，在notFound都没有的时候，这个demo是直接return了。实际开发过程中，可以用前面提到的固定的target顶上的。
-            [self.cachedTarget removeObjectForKey:targetClassString];
-            return nil;
+            // 这里是处理无响应请求的地方，如果无响应，则尝试调用对应target的notFound方法统一处理
+            SEL action = NSSelectorFromString(@"notFound:");
+            if ([target respondsToSelector:action]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+                return [target performSelector:action withObject:params];
+#pragma clang diagnostic pop
+            } else {
+                // 这里也是处理无响应请求的地方，在notFound都没有的时候，这个demo是直接return了。实际开发过程中，可以用前面提到的固定的target顶上的。
+                [self.cachedTarget removeObjectForKey:targetClassString];
+                return nil;
+            }
         }
     }
 }