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 37 additions and 37 deletions
1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 s.name = "YH_Analytics" 2 s.name = "YH_Analytics"
3 - s.version = "1.1.0" 3 + s.version = "1.2.0"
4 s.summary = "Analytics Kit" 4 s.summary = "Analytics Kit"
5 s.description = <<-DESC 5 s.description = <<-DESC
6 Analytics Kit 6 Analytics Kit
@@ -12,9 +12,9 @@ Pod::Spec.new do |s| @@ -12,9 +12,9 @@ Pod::Spec.new do |s|
12 :branch => 'mars', 12 :branch => 'mars',
13 :tag => s.version.to_s } 13 :tag => s.version.to_s }
14 14
15 - s.platform = :ios, '8.0' 15 + s.platform = :ios, '10.0'
16 s.requires_arc = true 16 s.requires_arc = true
17 - s.dependency 'AFNetworking' 17 + s.dependency 'AFNetworking', '~> 4.0.0'
18 18
19 s.source_files = 'YH_Analytics/YH_Analytics/YH_Analytics/*.{h,m}' 19 s.source_files = 'YH_Analytics/YH_Analytics/YH_Analytics/*.{h,m}'
20 s.prefix_header_contents = '#import "YHAnalyticsMacro.h"' 20 s.prefix_header_contents = '#import "YHAnalyticsMacro.h"'
@@ -78,26 +78,26 @@ @@ -78,26 +78,26 @@
78 NSString *parsJsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; 78 NSString *parsJsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
79 NSDictionary *newParameters = @{@"_mlogs": kSafeValue(parsJsonStr)}; 79 NSDictionary *newParameters = @{@"_mlogs": kSafeValue(parsJsonStr)};
80 80
81 - return [self.httpClient POST:kURLAnalyticsService parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) { 81 + return [self.httpClient POST:kURLAnalyticsService parameters:newParameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
82 if (block) { 82 if (block) {
83 block(YES, nil); 83 block(YES, nil);
84 } 84 }
85 - } failure:^(NSURLSessionDataTask *task, NSError *error) { 85 + } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
86 if (block) { 86 if (block) {
87 block(NO, error); 87 block(NO, error);
88 } 88 }
89 }]; 89 }];
90 90
91 -// return [self.httpClient POST:kURLAnalyticsService priority:NSOperationQueuePriorityLow parameters:newParameters success:^(AFHTTPRequestOperation *operation, id responseObject) {  
92 -// 91 +// return [self.httpClient POST:kURLAnalyticsService parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
93 // if (block) { 92 // if (block) {
94 // block(YES, nil); 93 // block(YES, nil);
95 // } 94 // }
96 -// } failure:^(AFHTTPRequestOperation *operation, NSError *error) { 95 +// } failure:^(NSURLSessionDataTask *task, NSError *error) {
97 // if (block) { 96 // if (block) {
98 // block(NO, error); 97 // block(NO, error);
99 // } 98 // }
100 // }]; 99 // }];
  100 +
