Merge pull request #12 from shiweifu/master

修复了router block 传参无效的问题
lightory · Apr 29, 2015 · db4cc63 · db4cc63
2 parents dd982d2 + 0d24c57
commit db4cc63
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/HHRouter/HHRouter.m b/HHRouter/HHRouter.m
@@ -72,15 +72,16 @@ - (HHRouterBlock)matchBlock:(NSString*)route
 {
     NSDictionary* params = [self paramsInRoute:route];
     HHRouterBlock routerBlock = [params[@"block"] copy];
-    HHRouterBlock returnBlock = ^id(NSDictionary* aParams)
-    {
+    HHRouterBlock returnBlock = ^id(NSDictionary* aParams) {
         if (routerBlock) {
-            return routerBlock([params copy]);
-        }
-        return nil;
-    };
+            NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:params];
+            [dic addEntriesFromDictionary:aParams];
+            return routerBlock([NSDictionary dictionaryWithDictionary:dic].copy);
+    }
+    return nil;
+  };
 
-    return [returnBlock copy];
+  return [returnBlock copy];
 }
 
 - (id)callBlock:(NSString*)route
@@ -247,4 +248,3 @@ - (NSDictionary*)params
 }
 
 @end
-