Commit 1b3e234c authored by 刘鹿杰's avatar 刘鹿杰

修改referrer_link 参数

parent a68c9258
...@@ -366,7 +366,7 @@ static NSString *sdkVersion = @"110"; ...@@ -366,7 +366,7 @@ static NSString *sdkVersion = @"110";
[dict setObject:page.pageName forKey:@"page_name"]; [dict setObject:page.pageName forKey:@"page_name"];
[dict setObject:page.businessId?:@"" forKey:@"business_id"]; [dict setObject:page.businessId?:@"" forKey:@"business_id"];
[dict setObject:page.referer?:@"" forKey:@"referrer"]; [dict setObject:page.referer?:@"" forKey:@"referrer"];
[dict setObject:page.refererLink ? : @[] forKey:@"referer_link"]; [dict setObject:page.referrerLink ? : @[] forKey:@"referrer_link"];
[dict setObject:@(0) forKey:@"fake"]; [dict setObject:@(0) forKey:@"fake"];
[dict setObject:page.referrerId ? : @"" forKey:@"referrer_id"]; [dict setObject:page.referrerId ? : @"" forKey:@"referrer_id"];
[dict setObject:page.extraParam ? : @"" forKey:@"extra_param"]; [dict setObject:page.extraParam ? : @"" forKey:@"extra_param"];
...@@ -410,10 +410,12 @@ static NSString *sdkVersion = @"110"; ...@@ -410,10 +410,12 @@ static NSString *sdkVersion = @"110";
* @since 0.0.1 * @since 0.0.1
*/ */
- (NSDictionary *)prepareDictionaryForEvent:(NSString *)eventId attributes:(NSDictionary *)attributes{ - (NSDictionary *)prepareDictionaryForEvent:(NSString *)eventId attributes:(NSDictionary *)attributes{
NSArray *refererLink = sharedClient.visibleController.refererLink; NSArray *referrerLink = sharedClient.visibleController.referrerLink;
NSMutableDictionary *attributesParams = [NSMutableDictionary dictionaryWithDictionary:attributes]; if (![eventId isEqualToString:@"page_view"]) {
[attributesParams setValue:refererLink ? : @[] forKey:@"referer_Link"]; NSMutableDictionary *attributesParams = [NSMutableDictionary dictionaryWithDictionary:attributes];
attributes = attributesParams; [attributesParams setValue:referrerLink ? : @[] forKey:@"referrer_Link"];
attributes = attributesParams;
}
[self catchNullForEvent:eventId attributes:attributes]; [self catchNullForEvent:eventId attributes:attributes];
NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
@try { @try {
......
...@@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
/** /**
获取上一个页面链路的page_name link by 7.20.0 如果有此页面有page_name则添加 , 没有添加"" 获取上一个页面链路的page_name link by 7.20.0 如果有此页面有page_name则添加 , 没有添加""
*/ */
@property (nonatomic, copy) NSArray *refererLink; @property (nonatomic, copy) NSArray *referrerLink;
@end @end
......
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
// 所以此处要判断,如果是navigation弹出,最后还是要定位到topViewController // 所以此处要判断,如果是navigation弹出,最后还是要定位到topViewController
if ([me.presentingViewController isKindOfClass:[UINavigationController class]]) { if ([me.presentingViewController isKindOfClass:[UINavigationController class]]) {
UIViewController *top = ((UINavigationController *)me.presentingViewController).topViewController; UIViewController *top = ((UINavigationController *)me.presentingViewController).topViewController;
NSMutableArray *tempRefererLink = [NSMutableArray arrayWithArray:top.refererLink]; NSMutableArray *tempReferrerLink = [NSMutableArray arrayWithArray:top.referrerLink];
[tempRefererLink addObject:top.pageName]; [tempReferrerLink addObject:top.pageName];
objc_setAssociatedObject(self, @selector(pageLink), tempRefererLink, OBJC_ASSOCIATION_COPY); objc_setAssociatedObject(self, @selector(referrerLink), tempReferrerLink, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} else { } else {
NSMutableArray *tempRefererLink = [NSMutableArray arrayWithArray:me.presentingViewController.refererLink]; NSMutableArray *tempRefererLink = [NSMutableArray arrayWithArray:me.presentingViewController.referrerLink];
[tempRefererLink addObject:me.presentingViewController.pageName]; [tempRefererLink addObject:me.presentingViewController.pageName];
objc_setAssociatedObject(self, @selector(pageLink), tempRefererLink, OBJC_ASSOCIATION_COPY); objc_setAssociatedObject(self, @selector(referrerLink), tempRefererLink, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} }
} else { } else {
NSArray *navigationPool = ((UIViewController *)self).navigationController.viewControllers; NSArray *navigationPool = ((UIViewController *)self).navigationController.viewControllers;
...@@ -70,20 +70,21 @@ ...@@ -70,20 +70,21 @@
return ; return ;
} }
UIViewController *controller = navigationPool[refererIndex]; UIViewController *controller = navigationPool[refererIndex];
NSMutableArray *tempRefererLink = [NSMutableArray arrayWithArray:controller.refererLink]; NSMutableArray *tempReferrerLink = [NSMutableArray arrayWithArray:controller.referrerLink];
[tempRefererLink addObject:controller.pageName]; [tempReferrerLink addObject:controller.pageName];
objc_setAssociatedObject(self, @selector(refererLink), tempRefererLink, OBJC_ASSOCIATION_COPY); objc_setAssociatedObject(self, @selector(referrerLink), tempReferrerLink, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} }
} }
} }
- (void)setRefererLink:(NSArray *)refererLink { - (void)setReferrerLink:(NSArray *)referrerLink {
objc_setAssociatedObject(self, @selector(refererLink), refererLink, OBJC_ASSOCIATION_COPY); objc_setAssociatedObject(self, @selector(referrerLink), referrerLink, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} }
-(NSArray *)refererLink {
NSArray *refererLink = objc_getAssociatedObject(self, @selector(refererLink)); -(NSArray *)referrerLink {
return refererLink; NSArray *referrerLink = objc_getAssociatedObject(self, @selector(referrerLink));
return referrerLink;
} }
/** /**
......
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