优化代码

Example/GMRouter/GMTableViewController.m

@@ -29,26 +29,39 @@
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-#warning Incomplete implementation, return the number of sections
-    return 10;
+    return 1;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-#warning Incomplete implementation, return the number of rows
-    return 1;
+    return 10;
 }
 
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"cell" forIndexPath:indexPath];
+    if (indexPath.row == 0) {
+        cell.textLabel.text = @"pushScheme";
+    } else if (indexPath.row == 1) {
+        cell.textLabel.text = @"pushScheme:completeBlock";
+    } else if (indexPath.row == 2) {
+        cell.textLabel.text = @"pushScheme: params:routerBlock";
+    } else {
         cell.textLabel.text = [NSString stringWithFormat:@"%点我跳---ld",indexPath.row];
+    }
     return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-   UIViewController *vc = [[GMRouter sharedInstance] pushScheme:@"common" completeBlock:^(NSDictionary * _Nonnull params) {
-        
+    if (indexPath.row == 0) {
+        [[GMRouter sharedInstance] pushScheme:@"common"];
+    } else if (indexPath.row == 1) {
+        [[GMRouter sharedInstance] pushScheme:@"common" completeBlock:NULL];
+    } else if (indexPath.row == 2) {
+        [[GMRouter sharedInstance] pushScheme:@"common" params:@{} completeBlock:^(NSDictionary * _Nonnull params) {
+            NSLog(@"收到回调");
         }];
+    }
+    
 }
 
 

Example/GMRouter/GMViewController.m

@@ -39,8 +39,9 @@
 //        return YES;
 //    }
     
-    if (self.routerBlock) {
-        self.routerBlock(@{@"a":@10});
+    if (self.routerCompleteBlock) {
+//        self.routerBlock(@{@"a":@10});
+        self.routerCompleteBlock(@{@"a":@10});
     }
     return YES;
 }

Example/Podfile.lock

@@ -5,7 +5,7 @@ PODS:
     - GMCache
     - MagicalRecord
     - MJExtension
-  - GMRouter (0.2.4):
+  - GMRouter (0.2.6):
     - GMPhobos
     - MJExtension
   - MagicalRecord (2.3.2):
@@ -33,7 +33,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
   GMPhobos: 981b9c9509945eaa28b4ad6a5376eb78f3fd54b5
-  GMRouter: 1445202be8e6c80d04a9f8c1e38f9ebbec728abf
+  GMRouter: b7411f9fef73aa3e07e769ee9607fae57b616e38
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
   MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed

GMRouter/Classes/GMRouter+gm.h

@@ -8,10 +8,15 @@
 #import "GMRouter.h"
 #import "UIResponder+router.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
+//NS_ASSUME_NONNULL_BEGIN
 extern NSString *const GMRouterProtocolPrefix;
+
 @interface GMRouter (gm)
+/**
+* 初始化Map
+*
+*/
+- (void)initializeRouteMap;
 
 /**
 * 添加的模块例如： Target_common
@@ -30,10 +35,10 @@ extern NSString *const GMRouterProtocolPrefix;
 * 通过协议 跳转到对应的vc
 * @param urlScheme 协议名字
 * 例如gengmei://welfare_special?service_id=5930&is_new_special=0
-* @param routerBlock 需要回调的block
+* @param completeBlock 需要回调的block
 * @return vc的实例
 */
-- (id)pushScheme:(NSString *)urlScheme completeBlock:(GMRouterBlock)routerBlock;
+- (id)pushScheme:(NSString *)urlScheme completeBlock:(GMRouterCompleteBlock)completeBlock;
 
 /**
  * 通过协议 跳转到对应的vc
@@ -41,15 +46,10 @@ extern NSString *const GMRouterProtocolPrefix;
  * 例如gengmei://welfare_special
  * @param params 创建vc初始化要传递的参数
  * {@"service_id": @"5930",@"is_new_special": @0}
+ * @param completeBlock 需要回调的block
  * @return vc的实例
  */
-- (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params routerBlock:(GMRouterBlock)routerBlock;
-
-/**
-* 初始化Map
-*
-*/
-- (void)initializeRouteMap;
+- (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params completeBlock:(GMRouterCompleteBlock)completeBlock;
 @end
 
-NS_ASSUME_NONNULL_END
+//NS_ASSUME_NONNULL_END

GMRouter/Classes/GMRouter+gm.m

@@ -15,9 +15,6 @@
 #pragma clang diagnostic ignored "-Wundeclared-selector"
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
 
-NSString *const GMRouterActionPrefix = @"Action_";
-NSString *const GMRouterActionSuffix = @":";
-NSString *const GMRouterTargetPrefix = @"Target_";
 NSString *const GMRouterProtocolPrefix = @"gengmei://";
 /**
  增加一个模块, 需要在路由做映射,
@@ -37,22 +34,21 @@ static NSMutableDictionary *routeMap = nil;
     self.targets = [NSMutableArray arrayWithObjects:GMRouterTargetAI, GMRouterTargetBanking, GMRouterTargetCommunity, GMRouterTargetWeb, nil];
 }
 
-
+#pragma mark - 跳转协议方法
 - (id)pushScheme:(NSString *)urlScheme {
     return [self pushScheme:urlScheme completeBlock:NULL];
 }
 
-- (id)pushScheme:(NSString *)urlScheme completeBlock:(GMRouterBlock)routerBlock {
+- (id)pushScheme:(NSString *)urlScheme completeBlock:(GMRouterCompleteBlock)completeBlock {
+    return [self pushScheme:urlScheme params:@{} completeBlock:completeBlock];
+}
+
+- (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params completeBlock:(GMRouterCompleteBlock)completeBlock {
     if (![urlScheme hasPrefix:GMRouterProtocolPrefix]) {
         urlScheme = [NSString stringWithFormat:@"%@%@", GMRouterProtocolPrefix ,urlScheme];
     }
     if (!urlScheme.length) { return nil; }
-    NSString *encodeUrlScheme = [self URLEncodeString:urlScheme];
-    NSDictionary *params = [self getParams:encodeUrlScheme];
-    return [self pushScheme:encodeUrlScheme params:params completeBlock:routerBlock];
-}
     
-- (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params completeBlock:(GMRouterBlock)routerBlock {
     NSMutableDictionary *allParams = [NSMutableDictionary dictionaryWithDictionary:params];
     NSString *encodeUrlScheme = [self URLEncodeString:urlScheme];
     NSString *host = [self getHost:urlScheme];
@@ -65,16 +61,16 @@ static NSMutableDictionary *routeMap = nil;
     
     //如果是push 过来的 或者需要回调的在此赋值
     if ([vc isKindOfClass:[UIViewController class]]) {
-        UIViewController *VC = (UIViewController *)vc;
         [self vcAutoIsPushWith:vc params:params];
     }
     
     // 赋值回调过程
     if ([vc isKindOfClass:[UIResponder class]]) {
-        UIResponder *VC = (UIResponder *)vc;
-        __weak typeof(self) weakSelf = self;
-        VC.routerBlock = ^(NSDictionary * _Nonnull params) {
-            routerBlock(params);
+        UIResponder *respondeer = (UIResponder *)vc;
+        respondeer.routerCompleteBlock = ^(NSDictionary * _Nonnull params) {
+            if (completeBlock) {
+                completeBlock(params);
+            }
         };
     }
     return vc;

GMRouter/Classes/UIResponder+router.h

@@ -8,10 +8,10 @@
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
-typedef void(^GMRouterBlock)(NSDictionary *params);
-@interface UIResponder (router)
-@property (nonatomic, copy) GMRouterBlock routerBlock;
+typedef void(^GMRouterCompleteBlock)(NSDictionary *params);
 
+@interface UIResponder (router)
+@property (nonatomic, copy) GMRouterCompleteBlock routerCompleteBlock;
 @end
 
 NS_ASSUME_NONNULL_END

GMRouter/Classes/UIResponder+router.m

@@ -9,12 +9,11 @@
 #import <objc/runtime.h>
 
 @implementation UIResponder (router)
-- (GMRouterBlock)routerBlock {
-    return objc_getAssociatedObject(self, @selector(routerBlock));
+- (GMRouterCompleteBlock)routerCompleteBlock {
+    return objc_getAssociatedObject(self, @selector(routerCompleteBlock));
 }
 
-- (void)setRouterBlock:(GMRouterBlock)routerBlock {
-    objc_setAssociatedObject(self, @selector(routerBlock), routerBlock, OBJC_ASSOCIATION_COPY_NONATOMIC);
+- (void)setRouterCompleteBlock:(GMRouterCompleteBlock)routerCompleteBlock {
+    objc_setAssociatedObject(self, @selector(routerCompleteBlock), routerCompleteBlock, OBJC_ASSOCIATION_COPY_NONATOMIC);
 }
-
 @end