Commit 6cf65aae8cdf7efb0f324504c46a7150bb40f300

Authored by 张旭
1 parent 483fc112

适配AFN 4.0.1

CNLiveScioLive/AppDelegate.m
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
240 [AlertViewTool showHUDView]; 240 [AlertViewTool showHUDView];
241 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 241 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
242 manager.responseSerializer = [AFHTTPResponseSerializer serializer]; 242 manager.responseSerializer = [AFHTTPResponseSerializer serializer];
243 - [manager POST:strUrl parameters:parameters progress:^(NSProgress * _Nonnull uploadProgress) {} 243 + [manager POST:strUrl parameters:parameters headers:nil progress:^(NSProgress * _Nonnull uploadProgress) {}
244 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 244 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
245 // 请求成功,解析数据 245 // 请求成功,解析数据
246 NSError *err; 246 NSError *err;
CNLiveScioLive/Pages/Home/搜索/Controller/CNLiveSearchViewController.m
@@ -224,7 +224,7 @@ @@ -224,7 +224,7 @@
224 } 224 }
225 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 225 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
226 [manager POST:strUrl 226 [manager POST:strUrl
227 - parameters:parameters 227 + parameters:parameters headers:nil
228 progress:^(NSProgress * _Nonnull uploadProgress) {} 228 progress:^(NSProgress * _Nonnull uploadProgress) {}
229 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 229 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
230 // 请求成功,解析数据 230 // 请求成功,解析数据
@@ -918,7 +918,7 @@ @@ -918,7 +918,7 @@
918 NSDictionary *parameters = @{@"params":searchCategoryId}; 918 NSDictionary *parameters = @{@"params":searchCategoryId};
919 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 919 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
920 [manager POST:searchApi 920 [manager POST:searchApi
921 - parameters:parameters 921 + parameters:parameters headers:nil
922 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 922 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
923 // 请求成功,解析数据 923 // 请求成功,解析数据
924 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject]; 924 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
@@ -986,7 +986,7 @@ @@ -986,7 +986,7 @@
986 NSDictionary *parameters = @{@"params":searchCategoryId}; 986 NSDictionary *parameters = @{@"params":searchCategoryId};
987 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 987 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
988 [manager POST:searchApi 988 [manager POST:searchApi
989 - parameters:parameters 989 + parameters:parameters headers:nil
990 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 990 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
991 // 请求成功,解析数据 991 // 请求成功,解析数据
992 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject]; 992 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
@@ -1045,7 +1045,7 @@ @@ -1045,7 +1045,7 @@
1045 NSDictionary *parameters = @{@"params":searchCategoryId}; 1045 NSDictionary *parameters = @{@"params":searchCategoryId};
1046 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 1046 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
1047 [manager POST:searchApi 1047 [manager POST:searchApi
1048 - parameters:parameters 1048 + parameters:parameters headers:nil
1049 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 1049 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
1050 // 请求成功,解析数据 1050 // 请求成功,解析数据
1051 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject]; 1051 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
CNLiveScioLive/Pages/Home/新闻详情/OldController/MoreSpecialViewController.m
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 NSDictionary *parameters = @{@"params":categoryId}; 121 NSDictionary *parameters = @{@"params":categoryId};
122 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 122 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
123 [manager POST:strUrl 123 [manager POST:strUrl
124 - parameters:parameters 124 + parameters:parameters headers:nil
125 progress:^(NSProgress * _Nonnull uploadProgress) {} 125 progress:^(NSProgress * _Nonnull uploadProgress) {}
126 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 126 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
127 // 请求成功,解析数据 127 // 请求成功,解析数据
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@
170 NSDictionary *parameters = @{@"params":categoryId}; 170 NSDictionary *parameters = @{@"params":categoryId};
171 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 171 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
172 [manager POST:strUrl 172 [manager POST:strUrl
173 - parameters:parameters 173 + parameters:parameters headers:nil
174 progress:^(NSProgress * _Nonnull uploadProgress) {} 174 progress:^(NSProgress * _Nonnull uploadProgress) {}
175 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 175 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
176 // 请求成功,解析数据 176 // 请求成功,解析数据
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 NSDictionary *parameters = @{@"params":categoryId}; 63 NSDictionary *parameters = @{@"params":categoryId};
64 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 64 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
65 [manager POST:strUrl 65 [manager POST:strUrl
66 - parameters:parameters 66 + parameters:parameters headers:nil
67 progress:^(NSProgress * _Nonnull uploadProgress) {} 67 progress:^(NSProgress * _Nonnull uploadProgress) {}
68 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 68 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
69 // 请求成功,解析数据 69 // 请求成功,解析数据
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
@@ -433,7 +433,7 @@ @@ -433,7 +433,7 @@
433 NSDictionary *parameters = @{@"params":categoryId}; 433 NSDictionary *parameters = @{@"params":categoryId};
434 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 434 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
435 [manager POST:strUrl 435 [manager POST:strUrl
436 - parameters:parameters 436 + parameters:parameters headers:nil
437 progress:^(NSProgress * _Nonnull uploadProgress) {} 437 progress:^(NSProgress * _Nonnull uploadProgress) {}
438 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 438 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
439 // 请求成功,解析数据 439 // 请求成功,解析数据
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
@@ -216,7 +216,7 @@ @@ -216,7 +216,7 @@
216 NSDictionary *parameters = @{@"params":categoryId}; 216 NSDictionary *parameters = @{@"params":categoryId};
217 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 217 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
218 [manager POST:strUrl 218 [manager POST:strUrl
219 - parameters:parameters 219 + parameters:parameters headers:nil
220 progress:^(NSProgress * _Nonnull uploadProgress) {} 220 progress:^(NSProgress * _Nonnull uploadProgress) {}
221 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 221 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
222 // 请求成功,解析数据 222 // 请求成功,解析数据
@@ -267,7 +267,7 @@ @@ -267,7 +267,7 @@
267 NSDictionary *parameters = @{@"params":categoryId}; 267 NSDictionary *parameters = @{@"params":categoryId};
268 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 268 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
269 [manager POST:strUrl 269 [manager POST:strUrl
270 - parameters:parameters 270 + parameters:parameters headers:nil
271 progress:^(NSProgress * _Nonnull uploadProgress) {} 271 progress:^(NSProgress * _Nonnull uploadProgress) {}
272 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 272 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
273 // 请求成功,解析数据 273 // 请求成功,解析数据
CNLiveScioLive/Pages/Home/高级搜索/Controller/CNLiveAdvancedSearchViewController.m
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 [AlertViewTool showHUDView]; 168 [AlertViewTool showHUDView];
169 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 169 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
170 [manager POST:strUrl 170 [manager POST:strUrl
171 - parameters:@{@"params" : [self convertToJsonData:param]} 171 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
172 progress:^(NSProgress * _Nonnull uploadProgress) {} 172 progress:^(NSProgress * _Nonnull uploadProgress) {}
173 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 173 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
174 // 请求成功,解析数据 174 // 请求成功,解析数据
CNLiveScioLive/Pages/Home/高级搜索/Controller/SearchResultViewController.m
@@ -310,7 +310,7 @@ @@ -310,7 +310,7 @@
310 310
311 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 311 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
312 [manager POST:strUrl 312 [manager POST:strUrl
313 - parameters:@{@"params" : [self convertToJsonData:param]} 313 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
314 progress:^(NSProgress * _Nonnull uploadProgress) {} 314 progress:^(NSProgress * _Nonnull uploadProgress) {}
315 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 315 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
316 // 请求成功,解析数据 316 // 请求成功,解析数据
CNLiveScioLive/Pages/Home/高级搜索/Controller/SelectedViewController.m
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 83
84 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 84 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
85 [manager POST:strUrl 85 [manager POST:strUrl
86 - parameters:@{@"params" : [self convertToJsonData:param]} 86 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
87 progress:^(NSProgress * _Nonnull uploadProgress) {} 87 progress:^(NSProgress * _Nonnull uploadProgress) {}
88 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 88 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
89 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject]; 89 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
@@ -255,7 +255,7 @@ @@ -255,7 +255,7 @@
255 255
256 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 256 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
257 [manager POST:strUrl 257 [manager POST:strUrl
258 - parameters:@{@"params" : [self convertToJsonData:param]} 258 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
259 progress:^(NSProgress * _Nonnull uploadProgress) {} 259 progress:^(NSProgress * _Nonnull uploadProgress) {}
260 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 260 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
261 // 请求成功,解析数据 261 // 请求成功,解析数据
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 [AlertViewTool showHUDView]; 61 [AlertViewTool showHUDView];
62 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 62 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
63 manager.responseSerializer = [AFHTTPResponseSerializer serializer]; 63 manager.responseSerializer = [AFHTTPResponseSerializer serializer];
64 - [manager POST:tuwenzhibo parameters:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 64 + [manager POST:tuwenzhibo parameters:nil headers:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
65 [AlertViewTool hideHUDView]; 65 [AlertViewTool hideHUDView];
66 // 请求成功,解析数据 66 // 请求成功,解析数据
67 NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; 67 NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
@@ -293,7 +293,7 @@ @@ -293,7 +293,7 @@
293 293
294 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 294 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
295 manager.responseSerializer = [AFHTTPResponseSerializer serializer]; 295 manager.responseSerializer = [AFHTTPResponseSerializer serializer];
296 - [manager POST:@"http://s.scio.gov.cn/ocms/.content/function_provider/arswitch.json" parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) { 296 + [manager POST:@"http://s.scio.gov.cn/ocms/.content/function_provider/arswitch.json" parameters:nil headers:nil progress:NULL success:^(NSURLSessionDataTask *task, id responseObject) {
297 NSLog(@"%@",responseObject); 297 NSLog(@"%@",responseObject);
298 NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil]; 298 NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
299 NSString *errorCode = dic[@"errorCode"]; 299 NSString *errorCode = dic[@"errorCode"];
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 27
28 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 28 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
29 manager.responseSerializer = [AFHTTPResponseSerializer serializer]; 29 manager.responseSerializer = [AFHTTPResponseSerializer serializer];
30 - [manager POST:yugao parameters:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject){ 30 + [manager POST:yugao parameters:nil headers:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject){
31 [AlertViewTool hideHUDView]; 31 [AlertViewTool hideHUDView];
32 // 请求成功,解析数据 32 // 请求成功,解析数据
33 NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; 33 NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 } 63 }
64 NSDictionary *parameters = @{@"params":categoryId}; 64 NSDictionary *parameters = @{@"params":categoryId};
65 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 65 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
66 - [manager POST:strUrl parameters:parameters progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, NSDictionary *responseObject) { 66 + [manager POST:strUrl parameters:parameters headers:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, NSDictionary *responseObject) {
67 // 请求成功,解析数据 67 // 请求成功,解析数据
68 self->_dictionary = [NSDictionary dictionaryWithDictionary:responseObject]; 68 self->_dictionary = [NSDictionary dictionaryWithDictionary:responseObject];
69 dispatch_async(dispatch_get_main_queue(), ^{ 69 dispatch_async(dispatch_get_main_queue(), ^{
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 73 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
74 manager.responseSerializer = [AFHTTPResponseSerializer serializer]; 74 manager.responseSerializer = [AFHTTPResponseSerializer serializer];
75 [manager POST:tuwen([_dictionary[@"gxbArticleId"] intValue]) 75 [manager POST:tuwen([_dictionary[@"gxbArticleId"] intValue])
76 - parameters:nil 76 + parameters:nil headers:nil
77 progress:^(NSProgress * _Nonnull uploadProgress) {} 77 progress:^(NSProgress * _Nonnull uploadProgress) {}
78 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 78 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
79 // 请求成功,解析数据 79 // 请求成功,解析数据
@@ -509,7 +509,7 @@ @@ -509,7 +509,7 @@
509 [AlertViewTool showHUDView]; 509 [AlertViewTool showHUDView];
510 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 510 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
511 [manager POST:strUrl 511 [manager POST:strUrl
512 - parameters:parameters 512 + parameters:parameters headers:nil
513 progress:^(NSProgress * _Nonnull uploadProgress) {} 513 progress:^(NSProgress * _Nonnull uploadProgress) {}
514 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 514 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
515 // 请求成功,解析数据 515 // 请求成功,解析数据
CNLiveScioLive/Pages/My/用户设置/Controller/CNLiveUserSettingViewController.m
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 #import "CNLiveUserSettingTableViewCell.h" 10 #import "CNLiveUserSettingTableViewCell.h"
11 #import "CNLiveUserUpdateViewController.h" 11 #import "CNLiveUserUpdateViewController.h"
12 #import "VPImageCropperViewController.h" 12 #import "VPImageCropperViewController.h"
  13 +#import <MobileCoreServices/MobileCoreServices.h>
13 14
14 @interface CNLiveUserSettingViewController ()<UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate,UIImagePickerControllerDelegate, UIActionSheetDelegate,VPImageCropperDelegate>{ 15 @interface CNLiveUserSettingViewController ()<UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate,UIImagePickerControllerDelegate, UIActionSheetDelegate,VPImageCropperDelegate>{
15 NSData *_imageData; 16 NSData *_imageData;
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
@@ -89,7 +89,7 @@ static const NSInteger margin = 34; @@ -89,7 +89,7 @@ static const NSInteger margin = 34;
89 NSLog(@"%@",strUrl); 89 NSLog(@"%@",strUrl);
90 NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"d6262244-b059-11e6-b220-c7d8a7a18cc4\",\"pageType\":\"index\"}"}; 90 NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"d6262244-b059-11e6-b220-c7d8a7a18cc4\",\"pageType\":\"index\"}"};
91 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 91 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
92 - [manager POST:strUrl parameters:parameters progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 92 + [manager POST:strUrl parameters:parameters headers:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
93 // 请求成功,解析数据 93 // 请求成功,解析数据
94 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject]; 94 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
95 NSLog(@"%@", dic); 95 NSLog(@"%@", dic);
@@ -136,7 +136,7 @@ static const NSInteger margin = 34; @@ -136,7 +136,7 @@ static const NSInteger margin = 34;
136 NSDictionary *parameters = @{@"params":categoryId}; 136 NSDictionary *parameters = @{@"params":categoryId};
137 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 137 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
138 [manager POST:strUrl 138 [manager POST:strUrl
139 - parameters:parameters 139 + parameters:parameters headers:nil
140 progress:^(NSProgress * _Nonnull uploadProgress) {} 140 progress:^(NSProgress * _Nonnull uploadProgress) {}
141 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 141 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
142 // 请求成功,解析数据 142 // 请求成功,解析数据
@@ -188,7 +188,7 @@ static const NSInteger margin = 34; @@ -188,7 +188,7 @@ static const NSInteger margin = 34;
188 NSDictionary *parameters = @{@"params":@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"bca5bdd0-259a-11e8-908c-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"}; 188 NSDictionary *parameters = @{@"params":@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"bca5bdd0-259a-11e8-908c-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
189 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 189 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
190 [manager POST:strUrl 190 [manager POST:strUrl
191 - parameters:parameters 191 + parameters:parameters headers:nil
192 progress:^(NSProgress * _Nonnull uploadProgress) {} 192 progress:^(NSProgress * _Nonnull uploadProgress) {}
193 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 193 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
194 // 请求成功,解析数据 194 // 请求成功,解析数据
@@ -235,7 +235,7 @@ static const NSInteger margin = 34; @@ -235,7 +235,7 @@ static const NSInteger margin = 34;
235 235
236 NSDictionary *parameters = @{@"params":categoryId}; 236 NSDictionary *parameters = @{@"params":categoryId};
237 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 237 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
238 - [manager POST:strUrl parameters:parameters progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 238 + [manager POST:strUrl parameters:parameters headers:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
239 // 请求成功,解析数据 239 // 请求成功,解析数据
240 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject]; 240 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
241 NSLog(@"%@", dic); 241 NSLog(@"%@", dic);
@@ -300,7 +300,7 @@ static const NSInteger margin = 34; @@ -300,7 +300,7 @@ static const NSInteger margin = 34;
300 NSDictionary *parameters = @{@"params":categoryId}; 300 NSDictionary *parameters = @{@"params":categoryId};
301 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 301 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
302 [manager POST:strUrl 302 [manager POST:strUrl
303 - parameters:parameters 303 + parameters:parameters headers:nil
304 progress:^(NSProgress * _Nonnull uploadProgress) {} 304 progress:^(NSProgress * _Nonnull uploadProgress) {}
305 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 305 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
306 // 请求成功,解析数据 306 // 请求成功,解析数据
@@ -356,7 +356,7 @@ static const NSInteger margin = 34; @@ -356,7 +356,7 @@ static const NSInteger margin = 34;
356 NSDictionary *parameters = @{@"params":categoryId}; 356 NSDictionary *parameters = @{@"params":categoryId};
357 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 357 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
358 [manager POST:strUrl 358 [manager POST:strUrl
359 - parameters:parameters 359 + parameters:parameters headers:nil
360 progress:^(NSProgress * _Nonnull uploadProgress) {} 360 progress:^(NSProgress * _Nonnull uploadProgress) {}
361 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 361 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
362 // 请求成功,解析数据 362 // 请求成功,解析数据
CNLiveScioLive/Pages/Tools/XWHTTPTool/XWHTTPTool.m
@@ -38,11 +38,17 @@ @@ -38,11 +38,17 @@
38 // manager.responseSerializer = [AFJSONResponseSerializer serializer]; 38 // manager.responseSerializer = [AFJSONResponseSerializer serializer];
39 // manager.requestSerializer=[AFJSONRequestSerializer serializer]; 39 // manager.requestSerializer=[AFJSONRequestSerializer serializer];
40 // manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html",@"text/plain",@"application/json",@"text/json",@"text/javascript", nil]; 40 // manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html",@"text/plain",@"application/json",@"text/json",@"text/javascript", nil];
41 - [[XWAFHTTPSessionManager shareManager] GET:url parameters:params success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) { 41 + [[XWAFHTTPSessionManager shareManager] GET:url parameters:params headers:nil progress:NULL success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
42 !success ? : success(responseObject); 42 !success ? : success(responseObject);
43 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { 43 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
44 !failure ? : failure(error); 44 !failure ? : failure(error);
45 }]; 45 }];
  46 +
  47 +// [[XWAFHTTPSessionManager shareManager] GET:url parameters:params success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
  48 +// !success ? : success(responseObject);
  49 +// } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
  50 +// !failure ? : failure(error);
  51 +// }];
46 } 52 }
47 53
48 + (void)POST:(NSString *)url params:(NSDictionary *)params success:(XWRequestSuccess)success failure:(XWRequestFailure)failure 54 + (void)POST:(NSString *)url params:(NSDictionary *)params success:(XWRequestSuccess)success failure:(XWRequestFailure)failure
@@ -52,11 +58,18 @@ @@ -52,11 +58,18 @@
52 // manager.requestSerializer = [AFHTTPRequestSerializer serializer]; 58 // manager.requestSerializer = [AFHTTPRequestSerializer serializer];
53 // manager.requestSerializer.timeoutInterval = 10; 59 // manager.requestSerializer.timeoutInterval = 10;
54 // manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html",@"text/plain",@"application/json",@"text/json",@"text/javascript", nil]; 60 // manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html",@"text/plain",@"application/json",@"text/json",@"text/javascript", nil];
55 - [[XWAFHTTPSessionManager shareManager] POST:url parameters:params success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) { 61 +
  62 + [[XWAFHTTPSessionManager shareManager] POST:url parameters:params headers:nil progress:NULL success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
56 !success ? : success(responseObject); 63 !success ? : success(responseObject);
57 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { 64 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
58 !failure ? : failure(error); 65 !failure ? : failure(error);
59 }]; 66 }];
  67 +
  68 +// [[XWAFHTTPSessionManager shareManager] POST:url parameters:params success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
  69 +// !success ? : success(responseObject);
  70 +// } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
  71 +// !failure ? : failure(error);
  72 +// }];
60 } 73 }
61 + (void)UploadImage:(NSString *)url params:(NSDictionary *)params fileData:(NSMutableArray<UIImage *> *)imageObject success:(XWRequestSuccess)success failure:(XWRequestFailure)failure{ 74 + (void)UploadImage:(NSString *)url params:(NSDictionary *)params fileData:(NSMutableArray<UIImage *> *)imageObject success:(XWRequestSuccess)success failure:(XWRequestFailure)failure{
62 // AFHTTPSessionManager *uploadManager = [AFHTTPSessionManager manager]; 75 // AFHTTPSessionManager *uploadManager = [AFHTTPSessionManager manager];
@@ -64,8 +77,9 @@ @@ -64,8 +77,9 @@
64 // uploadManager.responseSerializer = [AFJSONResponseSerializer serializer]; 77 // uploadManager.responseSerializer = [AFJSONResponseSerializer serializer];
65 // uploadManager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html",@"text/plain",@"application/json",@"text/json",@"text/javascript",@"image/jpeg",@"image/png",@"application/octet-stream",@"multipart/form-data", nil]; 78 // uploadManager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html",@"text/plain",@"application/json",@"text/json",@"text/javascript",@"image/jpeg",@"image/png",@"application/octet-stream",@"multipart/form-data", nil];
66 79
  80 +
67 //上传图片 81 //上传图片
68 - [[XWAFHTTPSessionManager shareManager] POST:url parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) { 82 + [[XWAFHTTPSessionManager shareManager] POST:url parameters:params headers:nil constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) {
69 for (int i = 0; i < imageObject.count; i++) { 83 for (int i = 0; i < imageObject.count; i++) {
70 84
71 NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; 85 NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
@@ -81,23 +95,61 @@ @@ -81,23 +95,61 @@
81 mimeType:@"image/jpeg"]; 95 mimeType:@"image/jpeg"];
82 96
83 } 97 }
84 - } success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) { 98 + } progress:^(NSProgress * _Nonnull uploadProgress) {
  99 +
  100 + } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
85 !success ? : success(responseObject); 101 !success ? : success(responseObject);
86 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { 102 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
87 !failure ? : failure(error); 103 !failure ? : failure(error);
88 }]; 104 }];
  105 +
  106 +// //上传图片
  107 +// [[XWAFHTTPSessionManager shareManager] POST:url parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) {
  108 +// for (int i = 0; i < imageObject.count; i++) {
  109 +//
  110 +// NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
  111 +// formatter.dateFormat =@"yyyyMMddHHmmss";
  112 +// NSString *str = [formatter stringFromDate:[NSDate date]];
  113 +// NSString *fileName = [NSString stringWithFormat:@"%@%d.jpg",str,i];
  114 +// UIImage *image = imageObject[i];
  115 +// NSData *imageData = UIImageJPEGRepresentation(image, 0.5);
  116 +// //上传的参数(上传图片,以文件流的格式)
  117 +// [formData appendPartWithFileData:imageData
  118 +// name:[NSString stringWithFormat:@"image_%d",i]
  119 +// fileName:fileName
  120 +// mimeType:@"image/jpeg"];
  121 +//
  122 +// }
  123 +// } success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
  124 +// !success ? : success(responseObject);
  125 +// } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
  126 +// !failure ? : failure(error);
  127 +// }];
89 } 128 }
90 //上传文件 129 //上传文件
91 + (void)Uploadfile:(NSString *)url params:(NSDictionary *)params File:(NSString *)file success:(XWRequestSuccess)success failure:(XWRequestFailure)failure{ 130 + (void)Uploadfile:(NSString *)url params:(NSDictionary *)params File:(NSString *)file success:(XWRequestSuccess)success failure:(XWRequestFailure)failure{
  131 +
92 //上传文件 132 //上传文件
93 - [[XWAFHTTPSessionManager shareManager] POST:url parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) { 133 + [[XWAFHTTPSessionManager shareManager] POST:url parameters:params headers:nil constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) {
94 //上传的参数 134 //上传的参数
95 [formData appendPartWithFileURL:[NSURL fileURLWithPath:file] name:@"file" error:nil]; 135 [formData appendPartWithFileURL:[NSURL fileURLWithPath:file] name:@"file" error:nil];
96 - } success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) { 136 + } progress:^(NSProgress * _Nonnull uploadProgress) {
  137 +
  138 + } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
97 !success ? : success(responseObject); 139 !success ? : success(responseObject);
98 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { 140 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
99 !failure ? : failure(error); 141 !failure ? : failure(error);
100 }]; 142 }];
  143 +
  144 +// //上传文件
  145 +// [[XWAFHTTPSessionManager shareManager] POST:url parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) {
  146 +// //上传的参数
  147 +// [formData appendPartWithFileURL:[NSURL fileURLWithPath:file] name:@"file" error:nil];
  148 +// } success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
  149 +// !success ? : success(responseObject);
  150 +// } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
  151 +// !failure ? : failure(error);
  152 +// }];
101 } 153 }
102 #pragma clang diagnostic pop 154 #pragma clang diagnostic pop
103 155
@@ -16,7 +16,7 @@ target &#39;CNLiveScioLive&#39; do @@ -16,7 +16,7 @@ target &#39;CNLiveScioLive&#39; do
16 pod 'SDCycleScrollView','~> 1.75' 16 pod 'SDCycleScrollView','~> 1.75'
17 pod 'SDWebImage/GIF' 17 pod 'SDWebImage/GIF'
18 pod 'SDWebImage', '~> 4.0.0' 18 pod 'SDWebImage', '~> 4.0.0'
19 - pod 'AFNetworking', '~> 3.1.0' 19 + pod 'AFNetworking'#, '~> 3.1.0'
20 pod 'YYKit', '~> 1.0.9' 20 pod 'YYKit', '~> 1.0.9'
21 pod 'MJRefresh', '~> 3.1.12' 21 pod 'MJRefresh', '~> 3.1.12'
22 pod 'Masonry', '~> 1.0.2' 22 pod 'Masonry', '~> 1.0.2'