Commit 5df94f14 authored by jz's avatar jz

update

parent d0f9b778
......@@ -5,7 +5,7 @@ PODS:
- GMCache
- MagicalRecord
- MJExtension
- GMRouter (0.3.0):
- GMRouter (0.3.1):
- GMPhobos
- MJExtension
- MagicalRecord (2.3.2):
......@@ -33,7 +33,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMPhobos: 981b9c9509945eaa28b4ad6a5376eb78f3fd54b5
GMRouter: dde008e5b3b65e03671e7e71f89a34e6ef548abe
GMRouter: ab239a8daefb5e64e6d9eb6e84045058db17b239
MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
......
......@@ -40,7 +40,7 @@ static NSMutableDictionary *routeMap = nil;
}
- (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params {
return [self pushScheme:urlScheme params:params completeBlock:NULL];
return [self pushScheme:urlScheme params:params completeBlock:NULL];
}
- (id)pushScheme:(NSString *)urlScheme completeBlock:(GMRouterCompleteBlock)completeBlock {
......@@ -49,7 +49,7 @@ static NSMutableDictionary *routeMap = nil;
- (id)pushScheme:(NSString *)urlScheme params:(NSDictionary *)params completeBlock:(GMRouterCompleteBlock)completeBlock {
if (!urlScheme.length) { return nil; }
if (![urlScheme hasPrefix:GMRouterProtocolPrefix]) {
urlScheme = [NSString stringWithFormat:@"%@%@", GMRouterProtocolPrefix ,urlScheme];
}
......@@ -66,7 +66,8 @@ static NSMutableDictionary *routeMap = nil;
//如果是push 过来的 或者需要回调的在此赋值
if ([vc isKindOfClass:[UIViewController class]]) {
[self vcAutoIsPushWith:vc params:params];
//这个地方很重要改动时 一定要自测
[self vcAutoIsPushWith:vc params:allParams];
}
// 赋值回调过程
......
......@@ -30,7 +30,6 @@ NSString * const GMRouterParamsKeySwiftTargetModuleName = @"GMRouterParamsKeySwi
/*
scheme://[target]/[action]?[params]
url sample:
aaa://targetA/actionB?id=1234
*/
......
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