iOS Team / ScioLive · Commits

Commit 6cf65aae8cdf7efb0f324504c46a7150bb40f300

Authored by 张旭
1 parent 483fc112

适配AFN 4.0.1

Inline Side-by-side
Showing 16 changed files with 87 additions and 34 deletions
CNLiveScioLive/AppDelegate.m
  View file @6cf65aa
... ... @@ -240,7 +240,7 @@
240 240 [AlertViewTool showHUDView];
241 241 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
242 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 244 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
245 245 // 请求成功，解析数据
246 246 NSError *err;
... ...
CNLiveScioLive/Pages/Home/搜索/Controller/CNLiveSearchViewController.m
  View file @6cf65aa
... ... @@ -224,7 +224,7 @@
224 224 }
225 225 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
226 226 [manager POST:strUrl
227   - parameters:parameters
  227 + parameters:parameters headers:nil
228 228 progress:^(NSProgress * _Nonnull uploadProgress) {}
229 229 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
230 230 // 请求成功，解析数据
... ... @@ -918,7 +918,7 @@
918 918 NSDictionary *parameters = @{@"params":searchCategoryId};
919 919 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
920 920 [manager POST:searchApi
921   - parameters:parameters
  921 + parameters:parameters headers:nil
922 922 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
923 923 // 请求成功，解析数据
924 924 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
... ... @@ -986,7 +986,7 @@
986 986 NSDictionary *parameters = @{@"params":searchCategoryId};
987 987 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
988 988 [manager POST:searchApi
989   - parameters:parameters
  989 + parameters:parameters headers:nil
990 990 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
991 991 // 请求成功，解析数据
992 992 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
... ... @@ -1045,7 +1045,7 @@
1045 1045 NSDictionary *parameters = @{@"params":searchCategoryId};
1046 1046 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
1047 1047 [manager POST:searchApi
1048   - parameters:parameters
  1048 + parameters:parameters headers:nil
1049 1049 progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
1050 1050 // 请求成功，解析数据
1051 1051 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/MoreSpecialViewController.m
  View file @6cf65aa
... ... @@ -121,7 +121,7 @@
121 121 NSDictionary *parameters = @{@"params":categoryId};
122 122 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
123 123 [manager POST:strUrl
124   - parameters:parameters
  124 + parameters:parameters headers:nil
125 125 progress:^(NSProgress * _Nonnull uploadProgress) {}
126 126 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
127 127 // 请求成功，解析数据
... ... @@ -170,7 +170,7 @@
170 170 NSDictionary *parameters = @{@"params":categoryId};
171 171 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
172 172 [manager POST:strUrl
173   - parameters:parameters
  173 + parameters:parameters headers:nil
174 174 progress:^(NSProgress * _Nonnull uploadProgress) {}
175 175 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
176 176 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
  View file @6cf65aa
... ... @@ -63,7 +63,7 @@
63 63 NSDictionary *parameters = @{@"params":categoryId};
64 64 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
65 65 [manager POST:strUrl
66   - parameters:parameters
  66 + parameters:parameters headers:nil
67 67 progress:^(NSProgress * _Nonnull uploadProgress) {}
68 68 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
69 69 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
  View file @6cf65aa
... ... @@ -433,7 +433,7 @@
433 433 NSDictionary *parameters = @{@"params":categoryId};
434 434 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
435 435 [manager POST:strUrl
436   - parameters:parameters
  436 + parameters:parameters headers:nil
437 437 progress:^(NSProgress * _Nonnull uploadProgress) {}
438 438 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
439 439 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
  View file @6cf65aa
... ... @@ -216,7 +216,7 @@
216 216 NSDictionary *parameters = @{@"params":categoryId};
217 217 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
218 218 [manager POST:strUrl
219   - parameters:parameters
  219 + parameters:parameters headers:nil
220 220 progress:^(NSProgress * _Nonnull uploadProgress) {}
221 221 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
222 222 // 请求成功，解析数据
... ... @@ -267,7 +267,7 @@
267 267 NSDictionary *parameters = @{@"params":categoryId};
268 268 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
269 269 [manager POST:strUrl
270   - parameters:parameters
  270 + parameters:parameters headers:nil
271 271 progress:^(NSProgress * _Nonnull uploadProgress) {}
272 272 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
273 273 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Home/高级搜索/Controller/CNLiveAdvancedSearchViewController.m
  View file @6cf65aa
... ... @@ -168,7 +168,7 @@
168 168 [AlertViewTool showHUDView];
169 169 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
170 170 [manager POST:strUrl
171   - parameters:@{@"params" : [self convertToJsonData:param]}
  171 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
172 172 progress:^(NSProgress * _Nonnull uploadProgress) {}
173 173 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
174 174 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Home/高级搜索/Controller/SearchResultViewController.m
  View file @6cf65aa
... ... @@ -310,7 +310,7 @@
310 310  
311 311 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
312 312 [manager POST:strUrl
313   - parameters:@{@"params" : [self convertToJsonData:param]}
  313 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
314 314 progress:^(NSProgress * _Nonnull uploadProgress) {}
315 315 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
316 316 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Home/高级搜索/Controller/SelectedViewController.m
  View file @6cf65aa
... ... @@ -83,7 +83,7 @@
83 83  
84 84 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
85 85 [manager POST:strUrl
86   - parameters:@{@"params" : [self convertToJsonData:param]}
  86 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
87 87 progress:^(NSProgress * _Nonnull uploadProgress) {}
88 88 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
89 89 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
... ... @@ -255,7 +255,7 @@
255 255  
256 256 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
257 257 [manager POST:strUrl
258   - parameters:@{@"params" : [self convertToJsonData:param]}
  258 + parameters:@{@"params" : [self convertToJsonData:param]} headers:nil
259 259 progress:^(NSProgress * _Nonnull uploadProgress) {}
260 260 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
261 261 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
  View file @6cf65aa
... ... @@ -61,7 +61,7 @@
61 61 [AlertViewTool showHUDView];
62 62 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
63 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 65 [AlertViewTool hideHUDView];
66 66 // 请求成功，解析数据
67 67 NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
... ... @@ -293,7 +293,7 @@
293 293  
294 294 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
295 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 297 NSLog(@"%@",responseObject);
298 298 NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
299 299 NSString *errorCode = dic[@"errorCode"];
... ...
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
  View file @6cf65aa
... ... @@ -27,7 +27,7 @@
27 27  
28 28 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
29 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 31 [AlertViewTool hideHUDView];
32 32 // 请求成功，解析数据
33 33 NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
... ... @@ -63,7 +63,7 @@
63 63 }
64 64 NSDictionary *parameters = @{@"params":categoryId};
65 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 68 self->_dictionary = [NSDictionary dictionaryWithDictionary:responseObject];
69 69 dispatch_async(dispatch_get_main_queue(), ^{
... ...
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
  View file @6cf65aa
... ... @@ -73,7 +73,7 @@
73 73 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
74 74 manager.responseSerializer = [AFHTTPResponseSerializer serializer];
75 75 [manager POST:tuwen([_dictionary[@"gxbArticleId"] intValue])
76   - parameters:nil
  76 + parameters:nil headers:nil
77 77 progress:^(NSProgress * _Nonnull uploadProgress) {}
78 78 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
79 79 // 请求成功，解析数据
... ... @@ -509,7 +509,7 @@
509 509 [AlertViewTool showHUDView];
510 510 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
511 511 [manager POST:strUrl
512   - parameters:parameters
  512 + parameters:parameters headers:nil
513 513 progress:^(NSProgress * _Nonnull uploadProgress) {}
514 514 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
515 515 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/My/用户设置/Controller/CNLiveUserSettingViewController.m
  View file @6cf65aa
... ... @@ -10,6 +10,7 @@
10 10 #import "CNLiveUserSettingTableViewCell.h"
11 11 #import "CNLiveUserUpdateViewController.h"
12 12 #import "VPImageCropperViewController.h"
  13 +#import <MobileCoreServices/MobileCoreServices.h>
13 14  
14 15 @interface CNLiveUserSettingViewController ()<UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate,UIImagePickerControllerDelegate, UIActionSheetDelegate,VPImageCropperDelegate>{
15 16 NSData *_imageData;
... ...
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
  View file @6cf65aa
... ... @@ -89,7 +89,7 @@ static const NSInteger margin = 34;
89 89 NSLog(@"%@",strUrl);
90 90 NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"d6262244-b059-11e6-b220-c7d8a7a18cc4\",\"pageType\":\"index\"}"};
91 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 94 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
95 95 NSLog(@"%@", dic);
... ... @@ -136,7 +136,7 @@ static const NSInteger margin = 34;
136 136 NSDictionary *parameters = @{@"params":categoryId};
137 137 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
138 138 [manager POST:strUrl
139   - parameters:parameters
  139 + parameters:parameters headers:nil
140 140 progress:^(NSProgress * _Nonnull uploadProgress) {}
141 141 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
142 142 // 请求成功，解析数据
... ... @@ -188,7 +188,7 @@ static const NSInteger margin = 34;
188 188 NSDictionary *parameters = @{@"params":@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"bca5bdd0-259a-11e8-908c-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
189 189 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
190 190 [manager POST:strUrl
191   - parameters:parameters
  191 + parameters:parameters headers:nil
192 192 progress:^(NSProgress * _Nonnull uploadProgress) {}
193 193 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
194 194 // 请求成功，解析数据
... ... @@ -235,7 +235,7 @@ static const NSInteger margin = 34;
235 235  
236 236 NSDictionary *parameters = @{@"params":categoryId};
237 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 240 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
241 241 NSLog(@"%@", dic);
... ... @@ -300,7 +300,7 @@ static const NSInteger margin = 34;
300 300 NSDictionary *parameters = @{@"params":categoryId};
301 301 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
302 302 [manager POST:strUrl
303   - parameters:parameters
  303 + parameters:parameters headers:nil
304 304 progress:^(NSProgress * _Nonnull uploadProgress) {}
305 305 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
306 306 // 请求成功，解析数据
... ... @@ -356,7 +356,7 @@ static const NSInteger margin = 34;
356 356 NSDictionary *parameters = @{@"params":categoryId};
357 357 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
358 358 [manager POST:strUrl
359   - parameters:parameters
  359 + parameters:parameters headers:nil
360 360 progress:^(NSProgress * _Nonnull uploadProgress) {}
361 361 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
362 362 // 请求成功，解析数据
... ...
CNLiveScioLive/Pages/Tools/XWHTTPTool/XWHTTPTool.m
  View file @6cf65aa
... ... @@ -38,11 +38,17 @@
38 38 // manager.responseSerializer = [AFJSONResponseSerializer serializer];
39 39 // manager.requestSerializer=[AFJSONRequestSerializer serializer];
40 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 42 !success ? : success(responseObject);
43 43 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
44 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 54 + (void)POST:(NSString *)url params:(NSDictionary *)params success:(XWRequestSuccess)success failure:(XWRequestFailure)failure
... ... @@ -52,11 +58,18 @@
52 58 // manager.requestSerializer = [AFHTTPRequestSerializer serializer];
53 59 // manager.requestSerializer.timeoutInterval = 10;
54 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 63 !success ? : success(responseObject);
57 64 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
58 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 74 + (void)UploadImage:(NSString *)url params:(NSDictionary *)params fileData:(NSMutableArray<UIImage *> *)imageObject success:(XWRequestSuccess)success failure:(XWRequestFailure)failure{
62 75 // AFHTTPSessionManager *uploadManager = [AFHTTPSessionManager manager];
... ... @@ -64,8 +77,9 @@
64 77 // uploadManager.responseSerializer = [AFJSONResponseSerializer serializer];
65 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 83 for (int i = 0; i < imageObject.count; i++) {
70 84  
71 85 NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
... ... @@ -81,23 +95,61 @@
81 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 101 !success ? : success(responseObject);
86 102 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
87 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 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 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 139 !success ? : success(responseObject);
98 140 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
99 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 154 #pragma clang diagnostic pop
103 155  
... ...
... ... @@ -16,7 +16,7 @@ target &#39;CNLiveScioLive&#39; do
16 16 pod 'SDCycleScrollView','~> 1.75'
17 17 pod 'SDWebImage/GIF'
18 18 pod 'SDWebImage', '~> 4.0.0'
19   - pod 'AFNetworking', '~> 3.1.0'
  19 + pod 'AFNetworking'#, '~> 3.1.0'
20 20 pod 'YYKit', '~> 1.0.9'
21 21 pod 'MJRefresh', '~> 3.1.12'
22 22 pod 'Masonry', '~> 1.0.2'
... ...