Merge branch 'zx/gmRouter' into 'master'

参数修改

See merge request !5

Example/Podfile.lock

@@ -45,7 +45,7 @@ PODS:
   - GMPhobos (1.3.5):
     - GMCache
     - GMKit
-  - GMRouter (0.1.6):
+  - GMRouter (0.1.7):
     - GMPhobos
     - MJExtension
   - Masonry (1.1.0)
@@ -79,7 +79,7 @@ SPEC CHECKSUMS:
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
   GMKit: 239609b2a4ea4d36d34fc74f08210ad47e260bd3
   GMPhobos: 1e2d68c456b69bf156276d7242877498107474db
-  GMRouter: 82f574c5ef1183b0be1a4adbfbfbc6aee29b917b
+  GMRouter: 1062e20acfce4d850f78ff83f10b1bddb76cbf17
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
   SDWebImage: 7edb9c3ea661e77a66661f7f044de8c1b55d1120
@@ -88,4 +88,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ea22114f5446c23313cc25de2cf84ff760e403e0
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

GMRouter/Classes/GMRouter+gm.m

@@ -204,6 +204,7 @@ static NSMutableDictionary *routeMap = nil;
 //-(void)
 
 - (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params {
+    NSMutableDictionary *allParams = [NSMutableDictionary dictionaryWithDictionary:params];
     NSString *encodeUrlScheme = [self URLEncodeString:urlScheme];
     NSURL *url = [NSURL URLWithString:encodeUrlScheme];
     if (!url) {
@@ -212,8 +213,9 @@ static NSMutableDictionary *routeMap = nil;
     NSString *host = url.host;
     NSString *targetName = [routeMap objectForKey:host];
     NSDictionary *paramsDict = [self getParams:encodeUrlScheme withHost:host];
+    [allParams addEntriesFromDictionary:paramsDict];
     host = [self getHostWithEncodeUrlScheme:encodeUrlScheme host:host];
-    return [self performTarget:targetName action:host params:paramsDict shouldCacheTarget:NO];
+    return [self performTarget:targetName action:host params:allParams shouldCacheTarget:NO];
 }
 
 #pragma mark - string to dict