Commit 4242879f authored by 艾娇平's avatar 艾娇平

添加通用参数

page_view事件的in_time 和out_time不变,
page_view新增两个参数:in_time_millis,out_time_millis

对于埋点通用参数:
nano_time:系统启动后时秒
absolute_time:系统启动后的 CPU 嘀嗒数纳秒。
create_at_millis:标准时间戳
parent fe46540b
...@@ -70,4 +70,4 @@ SPEC CHECKSUMS: ...@@ -70,4 +70,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad
COCOAPODS: 1.8.4 COCOAPODS: 1.9.0
This diff is collapsed.
...@@ -136,12 +136,16 @@ static NSString *sdkVersion = @"110"; ...@@ -136,12 +136,16 @@ static NSString *sdkVersion = @"110";
} }
- (UIViewController *)visibleController { - (UIViewController *)visibleController {
id target = self.getTopController();
if (self.getTopController) {
id target = self.getTopController();
if ([target conformsToProtocol:NSProtocolFromString(@"PhobosCustomVisibleController")]) { if ([target conformsToProtocol:NSProtocolFromString(@"PhobosCustomVisibleController")]) {
target = [target performSelector:@selector(phobosVisibleController)]; target = [target performSelector:@selector(phobosVisibleController)];
}
return target;
} }
return target; return nil;
} }
#pragma mark - notification handler #pragma mark - notification handler
...@@ -354,6 +358,7 @@ static NSString *sdkVersion = @"110"; ...@@ -354,6 +358,7 @@ static NSString *sdkVersion = @"110";
[page initReferrerIdIfNil]; [page initReferrerIdIfNil];
[page initReferrerTabName]; [page initReferrerTabName];
page.inTime = [PhobosUtil currentTime]; page.inTime = [PhobosUtil currentTime];
page.inTimeMillis = [PhobosUtil currentMMTime];
} }
- (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page { - (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page {
...@@ -367,12 +372,18 @@ static NSString *sdkVersion = @"110"; ...@@ -367,12 +372,18 @@ 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.referrerLink ? : @[] forKey:@"referrer_link"]; if ([page.referrerLink isKindOfClass:[NSArray class]] && page.referrerLink.count) {
[dict setObject:page.referrerLink forKey:@"referrer_link"];
} else {
[dict setObject:@[] 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"];
[dict setObject:page.referrerTabName ? : @"" forKey:@"referrer_tab_name"]; [dict setObject:page.referrerTabName ? : @"" forKey:@"referrer_tab_name"];
[dict setObject:page.isPush.intValue ? @(page.isPush.intValue) : @(0) forKey:@"is_push"]; [dict setObject:page.isPush.intValue ? @(page.isPush.intValue) : @(0) forKey:@"is_push"];
[dict setObject:page.inTimeMillis?:@"" forKey:@"in_time_millis"];
[dict setObject:[PhobosUtil currentMMTime] forKey:@"out_time_millis"];
if (page.inTime.length > 0) { if (page.inTime.length > 0) {
// 页面显示时间为空时不记录页面pv事件 // 页面显示时间为空时不记录页面pv事件
...@@ -414,7 +425,11 @@ static NSString *sdkVersion = @"110"; ...@@ -414,7 +425,11 @@ static NSString *sdkVersion = @"110";
NSArray *referrerLink = sharedClient.visibleController.referrerLink; NSArray *referrerLink = sharedClient.visibleController.referrerLink;
if (![eventId isEqualToString:@"page_view"]) { if (![eventId isEqualToString:@"page_view"]) {
NSMutableDictionary *attributesParams = [NSMutableDictionary dictionaryWithDictionary:attributes]; NSMutableDictionary *attributesParams = [NSMutableDictionary dictionaryWithDictionary:attributes];
[attributesParams setValue:referrerLink ? : @[] forKey:@"referrer_link"]; if ([referrerLink isKindOfClass:[NSArray class]] && referrerLink.count) {
[attributesParams setValue:referrerLink forKey:@"referrer_link"];
} else {
[attributesParams setValue:@[] forKey:@"referrer_link"];
}
attributes = attributesParams; attributes = attributesParams;
} }
[self catchNullForEvent:eventId attributes:attributes]; [self catchNullForEvent:eventId attributes:attributes];
...@@ -446,14 +461,16 @@ static NSString *sdkVersion = @"110"; ...@@ -446,14 +461,16 @@ static NSString *sdkVersion = @"110";
if (_signingType == PhobosSigningTypeDebug || _signingType == PhobosSigningTypeRelease) { if (_signingType == PhobosSigningTypeDebug || _signingType == PhobosSigningTypeRelease) {
[dict setObject:@(0) forKey:@"is_release"]; [dict setObject:@(0) forKey:@"is_release"];
} }
NSString *nano_time = [NSString stringWithFormat:@"%lld",[[NSProcessInfo processInfo] systemUptime]];
[dict setObject:eventId forKey:@"type"]; [dict setObject:eventId forKey:@"type"];
[dict setObject:appParams forKey:@"app"]; [dict setObject:appParams forKey:@"app"];
[dict setObject:sdkVersion forKey:@"version"]; [dict setObject:sdkVersion forKey:@"version"];
[dict setObject:deviceParams forKey:@"device"]; [dict setObject:deviceParams forKey:@"device"];
[dict setObject:_userId forKey:@"user_id"]; [dict setObject:_userId forKey:@"user_id"];
[dict setObject:currentTime forKey:@"create_at"]; [dict setObject:currentTime forKey:@"create_at"];// 1584513842 当前时间(秒)
[dict setObject:@([[NSProcessInfo processInfo] systemUptime]) forKey:@"nano_time"]; [dict setObject:nano_time?:@"" forKey:@"nano_time"];// 1657008897 系统启动后时长(秒)
[dict setObject:@(mach_absolute_time()) forKey:@"absolute_time"]; [dict setObject:@(mach_absolute_time()) forKey:@"absolute_time"];// 148237263697318 系统启动后的 CPU 嘀嗒数(纳秒)
[dict setObject:[PhobosUtil currentMMTime] forKey:@"create_at_millis"];// 1584513842753 当前时间戳(毫秒)
[dict setObject:attributes forKey:@"params"]; [dict setObject:attributes forKey:@"params"];
[dict setObject:_sessionId forKey:@"app_session_id"]; [dict setObject:_sessionId forKey:@"app_session_id"];
} }
......
...@@ -42,6 +42,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -42,6 +42,9 @@ NS_ASSUME_NONNULL_BEGIN
*/ */
@property (nonatomic, copy, nonnull) NSString *inTime; @property (nonatomic, copy, nonnull) NSString *inTime;
/// 当前VC.view 显示的时候的时间戳(精确到毫秒)
@property (nonatomic, copy, nonnull) NSString *inTimeMillis;
/** /**
前一个页面的businessId。该属性有可能为空字符串 前一个页面的businessId。该属性有可能为空字符串
*/ */
......
...@@ -426,7 +426,7 @@ ...@@ -426,7 +426,7 @@
} }
/** /**
* 获取手机运行时间,从开机到现在 * 获取手机运行时间,从开机到现在(秒)
*/ */
+ (NSString *)deviceRunTime { + (NSString *)deviceRunTime {
struct timeval boottime; struct timeval boottime;
......
...@@ -152,7 +152,6 @@ ...@@ -152,7 +152,6 @@
objc_setAssociatedObject(self, @selector(inTime), inTime, OBJC_ASSOCIATION_COPY); objc_setAssociatedObject(self, @selector(inTime), inTime, OBJC_ASSOCIATION_COPY);
} }
/** /**
这个地方inTime的值为nil的情况不做考虑,因为Phobos不会发送。inTime必须在controller viewWillAppear时赋值 这个地方inTime的值为nil的情况不做考虑,因为Phobos不会发送。inTime必须在controller viewWillAppear时赋值
*/ */
...@@ -161,6 +160,15 @@ ...@@ -161,6 +160,15 @@
return inTime; return inTime;
} }
- (void)setInTimeMillis:(NSString *)inTimeMillis {
objc_setAssociatedObject(self, @selector(inTimeMillis), inTimeMillis, OBJC_ASSOCIATION_COPY);
}
- (NSString *)inTimeMillis {
NSString *inTimeMillis = objc_getAssociatedObject(self, @selector(inTimeMillis));
return inTimeMillis;
}
- (void)initReferrerIdIfNil { - (void)initReferrerIdIfNil {
// 只有不为空,且是controller的情况下才自动获取 // 只有不为空,且是controller的情况下才自动获取
if ([self.referrerId isEqualToString:@""] && [self isKindOfClass:[UIViewController class]]) { if ([self.referrerId isEqualToString:@""] && [self isKindOfClass:[UIViewController class]]) {
......
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