modification

CandyDeng · Apr 24, 2018 · 06b5093 · 06b5093
1 parent c28ece4
commit 06b5093
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/CTMediator.podspec b/CTMediator.podspec
@@ -134,6 +134,6 @@ Pod::Spec.new do |s|
 
   # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
   # s.dependency "JSONKit", "~> 1.4"
-  s.dependency "CTHandyCategories"
+  # s.dependency "CTHandyCategories"
 
 end
diff --git a/CTMediator.xcodeproj/project.pbxproj b/CTMediator.xcodeproj/project.pbxproj
@@ -257,7 +257,7 @@
 		4A5CE4F21C9531C9006AEDB9 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = casa;
 				TargetAttributes = {
 					4A5CE4F91C9531C9006AEDB9 = {
@@ -409,14 +409,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -455,14 +463,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -575,6 +591,7 @@
 				4AC1765E1DE163B600566741 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

diff --git a/CTMediator.xcodeproj/xcuserdata/casa.xcuserdatad/xcschemes/CTMediator.xcscheme b/CTMediator.xcodeproj/xcuserdata/casa.xcuserdatad/xcschemes/CTMediator.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/CTMediator/CTMediator/CTMediator.m b/CTMediator/CTMediator/CTMediator.m
@@ -8,7 +8,6 @@
 
 #import "CTMediator.h"
 #import <objc/runtime.h>
-#import <CTHandyCategories/NSObject+CTAlert.h>
 
 @interface CTMediator ()
 
@@ -81,7 +80,7 @@ - (id)performTarget:(NSString *)targetName action:(NSString *)actionName params:
 
     if (target == nil) {
         // 这里是处理无响应请求的地方之一，这个demo做得比较简单，如果没有可以响应的target，就直接return了。实际开发过程中是可以事先给一个固定的target专门用于在这个时候顶上，然后处理这种请求的
-        [self NoTargetActionResponseWithTargetString:targetClassString selectorString:actionString];
+        [self NoTargetActionResponseWithTargetString:targetClassString selectorString:actionString originParams:params];
         return nil;
     }
 
@@ -104,7 +103,7 @@ - (id)performTarget:(NSString *)targetName action:(NSString *)actionName params:
                 return [self safePerformAction:action target:target params:params];
             } else {
                 // 这里也是处理无响应请求的地方，在notFound都没有的时候，这个demo是直接return了。实际开发过程中，可以用前面提到的固定的target顶上的。
-                [self NoTargetActionResponseWithTargetString:targetClassString selectorString:actionString];
+                [self NoTargetActionResponseWithTargetString:targetClassString selectorString:actionString originParams:params];
                 [self.cachedTarget removeObjectForKey:targetClassString];
                 return nil;
             }
@@ -119,14 +118,17 @@ - (void)releaseCachedTargetWithTargetName:(NSString *)targetName
 }
 
 #pragma mark - private methods
-- (void)NoTargetActionResponseWithTargetString:(NSString *)targetString selectorString:(NSString *)selectorString
+- (void)NoTargetActionResponseWithTargetString:(NSString *)targetString selectorString:(NSString *)selectorString originParams:(NSDictionary *)originParams
 {
-#ifdef DEBUG
-    [self ct_showAlertWithTitle:@""
-                        message:[NSString stringWithFormat:@"can not find \n %@-%@", targetString, selectorString] actionTitleList:@[@"OK"]
-                        handler:nil
-                     completion:nil];
-#endif
+    SEL action = NSSelectorFromString(@"Action_response:");
+    NSObject *target = [[NSClassFromString(@"Target_NoTargetAction") alloc] init];
+
+    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+    params[@"originParams"] = originParams;
+    params[@"targetString"] = targetString;
+    params[@"selectorString"] = selectorString;
+
+    [self safePerformAction:action target:target params:params];
 }
 
 - (id)safePerformAction:(SEL)action target:(NSObject *)target params:(NSDictionary *)params

diff --git a/Podfile b/Podfile
@@ -6,7 +6,7 @@
 target 'CTMediator' do
 
 pod "HandyFrame"
-pod "CTHandyCategories"
+# pod "CTHandyCategories"
 
 end