本地版本测试版-9.8.5

This commit is contained in:
wbzhan_macbook
2019-06-03 09:41:16 +08:00
parent 35d2db06a6
commit 1ff1ff84b1
12 changed files with 200 additions and 221 deletions
@@ -47,12 +47,12 @@ typedef NS_ENUM(NSInteger, RequestType){
#define RESPONSE_SUCCESS @"0" //服务器返回的数据成功信息1、成功,-1,异常,0,错误
@interface AFNOHeaderHttpTool : NSObject
+ (AFNOHeaderHttpTool *)sharedInstance;
//POST请求
-(void) postRequestWihtUrl:(NSString *)url
keys:(NSArray *)keys
values:(NSArray *)values
success:(WBCallBackSuccess)success
failure:(WBCallBackFailed)failure;
////POST请求
//-(void) postRequestWihtUrl:(NSString *)url
// keys:(NSArray *)keys
// values:(NSArray *)values
// success:(WBCallBackSuccess)success
// failure:(WBCallBackFailed)failure;
/**
* 发送一个请求 无请求头参数
*
@@ -78,57 +78,57 @@
//POST请求
-(void) postRequestWihtUrl:(NSString *)url
keys:(NSArray *)keys
values:(NSArray *)values
success:(WBCallBackSuccess)success
failure:(WBCallBackFailed)failure
{
NSURLSession *session = [NSURLSession sharedSession];
NSMutableURLRequest *urlRequest = [self getUrlRequestWithPath:url keysArray:keys valuesArray:values];
NSURLSessionDataTask *sessionDataTask = [session dataTaskWithRequest:urlRequest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
if ([data length] >0 &&
error == nil){
[SVProgressHUD dismissWithDelay:0.3];
id result=[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
NSLog(@"获取数据 resalut = %@",result);
if ([result isKindOfClass:[NSDictionary class]]) {
// NSString *resCode = [NSString stringWithFormat:@"%@",[result objectForKey:RESPONSE_CODE]];//状态码
// //返回数据正确 ,则解析到数据接收内容
// if([resCode integerValue]==kReqSuccess)
// {
/**
获取后台给定的正确码100,做逻辑处理
*/
dispatch_async(dispatch_get_main_queue(), ^{
//直接显示成功信息
success(result);
});
// }else{
// /*
// 获取后台给定的其他错误码,做逻辑处理(暂无数据等)
//-(void) postRequestWihtUrl:(NSString *)url
// keys:(NSArray *)keys
// values:(NSArray *)values
// success:(WBCallBackSuccess)success
// failure:(WBCallBackFailed)failure
//{
//
// NSURLSession *session = [NSURLSession sharedSession];
// NSMutableURLRequest *urlRequest = [self getUrlRequestWithPath:url keysArray:keys valuesArray:values];
// NSURLSessionDataTask *sessionDataTask = [session dataTaskWithRequest:urlRequest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
// if ([data length] >0 &&
// error == nil){
// [SVProgressHUD dismissWithDelay:0.3];
// id result=[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
// NSLog(@"获取数据 resalut = %@",result);
// if ([result isKindOfClass:[NSDictionary class]]) {
//// NSString *resCode = [NSString stringWithFormat:@"%@",[result objectForKey:RESPONSE_CODE]];//状态码
//// //返回数据正确 ,则解析到数据接收内容
//// if([resCode integerValue]==kReqSuccess)
//// {
// /**
// 获取后台给定的正确码100,做逻辑处理
// */
// dispatch_async(dispatch_get_main_queue(), ^{
// failure(result);
// //直接显示成功信息
// success(result);
// });
// }
}else{
NSLog(@"json格式错误");
}
}else if ([data length] == 0 &&
error == nil){
//请求数据长度为0(服务器返回数据内容问题)
[SVProgressHUD dismiss];
}else if (error != nil){
//反馈错误信息(网络连接失败(服务器关停)等信息)
if (error) {
[SVProgressHUD dismiss];
}
}
}];
[sessionDataTask resume];
}
//// }else{
//// /*
//// 获取后台给定的其他错误码,做逻辑处理(暂无数据等)
//// */
//// dispatch_async(dispatch_get_main_queue(), ^{
//// failure(result);
//// });
//// }
// }else{
// NSLog(@"json格式错误");
// }
// }else if ([data length] == 0 &&
// error == nil){
// //请求数据长度为0(服务器返回数据内容问题)
// [SVProgressHUD dismiss];
// }else if (error != nil){
// //反馈错误信息(网络连接失败(服务器关停)等信息)
// if (error) {
// [SVProgressHUD dismiss];
// }
// }
// }];
// [sessionDataTask resume];
//}
+(void) requestWihtMethod:(RequestType)
methodType url : (NSString *)url
params:(NSDictionary *)params
@@ -142,7 +142,7 @@ methodType url : (NSString *)url
AFHTTPRequestOperationManager*manager=[AFHTTPRequestOperationManager manager];
//此类中接口 无安全校验
manager.responseSerializer=[AFHTTPResponseSerializer serializer];
manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json",@"text/json",@"text/javascript",@"text/html", nil];;
//#ifdef ContentType
// manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:ContentType];
//#endif
@@ -171,10 +171,12 @@ methodType url : (NSString *)url
[manager POST:url parameters:params
success:^(AFHTTPRequestOperation* operation, NSDictionary* responseObj) {
if (success) {
[SVProgressHUD dismiss];
success(responseObj);
}
} failure:^(AFHTTPRequestOperation* operation, NSError* error) {
if (failure){
[SVProgressHUD dismiss];
failure(error);
}
}];