101 } 101 }
102 102
103 - (NSURLSessionDataTask *)uploadLogcustomURL:(NSString *)url parameters:(NSDictionary *)parameters completionBlock:(void (^)(BOOL success, NSError *error))block 103 - (NSURLSessionDataTask *)uploadLogcustomURL:(NSString *)url parameters:(NSDictionary *)parameters completionBlock:(void (^)(BOOL success, NSError *error))block
@@ -118,37 +118,37 @@ @@ -118,37 +118,37 @@
118 NSString *parsJsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; 118 NSString *parsJsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
119 NSDictionary *newParameters = @{@"_mlogs": kSafeValue(parsJsonStr)}; 119 NSDictionary *newParameters = @{@"_mlogs": kSafeValue(parsJsonStr)};
120 120
121 - return [self.httpClient POST:url parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) { 121 + return [self.httpClient POST:url parameters:newParameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
122 if (block) { 122 if (block) {
123 block(YES, nil); 123 block(YES, nil);
124 } 124 }
125 - } failure:^(NSURLSessionDataTask *task, NSError *error) { 125 + } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
126 if (block) { 126 if (block) {
127 block(NO, error); 127 block(NO, error);
128 } 128 }
129 }]; 129 }];
130 130
131 -// return [self.httpClient POST:url priority:NSOperationQueuePriorityLow parameters:newParameters success:^(AFHTTPRequestOperation *operation, id responseObject) {  
132 -// 131 +// return [self.httpClient POST:url parameters:newParameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
133 // if (block) { 132 // if (block) {
134 // block(YES, nil); 133 // block(YES, nil);
135 // } 134 // }
136 -// } failure:^(AFHTTPRequestOperation *operation, NSError *error) { 135 +// } failure:^(NSURLSessionDataTask *task, NSError *error) {
137 // if (block) { 136 // if (block) {
138 // block(NO, error); 137 // block(NO, error);
139 // } 138 // }
140 // }]; 139 // }];
  140 +
  141 +
141 } 142 }
142 143
143 - (NSURLSessionDataTask *)getNewLogStrategy:(NSDictionary *)parameters completionBlock:(void (^)(NSDictionary *strategy, NSError *error))block 144 - (NSURLSessionDataTask *)getNewLogStrategy:(NSDictionary *)parameters completionBlock:(void (^)(NSDictionary *strategy, NSError *error))block
144 { 145 {
145 - return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {  
146 //应从响应responseObject中解析出strategyDic 146 //应从响应responseObject中解析出strategyDic
147 // 字段 描述 类型 示例 147 // 字段 描述 类型 示例
148 // logmode 日志发送策略。BATCH-启动发送, INTERVAL-间隔发送 ,IMMEDIATE-立刻发送 string INTERVAL 148 // logmode 日志发送策略。BATCH-启动发送, INTERVAL-间隔发送 ,IMMEDIATE-立刻发送 string INTERVAL
149 // time 时间间隔 string 50 149 // time 时间间隔 string 50
150 // event 触发事件 string CLICK_PUSHMSG 150 // event 触发事件 string CLICK_PUSHMSG
151 - 151 + return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
152 NSDictionary *strategyDic = (NSDictionary *)[responseObject objectForKey:@"data"]; 152 NSDictionary *strategyDic = (NSDictionary *)[responseObject objectForKey:@"data"];
153 if (block) { 153 if (block) {
154 block(strategyDic, nil); 154 block(strategyDic, nil);
@@ -159,25 +159,18 @@ @@ -159,25 +159,18 @@
159 } 159 }
160 }]; 160 }];
161 161
162 -// return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) {  
163 -//  
164 -// //应从响应responseObject中解析出strategyDic  
165 -// // 字段 描述 类型 示例  
166 -// // logmode 日志发送策略。BATCH-启动发送, INTERVAL-间隔发送 ,IMMEDIATE-立刻发送 string INTERVAL  
167 -// // time 时间间隔 string 50  
168 -// // event 触发事件 string CLICK_PUSHMSG 162 +// return [self.httpClient GET:kYASApiMethodGetNewStrategy parameters:parameters progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
169 // 163 //
170 // NSDictionary *strategyDic = (NSDictionary *)[responseObject objectForKey:@"data"]; 164 // NSDictionary *strategyDic = (NSDictionary *)[responseObject objectForKey:@"data"];
171 // if (block) { 165 // if (block) {
172 // block(strategyDic, nil); 166 // block(strategyDic, nil);
173 // } 167 // }
174 -//  
175 -// } failure:^(AFHTTPRequestOperation *operation, NSError *error) {  
176 -// 168 +// } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
177 // if (block) { 169 // if (block) {
178 // block(nil, error); 170 // block(nil, error);
179 // } 171 // }
180 // }]; 172 // }];
  173 +
