Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a99aaf7b 由 cgx
选项

优化网络框架，处理自动登录请求失败异常

1 个父辈 d53db7ba
内嵌 并排
正在显示 14 个修改的文件 包含 179 行增加 和 164 行删除
DreamSleep/DreamSleep/Basement/Network/DSNetworkTool.h
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
// Created by peter on 2022/4/13. // Created by peter on 2022/4/13.
// //
// 响应码 // 自定义响应码
typedef NS_ENUM(NSInteger, DSResCode) { typedef NS_ENUM(NSInteger, DSResCode) {
/** 网络故障 */
DSResCodeNetFail = -9,
/** 业务逻辑成功 */ /** 业务逻辑成功 */
DSResCodeSuccess = 1, DSResCodeSuccess = 1,
/** 业务逻辑失败 */ /** 业务逻辑失败 */
DSResCodeFail = -1, DSResCodeFail = -1,
/** 网络故障 */
DSResCodeNetFail = -9,
/** 服务器数据异常 */ /** 服务器数据异常 */
DSResCodeDataWrong = -666, DSResCodeDataWrong = -666,
}; };
...@@ -25,10 +25,27 @@ typedef NS_ENUM(NSInteger, DSResCode) { ...@@ -25,10 +25,27 @@ typedef NS_ENUM(NSInteger, DSResCode) {
// 响应状态码 // 响应状态码
@property (nonatomic, assign) DSResCode resCode; @property (nonatomic, assign) DSResCode resCode;
// 返回的错误信息 // 返回的错误信息
@property (nonatomic, copy) NSString *errorInfo; @property (nonatomic, copy) NSString *errMessage;
+ (DSNetworkTool *)sharedManager; + (DSNetworkTool *)sharedManager;
/// @param api 请求接口
/// @param params get、post请求统一使用post body
/// @param view view
/// @param hasNetActivity 是否显示网络状态指示器
/// @param loadingInfo 网络加载信息
/// @param hasFailInfo 是否有失败信息
/// @param success success
/// @param failure failure
+ (__kindof NSURLSessionDataTask *)httpPostBodyRequestWithAPI:(NSString *)api
params:(id)params
view:(UIView *)view
hasNetActivity:(BOOL)hasNetActivity
loadingInfo:(NSString *)loadingInfo
hasFailInfo:(BOOL)hasFailInfo
success:(void (^)(NSDictionary *apiDic))success
failure:(void (^)(id failure))failure;
/// 第三方服务商Post请求 /// 第三方服务商Post请求
/// @param host 第三方主机地址 /// @param host 第三方主机地址
/// @param params 请求参数 /// @param params 请求参数
...@@ -47,20 +64,4 @@ typedef NS_ENUM(NSInteger, DSResCode) { ...@@ -47,20 +64,4 @@ typedef NS_ENUM(NSInteger, DSResCode) {
success:(void (^)(NSDictionary *responseObj))success success:(void (^)(NSDictionary *responseObj))success
failure:(void (^)(id failureInfo))failure; failure:(void (^)(id failureInfo))failure;
/// @param api 请求接口
/// @param params get、post请求统一使用post body
/// @param view view
/// @param hasNetActivity 是否显示网络状态指示器
/// @param loadingInfo 网络加载信息
/// @param hasFailInfo 是否有失败信息
/// @param success success
/// @param failure failure
+ (__kindof NSURLSessionDataTask *)httpPostBodyRequestWithAPI:(NSString *)api
params:(id)params
view:(UIView *)view
hasNetActivity:(BOOL)hasNetActivity
loadingInfo:(NSString *)loadingInfo
hasFailInfo:(BOOL)hasFailInfo
success:(void (^)(NSDictionary *apiDic))success
failure:(void (^)(id failure))failure;
@end @end
DreamSleep/DreamSleep/Basement/Network/DSNetworkTool.m
...@@ -29,34 +29,6 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络 ...@@ -29,34 +29,6 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络
return handle; return handle;
} }
+ (__kindof NSURLSessionDataTask *)httpVendorPostRequestWithHost:(NSString *)host
params:(id)params
view:(UIView *)view
hasNetActivity:(BOOL)hasNetActivity
loadingInfo:(NSString *)loadingInfo
hasFailInfo:(BOOL)hasFailInfo
success:(void (^)(NSDictionary *responseObj))success
failure:(void (^)(id failureInfo))failure
{
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:hasNetActivity];
if (loadingInfo) {
view ? [DSProgressHUD showProgressHUDWithInfo:loadingInfo inView:view] : [DSProgressHUD showProgressHUDWithInfo:loadingInfo];
}
NSString *urlString = [host stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
DSLog(@"Vendor Post请求地址：%@，业务参数：%@", urlString, params);
NSURLSessionDataTask *dataTask = [[DSNetworkTool sharedManager] POST:urlString parameters:params headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
DSLog(@"responseObject：%@", responseObject);
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
}];
[dataTask resume];
return dataTask;
}
+ (__kindof NSURLSessionDataTask *)httpPostBodyRequestWithAPI:(NSString *)api + (__kindof NSURLSessionDataTask *)httpPostBodyRequestWithAPI:(NSString *)api
params:(id)params params:(id)params
view:(UIView *)view view:(UIView *)view
...@@ -68,10 +40,11 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络 ...@@ -68,10 +40,11 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络
{ {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:hasNetActivity]; [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:hasNetActivity];
if (loadingInfo) {
view ? [DSProgressHUD showProgressHUDWithInfo:loadingInfo inView:view] : [DSProgressHUD showProgressHUDWithInfo:loadingInfo];
}
}); });
if (loadingInfo) {
view ? [DSProgressHUD showProgressHUDWithInfo:loadingInfo inView:view] : [DSProgressHUD showProgressHUDWithInfo:loadingInfo];
}
NSString *urlString = [APIURL stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; NSString *urlString = [APIURL stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
...@@ -85,14 +58,17 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络 ...@@ -85,14 +58,17 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络
[request addValue:[LoginUtils getSid] forHTTPHeaderField:@"sid"]; [request addValue:[LoginUtils getSid] forHTTPHeaderField:@"sid"];
NSURLSessionDataTask *dataTask = [[DSNetworkTool sharedManager] dataTaskWithRequest:request uploadProgress:nil downloadProgress:nil completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) { NSURLSessionDataTask *dataTask = [[DSNetworkTool sharedManager] dataTaskWithRequest:request uploadProgress:nil downloadProgress:nil completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) {
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO]; dispatch_async(dispatch_get_main_queue(), ^{
if (loadingInfo) { [DSProgressHUD dissmissProgressHUD]; } [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
if (loadingInfo) { [DSProgressHUD dissmissProgressHUD]; }
});
if (responseObject) { if (responseObject) {
NSDictionary *responseDic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil]; NSDictionary *responseDic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
// 数据验证 // 数据验证
if (!responseDic || ![responseDic isKindOfClass:[NSDictionary class]]) { if (!responseDic || ![responseDic isKindOfClass:[NSDictionary class]]) {
failure(ServerDataFormatError); failure(@{@"errorCode":@(DSResCodeDataWrong), @"errMessage":ServerDataFormatError});
if (hasFailInfo) { if (hasFailInfo) {
view ? [DSProgressHUD showDetailInfo:ServerDataFormatError inView:view] : [DSProgressHUD showDetailInfo:ServerDataFormatError]; view ? [DSProgressHUD showDetailInfo:ServerDataFormatError inView:view] : [DSProgressHUD showDetailInfo:ServerDataFormatError];
} }
...@@ -102,29 +78,30 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络 ...@@ -102,29 +78,30 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络
// 接口业务数据 // 接口业务数据
NSString *apiStr = (api && [api isKindOfClass:[NSString class]]) ? api : @""; NSString *apiStr = (api && [api isKindOfClass:[NSString class]]) ? api : @"";
NSDictionary *apiDataDic = responseDic[@"data"][apiStr]; NSDictionary *apiDataDic = responseDic[@"data"][apiStr];
if ([apiDataDic[@"res_code"] intValue] == DSResCodeSuccess) {
NSInteger res_code = [apiDataDic[@"res_code"] integerValue];
if (res_code == DSResCodeSuccess) {
success(apiDataDic); success(apiDataDic);
} else { } else {
failure(apiDataDic[@"error"]); NSString *errMessage = (apiDataDic[@"error"] && [apiDataDic[@"error"] isKindOfClass:[NSString class]]) ? apiDataDic[@"error"] : @"未知错误";
[DSProgressHUD showToast:apiDataDic[@"error"]]; failure(@{@"errorCode":@(res_code), @"errMessage":errMessage});
return; view ? [DSProgressHUD showDetailInfo:errMessage inView:view] : [DSProgressHUD showDetailInfo:errMessage];
} }
} else { } else {
// 网络故障 // 网络异常
DSLog(@"失败错误信息：%@", error); DSLog(@"网络异常错误信息：%@", error);
NSString *netErrMessage = NetworkCancel;
if (error.code != -999) { if (error.code != -999) {
NSString *alerStr = NetworkUnableError; netErrMessage = NetworkUnableError;
if (error.code == -1011) { if (error.code == -1011) {
alerStr = ServerError; netErrMessage = ServerError;
} else if (error.code == -1016) { } else if (error.code == -1016) {
alerStr = ServerDataFormatError; netErrMessage = ServerDataFormatError;
}
failure(alerStr);
if (hasFailInfo) {
view ? [DSProgressHUD showDetailInfo:alerStr inView:view] : [DSProgressHUD showDetailInfo:alerStr];
} }
} else { }
failure(NetworkCancel); failure(@{@"errorCode":@(DSResCodeNetFail), @"errMessage":netErrMessage});
if (hasFailInfo) {
view ? [DSProgressHUD showDetailInfo:netErrMessage inView:view] : [DSProgressHUD showDetailInfo:netErrMessage];
} }
} }
}]; }];
...@@ -132,4 +109,32 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络 ...@@ -132,4 +109,32 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络
return dataTask; return dataTask;
} }
+ (__kindof NSURLSessionDataTask *)httpVendorPostRequestWithHost:(NSString *)host
params:(id)params
view:(UIView *)view
hasNetActivity:(BOOL)hasNetActivity
loadingInfo:(NSString *)loadingInfo
hasFailInfo:(BOOL)hasFailInfo
success:(void (^)(NSDictionary *responseObj))success
failure:(void (^)(id failureInfo))failure
{
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:hasNetActivity];
if (loadingInfo) {
view ? [DSProgressHUD showProgressHUDWithInfo:loadingInfo inView:view] : [DSProgressHUD showProgressHUDWithInfo:loadingInfo];
}
NSString *urlString = [host stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
DSLog(@"Vendor Post请求地址：%@，业务参数：%@", urlString, params);
NSURLSessionDataTask *dataTask = [[DSNetworkTool sharedManager] POST:urlString parameters:params headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
DSLog(@"responseObject：%@", responseObject);
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
}];
[dataTask resume];
return dataTask;
}
@end @end
DreamSleep/DreamSleep/Class/AISleepModule/Controller/AISleepCoachController.m
...@@ -139,6 +139,10 @@ ...@@ -139,6 +139,10 @@
[UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) { [UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {
if (requestModel.resCode == DSResCodeSuccess) { if (requestModel.resCode == DSResCodeSuccess) {
[[NSNotificationCenter defaultCenter] postNotificationName:NeedUpdateStartAI object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:NeedUpdateStartAI object:nil];
} else if (requestModel.resCode == DSResCodeFail) {
// 自动登录失败，清除本地用户信息并且跳转到登录页面
[LoginUtils clearUserLoginData];
[LoginUtils jumpToLoginControllerWithTarget:self];
} }
}]; }];
} }
......
DreamSleep/DreamSleep/Class/AISleepModule/RequestModel/RelaxTrainRequestModel.m
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
@implementation RelaxTrainRequestModel @implementation RelaxTrainRequestModel
+ (NSURLSessionDataTask *)queryRelaxAudioListWithCompletion:(void (^)(RelaxTrainRequestModel *requestModel))completion + (NSURLSessionDataTask *)queryRelaxAudioListWithCompletion:(void (^)(RelaxTrainRequestModel *requestModel))completion {
{
RelaxTrainRequestModel * requestModel = [[RelaxTrainRequestModel alloc] init]; RelaxTrainRequestModel * requestModel = [[RelaxTrainRequestModel alloc] init];
NSString *api = @"query_relax_audio_list"; NSString *api = @"query_relax_audio_list";
NSString *argStr = [NSString stringWithFormat:@"query{%@}", api]; NSString *argStr = [NSString stringWithFormat:@"query{%@}", api];
...@@ -26,8 +25,8 @@ ...@@ -26,8 +25,8 @@
requestModel.trainAudioList = [tmpArr copy]; requestModel.trainAudioList = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -43,8 +42,8 @@ ...@@ -43,8 +42,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/HomeModule/Course/RequestModel/SafeSleepRequestModel.m
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
DSLog(@"睡眠-放松训练-即刻放松音频接口dataDic：%@", apiDic); DSLog(@"睡眠-放松训练-即刻放松音频接口dataDic：%@", apiDic);
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
} }
requestModel.courseListData = [tmpArr copy]; requestModel.courseListData = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
} }
requestModel.subAudioListData = [tmpArr copy]; requestModel.subAudioListData = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
...@@ -78,8 +78,14 @@ ...@@ -78,8 +78,14 @@
[super viewWillAppear:animated]; [super viewWillAppear:animated];
if ([LoginUtils getUserLoginData]) { if ([LoginUtils getUserLoginData]) {
// 自动登录请求(调用时机) // 自动登录请求（每次APP首页显示的时候调用）
[UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {}]; [UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {
// 自动登录失败，清除本地用户信息并且跳转到登录页面
if (requestModel.resCode == DSResCodeFail) {
[LoginUtils clearUserLoginData];
[LoginUtils jumpToLoginControllerWithTarget:self];
}
}];
} }
[self.homeTV.headerView controllerWillAppear]; [self.homeTV.headerView controllerWillAppear];
...@@ -138,7 +144,7 @@ ...@@ -138,7 +144,7 @@
// 创建全局并行 // 创建全局并行
dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
dispatch_group_t group = dispatch_group_create(); dispatch_group_t group = dispatch_group_create();
dispatch_group_async(group, queue, ^{ dispatch_group_async(group, queue, ^{
// 获取首页banner数据 // 获取首页banner数据
[HomeRequestModel queryBannerListWithCompletion:^(HomeRequestModel * _Nonnull requestModel) { [HomeRequestModel queryBannerListWithCompletion:^(HomeRequestModel * _Nonnull requestModel) {
...@@ -166,9 +172,8 @@ ...@@ -166,9 +172,8 @@
dispatch_group_async(group, queue, ^{ dispatch_group_async(group, queue, ^{
// 获取首页助眠音乐数据 // 获取首页助眠音乐数据
[SafeSleepRequestModel getCourseListDataWithSubID:18 isHome:YES completion:^(SafeSleepRequestModel * _Nonnull requestModel) { [SafeSleepRequestModel getCourseListDataWithSubID:18 isHome:YES completion:^(SafeSleepRequestModel * _Nonnull requestModel) {
[self.homeTV.mj_header endRefreshing];
if (requestModel.resCode == DSResCodeSuccess) { if (requestModel.resCode == DSResCodeSuccess) {
NSLog(@"获取首页助眠音乐数据成功..."); DSLog(@"获取首页助眠音乐数据成功...");
dispatch_semaphore_signal(semaphore); dispatch_semaphore_signal(semaphore);
self.helpListData = requestModel.courseListData; self.helpListData = requestModel.courseListData;
} else { } else {
...@@ -179,9 +184,8 @@ ...@@ -179,9 +184,8 @@
dispatch_group_async(group, queue, ^{ dispatch_group_async(group, queue, ^{
// 获取白噪音类型请求 // 获取白噪音类型请求
[WhiteNoiseRequestModel queryRelaxWhiteNoiseTypeWithCompletion:^(WhiteNoiseRequestModel * _Nonnull requestModel) { [WhiteNoiseRequestModel queryRelaxWhiteNoiseTypeWithCompletion:^(WhiteNoiseRequestModel * _Nonnull requestModel) {
[self.homeTV.mj_header endRefreshing];
if (requestModel.resCode == DSResCodeSuccess) { if (requestModel.resCode == DSResCodeSuccess) {
NSLog(@"获取白噪音类型请求成功..."); DSLog(@"获取白噪音类型请求成功...");
dispatch_semaphore_signal(semaphore); dispatch_semaphore_signal(semaphore);
self.noiseTypeArr = requestModel.noiseTypeArr; self.noiseTypeArr = requestModel.noiseTypeArr;
} else { } else {
...@@ -189,16 +193,18 @@ ...@@ -189,16 +193,18 @@
} }
}]; }];
}); });
dispatch_group_notify(group, queue, ^{ dispatch_group_notify(group, queue, ^{
// 四个请求对应四次信号等待 // 四个请求对应四次信号等待
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
// 在这里进行请求后的方法，回到主线程 // 在这里进行请求后的方法，回到主线程
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[self.homeTV.mj_header endRefreshing];
// 更新UI操作 // 更新UI操作
[self.homeTV refreshBarnner:self.bannerListData]; [self.homeTV refreshBarnner:self.bannerListData];
[self.homeTV updateCourseMusicCell:CellTypeCourse data:self.safeListData]; [self.homeTV updateCourseMusicCell:CellTypeCourse data:self.safeListData];
......
DreamSleep/DreamSleep/Class/HomeModule/Home/RequestModel/HomeRequestModel.m
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
requestModel.bannerListData = [tmpArr copy]; requestModel.bannerListData = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
requestModel.promotionModel = pModel; requestModel.promotionModel = pModel;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/HomeModule/WhiteNoise/RequestModel/WhiteNoiseRequestModel.m
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
requestModel.noiseTypeArr = [tmpArr copy]; requestModel.noiseTypeArr = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
requestModel.noiseAudioArr = [tmpArr copy]; requestModel.noiseAudioArr = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/Feedback/RequestModel/FeedbackRequestModel.m
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
requestModel.unreadCount = unreadCount; requestModel.unreadCount = unreadCount;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
requestModel.result_imgurls = apiDic[@"result"]; requestModel.result_imgurls = apiDic[@"result"];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/InviteFriend/RequestModel/ShareRequestModel.m
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/ScoreTaskRequestModel.m
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
MyScoreModel *scoreModel = [MyScoreModel yy_modelWithDictionary:resultDic]; MyScoreModel *scoreModel = [MyScoreModel yy_modelWithDictionary:resultDic];
requestModel.scoreModel = scoreModel; requestModel.scoreModel = scoreModel;
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
requestModel.userRankModel = userRankModel; requestModel.userRankModel = userRankModel;
requestModel.otherRankList = [tmpArr copy]; requestModel.otherRankList = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -71,9 +71,9 @@ ...@@ -71,9 +71,9 @@
} }
requestModel.pointList = [tmpArr copy]; requestModel.pointList = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -96,9 +96,9 @@ ...@@ -96,9 +96,9 @@
} }
requestModel.signList = [tmpArr copy]; requestModel.signList = [tmpArr copy];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -133,9 +133,9 @@ ...@@ -133,9 +133,9 @@
requestModel.task_news = [tmp_task_news copy]; requestModel.task_news = [tmp_task_news copy];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -153,9 +153,9 @@ ...@@ -153,9 +153,9 @@
requestModel.date_point = [resultDic[@"date_point"] intValue]; requestModel.date_point = [resultDic[@"date_point"] intValue];
requestModel.total_point = [resultDic[@"total_points"] intValue]; requestModel.total_point = [resultDic[@"total_points"] intValue];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -173,9 +173,9 @@ ...@@ -173,9 +173,9 @@
requestModel.date_point = [resultDic[@"date_point"] intValue]; requestModel.date_point = [resultDic[@"date_point"] intValue];
requestModel.total_point = [resultDic[@"total_points"] intValue]; requestModel.total_point = [resultDic[@"total_points"] intValue];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -193,9 +193,9 @@ ...@@ -193,9 +193,9 @@
requestModel.date_point = [resultDic[@"date_point"] intValue]; requestModel.date_point = [resultDic[@"date_point"] intValue];
requestModel.total_point = [resultDic[@"total_points"] intValue]; requestModel.total_point = [resultDic[@"total_points"] intValue];
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -209,9 +209,9 @@ ...@@ -209,9 +209,9 @@
DSLog(@"每日任务更新任务状态接口dataDic：%@", apiDic); DSLog(@"每日任务更新任务状态接口dataDic：%@", apiDic);
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -225,9 +225,9 @@ ...@@ -225,9 +225,9 @@
DSLog(@"新手任务更新任务状态接口dataDic：%@", apiDic); DSLog(@"新手任务更新任务状态接口dataDic：%@", apiDic);
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id failure) { } failure:^(id failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failure; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/UserLogin/LoginController.m
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
[DataStatisticsUtil event:Wx_Login attributes:@{@"name":@"登录成功"}]; [DataStatisticsUtil event:Wx_Login attributes:@{@"name":@"登录成功"}];
} else { } else {
[DSProgressHUD showToast:requestModel.errorInfo]; [DSProgressHUD showToast:requestModel.errMessage];
[DataStatisticsUtil event:Wx_Login attributes:@{@"name":@"登录失败"}]; [DataStatisticsUtil event:Wx_Login attributes:@{@"name":@"登录失败"}];
} }
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
[DataStatisticsUtil event:Apple_Login attributes:@{@"name":@"登录成功"}]; [DataStatisticsUtil event:Apple_Login attributes:@{@"name":@"登录成功"}];
} else { } else {
[DSProgressHUD showToast:requestModel.errorInfo]; [DSProgressHUD showToast:requestModel.errMessage];
[DataStatisticsUtil event:Apple_Login attributes:@{@"name":@"登录失败"}]; [DataStatisticsUtil event:Apple_Login attributes:@{@"name":@"登录失败"}];
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/UserLogin/UserRequestModel.m
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
[LoginUtils saveUserLoginData:userModel]; [LoginUtils saveUserLoginData:userModel];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
[LoginUtils saveUserLoginData:userModel]; [LoginUtils saveUserLoginData:userModel];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
NSString *api = @"auto_login"; NSString *api = @"auto_login";
NSString *token = [LoginUtils getToken]; NSString *token = [LoginUtils getToken];
NSString *argStr = [NSString stringWithFormat:@"mutation{%@(token:\"%@\")}", api, token]; NSString *argStr = [NSString stringWithFormat:@"mutation{%@(token:\"%@\")}", api, token];
return [self httpPostBodyRequestWithAPI:api params:@{@"query" : argStr} view:nil hasNetActivity:YES loadingInfo:nil hasFailInfo:NO success:^(NSDictionary * _Nonnull apiDic) { return [self httpPostBodyRequestWithAPI:api params:@{@"query" : argStr} view:nil hasNetActivity:YES loadingInfo:nil hasFailInfo:YES success:^(NSDictionary * _Nonnull apiDic) {
DSLog(@"用户自动登录接口apiDic：%@\n, token：%@\n, sid：%@", apiDic, token, [LoginUtils getSid]); DSLog(@"用户自动登录接口apiDic：%@\n, token：%@\n, sid：%@", apiDic, token, [LoginUtils getSid]);
NSDictionary *resultDic = apiDic[@"result"]; NSDictionary *resultDic = apiDic[@"result"];
NSDictionary *userDic = resultDic[@"user"]; NSDictionary *userDic = resultDic[@"user"];
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
requestModel.resCode = DSResCodeSuccess; requestModel.resCode = DSResCodeSuccess;
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/Start/AppUpdate/VersionRequestModel.m
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
requestModel.update_Way = [resultDic[@"Update_Way"] intValue]; requestModel.update_Way = [resultDic[@"Update_Way"] intValue];
completion(requestModel); completion(requestModel);
} failure:^(id _Nonnull failureInfo) { } failure:^(id _Nonnull failureInfo) {
requestModel.resCode = DSResCodeNetFail; requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errorInfo = failureInfo; requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel); completion(requestModel);
}]; }];
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!