ios / yh_analytics · Commits

Go to a project

Authored by ZhangTonghai
Commit 06c66ad02459ccb09ec30ec280143b5e9eefce4e 1 parent 9213104c

【update】兼容AFNetworking 4.0.0

Inline Side-by-side
Showing 2 changed files with 46 additions and 46 deletions
Pod::Spec.new do |s|
s.name = "YH_Analytics"
s.version = "1.1.0"
s.version = "1.2.0"
s.summary = "Analytics Kit"
s.description = <<-DESC
Analytics Kit
... ... @@ -12,9 +12,9 @@ Pod::Spec.new do |s|
:branch => 'mars',
:tag => s.version.to_s }
s.platform = :ios, '8.0'
s.platform = :ios, '10.0'
s.requires_arc = true
s.dependency 'AFNetworking'
s.dependency 'AFNetworking', '~> 4.0.0'
s.source_files = 'YH_Analytics/YH_Analytics/YH_Analytics/*.{h,m}'
s.prefix_header_contents = '#import "YHAnalyticsMacro.h"'
... ...
... ... @@ -78,26 +78,26 @@
NSString *parsJsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
NSDictionary *newParameters = @{@"_mlogs": kSafeValue(parsJsonStr)};
return [self.httpClient POST:kURLAnalyticsService parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
return [self.httpClient POST:kURLAnalyticsService parameters:newParameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
if (block) {
block(YES, nil);
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if (block) {
block(NO, error);
}
}];
// return [self.httpClient POST:kURLAnalyticsService priority:NSOperationQueuePriorityLow parameters:newParameters success:^(AFHTTPRequestOperation *operation, id responseObject) {
//
// return [self.httpClient POST:kURLAnalyticsService parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
// if (block) {
// block(YES, nil);
// }
// } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
// } failure:^(NSURLSessionDataTask *task, NSError *error) {
// if (block) {
// block(NO, error);
// }
// }];
}
- (NSURLSessionDataTask *)uploadLogcustomURL:(NSString *)url parameters:(NSDictionary *)parameters completionBlock:(void (^)(BOOL success, NSError *error))block
... ... @@ -118,37 +118,37 @@
NSString *parsJsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
NSDictionary *newParameters = @{@"_mlogs": kSafeValue(parsJsonStr)};
return [self.httpClient POST:url parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
return [self.httpClient POST:url parameters:newParameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
if (block) {
block(YES, nil);
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if (block) {
block(NO, error);
}
}];
// return [self.httpClient POST:url priority:NSOperationQueuePriorityLow parameters:newParameters success:^(AFHTTPRequestOperation *operation, id responseObject) {
//
// return [self.httpClient POST:url parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
// if (block) {
// block(YES, nil);
// }
// } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
// } failure:^(NSURLSessionDataTask *task, NSError *error) {
// if (block) {
// block(NO, error);
// }
// }];
}
- (NSURLSessionDataTask *)getNewLogStrategy:(NSDictionary *)parameters completionBlock:(void (^)(NSDictionary *strategy, NSError *error))block
{
return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
//应从响应responseObject中解析出strategyDic
// 字段 描述 类型 示例
// logmode 日志发送策略。BATCH-启动发送, INTERVAL-间隔发送 ,IMMEDIATE-立刻发送 string INTERVAL
// time 时间间隔 string 50
// event 触发事件 string CLICK_PUSHMSG
//应从响应responseObject中解析出strategyDic
// 字段 描述 类型 示例
// logmode 日志发送策略。BATCH-启动发送, INTERVAL-间隔发送 ,IMMEDIATE-立刻发送 string INTERVAL
// time 时间间隔 string 50
// event 触发事件 string CLICK_PUSHMSG
return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
NSDictionary *strategyDic = (NSDictionary *)[responseObject objectForKey:@"data"];
if (block) {
block(strategyDic, nil);
... ... @@ -159,25 +159,18 @@
}
}];
// return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) {
//
// //应从响应responseObject中解析出strategyDic
// // 字段 描述 类型 示例
// // logmode 日志发送策略。BATCH-启动发送, INTERVAL-间隔发送 ,IMMEDIATE-立刻发送 string INTERVAL
// // time 时间间隔 string 50
// // event 触发事件 string CLICK_PUSHMSG
// return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
//
// NSDictionary *strategyDic = (NSDictionary *)[responseObject objectForKey:@"data"];
// if (block) {
// block(strategyDic, nil);
// }
//
// } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
//
// } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
// if (block) {
// block(nil, error);
// }
// }];
}
// http://123.57.94.127:8080/appActivate/domobA?mac=xx&ifa=xx
... ... @@ -186,28 +179,30 @@
// 多盟统计
AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:@"http://123.57.94.127:8080/"]];
[manager GET:@"appActivate/domobA" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[manager GET:@"appActivate/domobA" parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
YALog(@"DM %@", responseObject);
if (block) {
block(YES, nil);
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
YALog(@"DM %@", error.localizedDescription);
if (block) {
block(NO, error);
}
}];
// AFHTTPRequestOperationManager *manager = [[AFHTTPRequestOperationManager alloc] initWithBaseURL:[NSURL URLWithString:@"http://123.57.94.127:8080/"]];
//
// [manager GET:@"appActivate/domobA" parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) {
// [manager GET:@"appActivate/domobA" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
// YALog(@"DM %@", responseObject);
// block(YES, nil);
// } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
// if (block) {
// block(YES, nil);
// }
// } failure:^(NSURLSessionDataTask *task, NSError *error) {
// YALog(@"DM %@", error.localizedDescription);
// block(NO, error);
// if (block) {
// block(NO, error);
// }
// }];
}
// http://api.open.yohobuy.com/?method=union.analytics.pairui&appid=100898104&conv_type=MOBILEAPP_ACTIVITE&app_type=android&advertiser_id=365136&imei=355065053311001/01&sigin_key=541ac540a8849881&client_ip=10.11.12.13&encrypt_key=e50a8f58c132f457
... ... @@ -226,26 +221,31 @@
AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:baseURL]];
[manager GET:@"" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[manager GET:@"" parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
YALog(@"GDT %@", responseObject);
if (block) {
block(YES, nil);
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
YALog(@"GDT %@", error.localizedDescription);
if (block) {
block(NO, error);
}
}];
// AFHTTPRequestOperationManager *manager = [[AFHTTPRequestOperationManager alloc] initWithBaseURL:baseURL];
// [manager GET:@"" parameters:params success:^(AFHTTPRequestOperation *operation, id responseObject) {
// [manager GET:@"" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
// YALog(@"GDT %@", responseObject);
// block(YES, nil);
// } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
// if (block) {
// block(YES, nil);
// }
// } failure:^(NSURLSessionDataTask *task, NSError *error) {
// YALog(@"GDT %@", error.localizedDescription);
// block(NO, error);
// if (block) {
// block(NO, error);
// }
// }];
}
#pragma mark - private method
... ...