Merge branch 'master' of git.wanmeizhensuo.com:gengmeiios/GMPhobos

GMPhobos/Classes/Phobos.m

@@ -352,7 +352,7 @@ static NSString *sdkVersion = @"110";
         [dict setObject:page.referrerId ? : @"" forKey:@"referrer_id"];
         [dict setObject:page.extraParam ? : @"" forKey:@"extra_param"];
         [dict setObject:page.referrerTabName ? : @"" forKey:@"referrer_tab_name"];
-        [dict setObject:@(page.isPush) forKey:@"is_push"];
+        [dict setObject:page.isPush?:@"" forKey:@"is_push"];
         if (page.inTime.length > 0) {
             // 页面显示时间为空时不记录页面pv事件
             [Phobos track:@"page_view" attributes:dict];

GMPhobos/Classes/PhobosPVProtocol.h

@@ -73,6 +73,6 @@
  1: 是推送页面跳转
  0: 普通页面跳转
  */
-@property (nonatomic, assign) BOOL isPush;
+@property (nonatomic, copy) NSString *isPush;
 
 @end

GMPhobos/Classes/UIResponder+PhobosPV.m

@@ -181,13 +181,13 @@
     return referrerTabName == nil ? @"" : referrerTabName;
 }
 
-- (BOOL)isPush {
-    NSNumber *isPush = objc_getAssociatedObject(self, @selector(isPush));
-    return isPush == nil ? NO : isPush.boolValue;
+- (void)setIsPush:(NSString *)isPush {
+    objc_setAssociatedObject(self, @selector(isPush), isPush, OBJC_ASSOCIATION_COPY);
 }
 
-- (void)setIsPush:(BOOL)isPush {
-    objc_setAssociatedObject(self, @selector(isPush), @(isPush), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+- (NSString *)isPush {
+    NSString *isPush = objc_getAssociatedObject(self, @selector(isPush));
+    return isPush == nil ? @"" : isPush;
 }
 
 @end