181 } 174 }
182 175
183 // http://123.57.94.127:8080/appActivate/domobA?mac=xx&ifa=xx 176 // http://123.57.94.127:8080/appActivate/domobA?mac=xx&ifa=xx
@@ -186,28 +179,30 @@ @@ -186,28 +179,30 @@
186 // 多盟统计 179 // 多盟统计
187 180
188 AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:@"http://123.57.94.127:8080/"]]; 181 AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:@"http://123.57.94.127:8080/"]];
189 -  
190 - [manager GET:@"appActivate/domobA" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) { 182 + [manager GET:@"appActivate/domobA" parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
191 YALog(@"DM %@", responseObject); 183 YALog(@"DM %@", responseObject);
192 if (block) { 184 if (block) {
193 block(YES, nil); 185 block(YES, nil);
194 } 186 }
195 - } failure:^(NSURLSessionDataTask *task, NSError *error) { 187 + } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
196 YALog(@"DM %@", error.localizedDescription); 188 YALog(@"DM %@", error.localizedDescription);
197 if (block) { 189 if (block) {
198 block(NO, error); 190 block(NO, error);
199 } 191 }
200 }]; 192 }];
201 193
202 -// AFHTTPRequestOperationManager *manager = [[AFHTTPRequestOperationManager alloc] initWithBaseURL:[NSURL URLWithString:@"http://123.57.94.127:8080/"]];  
203 -//  
204 -// [manager GET:@"appActivate/domobA" parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) { 194 +// [manager GET:@"appActivate/domobA" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
205 // YALog(@"DM %@", responseObject); 195 // YALog(@"DM %@", responseObject);
  196 +// if (block) {
206 // block(YES, nil); 197 // block(YES, nil);
207 -// } failure:^(AFHTTPRequestOperation *operation, NSError *error) { 198 +// }
  199 +// } failure:^(NSURLSessionDataTask *task, NSError *error) {
208 // YALog(@"DM %@", error.localizedDescription); 200 // YALog(@"DM %@", error.localizedDescription);
  201 +// if (block) {
209 // block(NO, error); 202 // block(NO, error);
  203 +// }
210 // }]; 204 // }];
  205 +
211 } 206 }
212 207
213 // 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 208 // 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 @@ @@ -226,26 +221,31 @@
226 221
227 AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:baseURL]]; 222 AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:baseURL]];
228 223
229 - [manager GET:@"" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) { 224 + [manager GET:@"" parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
230 YALog(@"GDT %@", responseObject); 225 YALog(@"GDT %@", responseObject);
231 if (block) { 226 if (block) {
232 block(YES, nil); 227 block(YES, nil);
233 } 228 }
234 - } failure:^(NSURLSessionDataTask *task, NSError *error) { 229 + } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
235 YALog(@"GDT %@", error.localizedDescription); 230 YALog(@"GDT %@", error.localizedDescription);
236 if (block) { 231 if (block) {
237 block(NO, error); 232 block(NO, error);
238 } 233 }
239 }]; 234 }];
240 235
241 -// AFHTTPRequestOperationManager *manager = [[AFHTTPRequestOperationManager alloc] initWithBaseURL:baseURL];  
242 -// [manager GET:@"" parameters:params success:^(AFHTTPRequestOperation *operation, id responseObject) { 236 +// [manager GET:@"" parameters:parameters progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
243 // YALog(@"GDT %@", responseObject); 237 // YALog(@"GDT %@", responseObject);
  238 +// if (block) {
244 // block(YES, nil); 239 // block(YES, nil);
245 -// } failure:^(AFHTTPRequestOperation *operation, NSError *error) { 240 +// }
  241 +// } failure:^(NSURLSessionDataTask *task, NSError *error) {
246 // YALog(@"GDT %@", error.localizedDescription); 242 // YALog(@"GDT %@", error.localizedDescription);
  243 +// if (block) {
247 // block(NO, error); 244 // block(NO, error);
  245 +// }
248 // }]; 246 // }];
  247 +
  248 +
249 } 249 }
250 250
251 #pragma mark - private method 251 #pragma mark - private method