Skip to content

G
GMRouter
Commit 574d978a authored by 朱璇's avatar 朱璇
Browse files
Options

参数修改

parent a31b78f7
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
Example/Podfile.lock
View file @ 574d978a
...@@ -45,7 +45,7 @@ PODS: ...@@ -45,7 +45,7 @@ PODS:
- GMPhobos (1.3.5): - GMPhobos (1.3.5):
- GMCache - GMCache
- GMKit - GMKit
- GMRouter (0.1.6): - GMRouter (0.1.7):
- GMPhobos - GMPhobos
- MJExtension - MJExtension
- Masonry (1.1.0) - Masonry (1.1.0)
...@@ -79,7 +79,7 @@ SPEC CHECKSUMS: ...@@ -79,7 +79,7 @@ SPEC CHECKSUMS:
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMKit: 239609b2a4ea4d36d34fc74f08210ad47e260bd3 GMKit: 239609b2a4ea4d36d34fc74f08210ad47e260bd3
GMPhobos: 1e2d68c456b69bf156276d7242877498107474db GMPhobos: 1e2d68c456b69bf156276d7242877498107474db
GMRouter: 82f574c5ef1183b0be1a4adbfbfbc6aee29b917b GMRouter: 1062e20acfce4d850f78ff83f10b1bddb76cbf17
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
SDWebImage: 7edb9c3ea661e77a66661f7f044de8c1b55d1120 SDWebImage: 7edb9c3ea661e77a66661f7f044de8c1b55d1120
...@@ -88,4 +88,4 @@ SPEC CHECKSUMS: ...@@ -88,4 +88,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: ea22114f5446c23313cc25de2cf84ff760e403e0 PODFILE CHECKSUM: ea22114f5446c23313cc25de2cf84ff760e403e0
COCOAPODS: 1.9.1 COCOAPODS: 1.9.3
GMRouter/Classes/GMRouter+gm.m
View file @ 574d978a
...@@ -204,6 +204,7 @@ static NSMutableDictionary *routeMap = nil; ...@@ -204,6 +204,7 @@ static NSMutableDictionary *routeMap = nil;
//-(void) //-(void)
- (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params { - (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params {
NSMutableDictionary *allParams = [NSMutableDictionary dictionaryWithDictionary:params];
NSString *encodeUrlScheme = [self URLEncodeString:urlScheme]; NSString *encodeUrlScheme = [self URLEncodeString:urlScheme];
NSURL *url = [NSURL URLWithString:encodeUrlScheme]; NSURL *url = [NSURL URLWithString:encodeUrlScheme];
if (!url) { if (!url) {
...@@ -212,8 +213,9 @@ static NSMutableDictionary *routeMap = nil; ...@@ -212,8 +213,9 @@ static NSMutableDictionary *routeMap = nil;
NSString *host = url.host; NSString *host = url.host;
NSString *targetName = [routeMap objectForKey:host]; NSString *targetName = [routeMap objectForKey:host];
NSDictionary *paramsDict = [self getParams:encodeUrlScheme withHost:host]; NSDictionary *paramsDict = [self getParams:encodeUrlScheme withHost:host];
[allParams addEntriesFromDictionary:paramsDict];
host = [self getHostWithEncodeUrlScheme:encodeUrlScheme host:host]; 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 #pragma mark - string to dict
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment