Merge branch 'jql/push' into 'master'

push

See merge request !4

Example/Podfile.lock

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

GMRouter/Classes/GMRouter+gm.m

@@ -155,9 +155,9 @@ static NSMutableDictionary *routeMap = nil;
     if (vc != nil && ([params.allKeys containsObject:@"ispush"])) {
         // 区分是否是推送，指定页面：日记本详情页、讨论帖、问答详情页、回答详情页
         // 不支持third_webview和common_webview
-        vc.isPush = params[@"ispush"];
-    } else if (vc != nil && [params[@"url"] containsString:@"ispush=1"]) { // 推送的更美协议为conmon_webView的时候 添加ispush埋点参数
-        vc.isPush = @"1";
+        if ([params[@"ispush"] isEqualToString:@"1"]) {
+            [vc setSourceFromPushWithMessageId:params[@"message_id"]];
+        }
     }
 }
 
@@ -172,7 +172,9 @@ static NSMutableDictionary *routeMap = nil;
         while ([value rangeOfString:@"%"].length != 0) {
             value = [self URLDecodedString:value];
         }
-        params = @{@"url":value};
+        NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:[self urlQueryToDictionary:value]];
+        [dict setValue:value forKey:@"url"];
+        params = dict;
     } else {
         params = [self urlQueryToDictionary:encodeUrlScheme];
     }