Skip to content

O
Opple-iOS
Commit 1cb9debf authored by 曹云霄's avatar 曹云霄
Browse files
Options

no message

parent a95f802a
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 114 deletions
Class/AllCustomerViewController.m
View file @ 1cb9debf
......@@ -122,7 +122,7 @@
weakSelf.allCustomerTableview.emptyDataSetDelegate = weakSelf;
[XBLoadingView hideHUDViewWithDefault];
[weakSelf endRefreshingForTableView:weakSelf.allCustomerTableview];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.CustomerresultArray removeAllObjects];
}
......
Class/Announcement/Controllers/AnnouncementViewController.m
View file @ 1cb9debf
......@@ -183,7 +183,7 @@
[weakSelf endRefreshingForTableView:weakSelf.announcementTableView];
weakSelf.announcementTableView.emptyDataSetSource = weakSelf;
weakSelf.announcementTableView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.afficheArray removeAllObjects];
}
......
Class/Announcement/Controllers/AnnountcementDetailViewController.m
View file @ 1cb9debf
......@@ -104,7 +104,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(AFFICHEdETAILS),self.announcementEntity.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.afficheResult = [[CustomTOAfficheEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
WkWebViewViewController *webView = [weakSelf.childViewControllers firstObject];
webView.htmlString = weakSelf.afficheResult.content;
......@@ -131,7 +131,7 @@
url = [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"`#%^{}\"[]|\\<> "].invertedSet];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:url withRequestType:ZERO withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (weakSelf.readBlock) {
weakSelf.readBlock();
}
......
Class/ApplyPrizeViewController.m
View file @ 1cb9debf
......@@ -136,7 +136,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(SAVEPRIZEBILL) withRequestType:ZERO withParameter:self.prizeBill withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"申请成功" completeBlock:^{
if (weakSelf.requestFinishBlock) {
weakSelf.requestFinishBlock();
......
Class/BindingBankCARDViewController.m
View file @ 1cb9debf
......@@ -94,7 +94,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(VALIDATION) withRequestType:ZERO withParameter:entity withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"验证成功" completeBlock:^{
BindingSuccessViewController *bindingSuccess = [[[weakSelf class] getMainStoryboardClass]instantiateViewControllerWithIdentifier:@"BindingSuccessViewController"];
bindingSuccess.bankType = type;
......
Class/BindingSuccessViewController.m
View file @ 1cb9debf
......@@ -38,7 +38,7 @@
NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(SENDSMSBANK),self.bankEntity.phoneNumber,[Shoppersmanager manager].Shoppers.employee.userName];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[self returnUrlString:urlString] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"发送成功" completeBlock:^{
[weakSelf.sendButton startWithTime:60 title:@"获取验证码" countDownTitle:@"秒后重发" mainColor:kMainBlueColor countColor:kMainBlueColor];
}];
......@@ -78,7 +78,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(BINDING) withRequestType:ZERO withParameter:entity withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"绑定成功" completeBlock:^{
[weakSelf.navigationController popToRootViewControllerAnimated:YES];
}];
......
Class/CardBeenUseViewController.m
View file @ 1cb9debf
......@@ -104,7 +104,7 @@
weakSelf.beenUseCardCollectionView.emptyDataSetSource = self;
weakSelf.beenUseCardCollectionView.emptyDataSetDelegate = self;
[weakSelf endRefreshingForTableView:weakSelf.beenUseCardCollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
weakSelf.totalPage = cardInformation.totalpages;
if (isRemove) {
......@@ -130,7 +130,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] withRequestType:ZERO withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf deleteUsedJDECard:JDECardNumber];
}else{
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......
Class/CardDontUseViewController.m
View file @ 1cb9debf
......@@ -122,7 +122,7 @@
weakSelf.dontUseCardCollectionView.emptyDataSetSource = weakSelf;
weakSelf.dontUseCardCollectionView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.dontUseCardCollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
if (isRemove) {
[weakSelf.datasArray removeAllObjects];
......@@ -243,7 +243,7 @@
XBLoadingView *progressView = [XBLoadingView showHUDViewProgressLabel:@"上传小票中"];
[[NetworkRequestClassManager manager] uploadImageWithURL:SERVERREQUESTURL(UPLOADHEADER) withRequestType:ONE withImageDatas:data withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf activationJDECard:returnValue[@"data"]];
}else
{
......@@ -273,7 +273,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(ACTIVIATIONJDECARD),self.orderNumber,imagePath] withRequestType:ZERO withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"激活成功" completeBlock:^{
weakSelf.isRefreshValue = NO;
[weakSelf.dontUseCardCollectionView.mj_header beginRefreshing];
......
Class/CardViewController.m
View file @ 1cb9debf
......@@ -68,7 +68,7 @@
weakSelf.cardCollectionView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.cardCollectionView];
[XBLoadingView hideHUDViewWithDefaultWithView:weakSelf.view];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf.datasArray removeAllObjects];
RsSimpleJingDongECardResponse *cardInformation = [[RsSimpleJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
......@@ -95,7 +95,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] withRequestType:ZERO withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefaultWithView:weakSelf.view];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf deleteUsedJDECard:JDECardNumber];
}else{
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......
Class/ChangePasswordViewController.m
View file @ 1cb9debf
......@@ -83,7 +83,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(MODIFYPASSWORD) withRequestType:ZERO withParameter:modify withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
//保存最新的账号信息
[Shoppersmanager manager].passWordString = weakSelf.NewPassWord.text;
if ([weakSelf.delegate respondsToSelector:@selector(cancelButtonClick)]) {
......
Class/ClientShoppingCarViewController.m
View file @ 1cb9debf
......@@ -81,7 +81,7 @@
weakSelf.clientShoppingCarTableView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.clientShoppingCarTableView];
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.shopResponseArray removeAllObjects];
}
......
Class/ClientViewController.m
View file @ 1cb9debf
......@@ -160,7 +160,7 @@
weakSelf.informationTableview.emptyDataSetDelegate = weakSelf;
[XBLoadingView hideHUDViewWithDefault];
[weakSelf endRefreshingForTableView:weakSelf.informationTableview];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.CustomerresultArray removeAllObjects];
......@@ -421,7 +421,7 @@
XBLoadingView *progressView = [XBLoadingView showHUDViewProgressLabel:@"上传头像中"];
[[NetworkRequestClassManager manager] uploadImageWithURL:SERVERREQUESTURL(UPLOADHEADER) withRequestType:ONE withImageDatas:data withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf modifyshoppersInformation:returnValue[@"data"] complete:^{
complete(returnValue[@"data"]);
}];
......@@ -454,7 +454,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ADDCONSUMER) withRequestType:ZERO withParameter:customerEntity withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"修改成功" completeBlock:^{
block();
}];
......@@ -490,7 +490,7 @@
MyclientEntityModel *model = [Customermanager manager].model;
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SAVEVISITEDTIME),model.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSLog(@"写入客户访问时间成功");
}
} withFailureBlock:^(id error) {
......@@ -584,7 +584,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ADDCONSUMER) withRequestType:ZERO withParameter:customerEntity withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
//进入刷新状态
[weakSelf.informationTableview.mj_header beginRefreshing];
......@@ -633,7 +633,7 @@
address.address = self.customerAddress.text;
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ADDADDRESS) withRequestType:ZERO withParameter:address withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSLog(@"写入默认收货地址成功");
}
......
Class/CustomerOrderViewController.m
View file @ 1cb9debf
......@@ -148,7 +148,7 @@
weakSelf.customerOrderTableView.emptyDataSetDelegate = weakSelf;
[XBLoadingView hideHUDViewWithDefault];
[weakSelf endRefreshingForTableView:weakSelf.customerOrderTableView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isdelecte) {
[weakSelf.datasArray removeAllObjects];
......@@ -319,7 +319,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@",SERVERREQUESTURL(RESETORDER),model.order.orderNumber,model.order.orderState,@"005"] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"撤销成功" completeBlock:nil];
model.order.orderState = @"005";
NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0];
......
Class/IntegralDetailsViewController.m
View file @ 1cb9debf
......@@ -109,7 +109,7 @@
[weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf;
weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.datasArray removeAllObjects];
}
......@@ -142,7 +142,7 @@
[weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf;
weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.datasArray removeAllObjects];
}
......
Class/LearningCenter/ComprehensiveDiscussion/ForumItemDetailViewController.m
View file @ 1cb9debf
......@@ -109,7 +109,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(POSTDETAIL) withRequestType:ZERO withParameter:self.condition withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.commentsArray removeAllObjects];
}
......@@ -234,7 +234,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(REPLYPOST) withRequestType:ZERO withParameter:reply withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.commentInputTextFieldView.text = nil;
[XBLoadingView showHUDViewWithSuccessText:@"评论成功" completeBlock:^{
if (weakSelf.refreshBlock) {
......@@ -293,7 +293,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(DELETEPOST),self.topicDetail.fid] withRequestType:NetworkRequestWithDELETE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"删除成功" completeBlock:^{
if (weakSelf.delectBlock) {
weakSelf.delectBlock(weakSelf.topicDetail.fid);
......@@ -335,7 +335,7 @@
[XBLoadingView showHUDViewWithDefault];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(BASEREPLY),self.topicDetail.fid,replyId,isBest?@"true":@"false"] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf getPostDetailAction:YES];
}else {
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......@@ -355,7 +355,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:url withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
sender.selected = !sender.selected;
//刷新列表
if (weakSelf.refreshBlock) {
......
Class/LearningCenter/ComprehensiveDiscussion/ForumItemListViewController.m
View file @ 1cb9debf
......@@ -104,7 +104,7 @@
[weakSelf endRefreshingForTableView:weakSelf.classificationListTableView];
weakSelf.classificationListTableView.emptyDataSetSource = weakSelf;
weakSelf.classificationListTableView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.datasArray removeAllObjects];
}
......
Class/LearningCenter/ComprehensiveDiscussion/ForumViewController.m
View file @ 1cb9debf
......@@ -55,7 +55,7 @@
[XBLoadingView hideHUDViewWithDefault];
[weakSelf endRefreshingForTableView:weakSelf.forumTableView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.category = [[ForumCategoryResponse alloc] initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.forumTableView reloadData];
}else{
......
Class/LearningCenter/ComprehensiveDiscussion/ReleasePostViewController.m
View file @ 1cb9debf
......@@ -458,7 +458,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(SUBMITTOPIC) withRequestType:ZERO withParameter:topic withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"发布成功" completeBlock:^{
if (weakSelf.finishBlock) {
weakSelf.finishBlock();
......
Class/LearningCenter/LearningCenterMain/LearningCenterMainViewController.m
View file @ 1cb9debf
......@@ -80,7 +80,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:url withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
RsScoreDetails *integralDatas = [[RsScoreDetails alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf setUpIntegral:integralDatas];
......
Class/LearningCenter/OnlineLearning/AssessmentViewController.m
View file @ 1cb9debf
......@@ -62,7 +62,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(STUDYITEMDETAIL),self.taskId] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.taskDetails = [[TOStudyTaskEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf assessmentCountdown];
[weakSelf.assessmentTableView reloadData];
......@@ -234,7 +234,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(SUBMITANSWER) withRequestType:ZERO withParameter:studyResult withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf determineIsQualified:[studyResult.grade integerValue]];
}else{
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......@@ -266,7 +266,7 @@
[XBLoadingView showHUDViewWithDefault];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),INSPECTIONTHROUGH] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
AssessmentQualifiedViewController *qualified = [[[weakSelf class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"AssessmentQualifiedViewController"];
qualified.delegate = self;
qualified.intrgral = [NSString stringWithFormat:@"+%@",returnValue[@"data"]];
......
Class/LearningCenter/OnlineLearning/OnlineLearningDetailViewController.m
View file @ 1cb9debf
......@@ -149,7 +149,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(STUDYLIST) withRequestType:ZERO withParameter:studyListModel withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.studyResult = [[StudyTaskResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf transferData:weakSelf.studyResult];
}else {
......@@ -214,7 +214,7 @@
playTimeEntity.playPercent = [NSString stringWithFormat:@"%.2lf",percent];
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ATTACHMENTPLAYTIME) withRequestType:ZERO withParameter:playTimeEntity withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
attachment.playTime = playTimeEntity.playTime;
attachment.playPercent = playTimeEntity.playPercent;
}else {
......@@ -257,7 +257,7 @@
// 任务一，学习项完成
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(FINISHSTUDY),studuEntity.fid,[Shoppersmanager manager].Shoppers.employee.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
}else {
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......@@ -272,7 +272,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),STUDYFINISH] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (getIntegral) {
getIntegral(returnValue[@"data"]);
}
......
Class/LearningCenter/OnlineLearning/OnlineLearningViewController.m
View file @ 1cb9debf
......@@ -46,7 +46,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(STUDYTYPES) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
StudyTypeResponse *response = [[StudyTypeResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.studyTypeArray addObjectsFromArray:response.types];
}else {
......
Class/LearningCenter/SkillsAssessment/AnswerViewController.m
View file @ 1cb9debf
......@@ -53,7 +53,7 @@
[XBLoadingView showHUDViewWithDefault];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETPASSLEVELDETAILS),self.passLevelId] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.emigrated = [[TOPassLevelEntity alloc] initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.answerTableView reloadData];
}else {
......@@ -266,7 +266,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(SUBMITEMIGRATEDANSWER) withRequestType:ZERO withParameter:studyResult withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf determineIsQualified:[studyResult.grade integerValue] passResult:[studyResult.passResult integerValue]];
if ([weakSelf.delegate respondsToSelector:@selector(emigratedFinish)]) {
[weakSelf.delegate emigratedFinish];
......@@ -302,7 +302,7 @@
NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),RECRUITTHROUGH];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:url withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
finish.state = ONE;
finish.score = [NSString stringWithFormat:@"%ld",allScore];
finish.integral = [NSString stringWithFormat:@"+%@",returnValue[@"data"]];
......
Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m
View file @ 1cb9debf
......@@ -45,7 +45,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(THROUGHLIST) withRequestType:ZERO withParameter:emigrated withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.emigratedResponse = [[PassLevelResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf setUpEmigratedItem];
}else {
......
Class/Login/LoginViewController.m
View file @ 1cb9debf
......@@ -168,7 +168,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(LOGIN) withRequestType:ZERO withParameter:login withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
//设置检测用户标示
[Bugly setUserIdentifier:weakSelf.userName.text];
......@@ -291,7 +291,7 @@
NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(SENDSMS),inputPhoneNumber,self.identityView.userName.text];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[self returnUrlString:urlString] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithText:@"发送验证码成功"];
[weakSelf.identityView.SendButton setTitle:@"60" forState:UIControlStateNormal];
weakSelf.identityView.SendButton.enabled = NO;
......@@ -382,7 +382,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(RESETPASSWORD) withRequestType:ZERO withParameter:passwrod withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithText:@"重置密码成功"];
weakSelf.passWord.text = weakSelf.resetPasswordView.newpass.text;
......@@ -426,7 +426,7 @@
NSString *string = [NSString stringWithFormat:@"/employee/getUpgrade?apptype=IOS&version=%@",version];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(string) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSDictionary *dict = returnValue[@"data"];
if (!dict || [dict isKindOfClass:[NSNull class]]) {
return;
......
Class/LuckyDrawDetailsViewController.m
View file @ 1cb9debf
......@@ -134,7 +134,7 @@
weakSelf.drawDetailsTableView.emptyDataSetSource = weakSelf;
weakSelf.drawDetailsTableView.emptyDataSetDelegate = weakSelf;
[XBLoadingView hideHUDViewWithDefaultWithView:weakSelf.view];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.datasArray removeAllObjects];
}
......
Class/Message/Cells/MessageTableViewCell.h
View file @ 1cb9debf
......@@ -21,4 +21,9 @@
发布时间
*/
@property (weak, nonatomic) IBOutlet UILabel *releaseTimeLabel;
/**
是否未读
*/
@property (weak, nonatomic) IBOutlet UIImageView *isReadedImageView;
@end
Class/Message/Controllers/MessageViewController.m
View file @ 1cb9debf
......@@ -48,6 +48,7 @@
#pragma mark -UI
- (void)uiConfigAction
{
[[NSNotificationCenter defaultCenter] postNotificationName:MESSAGE_COUNT object:@0];
self.meesageTableView.tableFooterView = [UIView new];
[self.timeOrderButton addTarget:self action:@selector(timeOrderClickAction:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -85,7 +86,7 @@
[XBLoadingView hideHUDViewWithDefault];
[weakSelf endRefreshingForTableView:weakSelf.meesageTableView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.messageArray removeAllObjects];
}
......@@ -99,6 +100,24 @@
}];
}
#pragma mark -设为已读
- (void)readedMessage:(NSString *)messageId withIndexPath:(NSIndexPath *)indexPath
{
WS(weakSelf);
[XBLoadingView showHUDViewWithDefault];
[[NetworkRequestClassManager manager] networkRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(MESSAGE_READ),messageId,[Shoppersmanager manager].Shoppers.employee.fid] withRequestType:0 withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if (RESULT(returnValue)) {
TONoticeEntity *entity = weakSelf.messageArray[indexPath.row];
entity.state = @"0";
[weakSelf.meesageTableView reloadData];
}
} withFailureBlock:^(NSError *error) {
[XBLoadingView showHUDViewWithText:error.localizedDescription];
}];
}
#pragma mark -UITableViewDataSource
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
......@@ -116,6 +135,11 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
WS(weakSelf);
[self promptBoxWithMessage:@"是否设置为已读" cancelBlock:nil sureBlock:^{
TONoticeEntity *entity = weakSelf.messageArray[indexPath.row];
[weakSelf readedMessage:entity.fid withIndexPath:indexPath];
}];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
......@@ -130,7 +154,9 @@
- (void)configCell:(MessageTableViewCell *)cell withIndexPath:(NSIndexPath *)indexPath
{
TONoticeEntity *entity = self.messageArray[indexPath.row];
cell.messageLabel.text = @"常量和变量的名字不能包含空白字符、数学符号、箭头、保留的（或者无效的）Unicode 码位、连线和制表符。也不能以数字开头，尽管数字几乎可以使用在名字其他的任何地方。一旦你声明了一个确定类型的常量或者变量，就不能使用相同的名字再次进行声明，也不能让它改存其他类型的值。常量和变量之间也不能互换。";
BOOL boolValue = [entity.state integerValue];
cell.isReadedImageView.hidden = boolValue;
cell.messageLabel.text = entity.message;
cell.releaseTimeLabel.text = entity.createDate;
}
......
Class/OrderRecordViewController.m
View file @ 1cb9debf
......@@ -81,7 +81,7 @@
weakSelf.orderRecordTableView.emptyDataSetDelegate = weakSelf;
[XBLoadingView hideHUDViewWithDefault];
[weakSelf endRefreshingForTableView:weakSelf.orderRecordTableView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.orderRecordArray removeAllObjects];
}
......
Class/OrderdetailsViewController.m
View file @ 1cb9debf
......@@ -195,7 +195,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(ORDERDETAILS),self.orderCode] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.orderDetails = [[OrderBill alloc]initWithDictionary:returnValue[@"data"] error:nil];
}else{
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......@@ -213,7 +213,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
dispatch_group_leave(group);
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf.promotionInformationArray removeAllObjects];
[weakSelf.guidePromotionArray removeAllObjects];
[weakSelf.customerPromotionArray removeAllObjects];
......@@ -258,7 +258,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
dispatch_group_leave(group);
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf.promotionInformationArray removeAllObjects];
[weakSelf.guidePromotionArray removeAllObjects];
[weakSelf.customerPromotionArray removeAllObjects];
......@@ -349,7 +349,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
queryDrawState.page = page;
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(LOTTERYED) withRequestType:ZERO withParameter:queryDrawState withReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSDictionary *dict = [returnValue[@"data"][@"list"] firstObject];
resultModel = [[RsAwardDraw alloc]initWithDictionary:dict error:nil];
}
......@@ -535,7 +535,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:USEWECHATCARD,number,orderNumber,orderTotal] withRequestType:ZERO withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.weChatModel.wxcardDenomation = [returnValue[@"data"][@"denomation"] integerValue];
weakSelf.weChatModel.payNo = returnValue[@"data"][@"payNo"];
for (JSONModel *model in weakSelf.promotionInformationArray) {
......@@ -1029,7 +1029,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[XBLoadingView showHUDViewWithDefault];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@",SERVERREQUESTURL(RESETORDER),_orderCode,@"001",@"005"] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"撤销成功" completeBlock:nil];
UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 0.01)];
[weakSelf.orderDetailsTableview beginUpdates];
......
Class/PaymentsViewController.m
View file @ 1cb9debf
......@@ -104,7 +104,7 @@
weakSelf.paymentsTableView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.paymentsTableView];
[XBLoadingView hideHUDViewWithDefaultWithView:weakSelf.view];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemoveAll) {
[weakSelf.resultArray removeAllObjects];
}
......
Class/PerfectInformation/PerfectInformationViewController.m
View file @ 1cb9debf
......@@ -175,7 +175,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(MODITYSHOPPERSINFORMATION) withRequestType:ZERO withParameter:employ withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"修改成功" completeBlock:^{
[weakSelf dismissViewControllerAnimated:YES completion:nil];
}];
......
Class/PrizeExchangeDetailsViewController.m
View file @ 1cb9debf
......@@ -55,7 +55,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:url withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.prizeBillResult = [[prizeOrderDetailsModel alloc]initWithDictionary:returnValue[@"data"] error:nil];
}else {
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......
Class/PrizeMainViewController.m
View file @ 1cb9debf
......@@ -93,7 +93,7 @@
[weakSelf endRefreshingForTableView:weakSelf.prizeListCollectionView];
weakSelf.prizeListCollectionView.emptyDataSetSource = weakSelf;
weakSelf.prizeListCollectionView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.prizeDatasArray removeAllObjects];
}
......@@ -116,7 +116,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(EXCHANGEQUALIFICATION),[Shoppersmanager manager].Shoppers.employee.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.isQualified = [returnValue[@"data"] integerValue];
}else {
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......
Class/ProductDetailsViewController.m
View file @ 1cb9debf
......@@ -94,7 +94,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:url withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.entity = [[TOGoodsEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.productDetilsTableview reloadData];
[weakSelf HeaderViewAssignment];
......@@ -388,7 +388,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) withRequestType:ZERO withParameter:shopCar withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSLog(@"添加购物车成功");
[weakSelf StartAddShoppingCarAnimationWithimage:weakSelf.headerView.goodsImageview.image withStartpoint:[weakSelf.headerView convertPoint:[weakSelf.headerView.goodsImageview center] toView:weakSelf.view.window] withSize:weakSelf.headerView.goodsImageview.frame.size];
}else
......
Class/ProductLibraryViewController.m
View file @ 1cb9debf
......@@ -160,7 +160,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(PRODUCTSCREENING) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.screeningDatas removeAllObjects];
}
......@@ -195,7 +195,7 @@
weakSelf.productCollectionView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.productCollectionView];
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
GoodsResponse *sponse = [[GoodsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
weakSelf.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
......@@ -347,7 +347,7 @@
[weakSelf endRefreshingForTableView:self.productCollectionView];
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if ([returnValue[@"data"] isKindOfClass:[NSNull class]]) {
[XBLoadingView showHUDViewWithText:@"暂无商品信息"];
......@@ -716,7 +716,7 @@
shopCar.goodsId = model.fid;
shopCar.count = @"1";
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) withRequestType:ZERO withParameter:shopCar withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
response();
}else
{
......
Class/RebateDetailsViewController.m
View file @ 1cb9debf
......@@ -60,7 +60,7 @@
NSLog(@"%@",[[withdrawal toDictionary] JSONString]);
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(WITHDRAWAL) withRequestType:ZERO withParameter:withdrawal withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.applyUUID = returnValue[@"data"];
[weakSelf rebateApplySuccess];
}else
......@@ -105,7 +105,7 @@
NSString *urlString = [NSString stringWithFormat:@"%@/%@",WITHDRAWALPROGRESSDETAILS,self.applyUUID];
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(urlString) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
TOApplyBillEntity *result = [[TOApplyBillEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.navigationController popViewControllerAnimated:NO];
if (weakSelf.showApplyDetails) {
......
Class/RebateViewController.m
View file @ 1cb9debf
......@@ -158,7 +158,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(url) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.resultEntity = [[EarningsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf setUpRichTextString:weakSelf.resultEntity];
}else
......@@ -276,7 +276,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(UNBINDING),entity.bankAccount] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"解除绑定成功" completeBlock:^{
[weakSelf getRebateDatasFromUser];
}];
......
Class/SceneLibraryViewController.m
View file @ 1cb9debf
......@@ -142,7 +142,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.filter = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
}
else
......@@ -166,7 +166,7 @@
weakSelf.seceneLibararyCollectionView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.seceneLibararyCollectionView];
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.responseArray removeAllObjects];
}
......
Class/SearchViewController.m
View file @ 1cb9debf
......@@ -156,7 +156,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(HOTSEARCH) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
weakSelf.response = [[HotFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.hotCollectionView reloadData];
......
Class/SettlementViewController.m
View file @ 1cb9debf
......@@ -189,7 +189,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager ] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(QRCODE) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSLog(@"获取二维码成功");
weakSelf.zhiFubaoLabe = returnValue[@"data"][@"zhifubao"];
......@@ -474,7 +474,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) withRequestType:ZERO withParameter:order withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf dismissViewControllerAnimated:YES completion:^{
if (weakSelf.PaySuccessReturnBlock) {
weakSelf.PaySuccessReturnBlock();
......
Class/Shoppingcart/AddressViewController.m
View file @ 1cb9debf
......@@ -189,7 +189,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ADDADDRESS) withRequestType:ZERO withParameter:address withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
AddressModel *model = [[AddressModel alloc]init];
model.name = weakSelf.recipientPerson.text;
......@@ -242,7 +242,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(CHANGEADDRESS) withRequestType:ZERO withParameter:address withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
AddressModel *model = [[AddressModel alloc]init];
model.name = weakSelf.recipientPerson.text;
......@@ -298,7 +298,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(REMOVEADDRESS),_model.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"删除成功" completeBlock:^{
if ([weakSelf.delegate respondsToSelector:@selector(delecteCell:)]) {
[weakSelf.delegate delecteCell:_model.fid];
......
Class/Shoppingcart/GenerateOrdersViewController.m
View file @ 1cb9debf
......@@ -115,7 +115,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHIPPINGADDRESS),[Customermanager manager].model.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
RsShippingAddrEntity *address = [[RsShippingAddrEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
......@@ -395,7 +395,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(CREATEORDER) withRequestType:ZERO withParameter:order withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
//商品购物车id
NSMutableArray *codeArrray = [NSMutableArray array];
for (ShopcarModel *model in _settlementGoodsdatas) {
......
Class/Shoppingcart/ShoppingViewController.m
View file @ 1cb9debf
......@@ -242,7 +242,7 @@
weakSelf.shoppingTableview.emptyDataSetSource = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.shoppingTableview];
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
ShopCartResponse *shopcar = [[ShopCartResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
//自定义属性
......@@ -371,7 +371,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(REMOVESHOPPINGBAG) withRequestType:ZERO withParameter:delecteGoods withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf QueryShoppingCarNumber];
//商品cell
NSMutableArray *cellArray = [NSMutableArray array];
......@@ -468,7 +468,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(REMOVESHOPPINGBAG) withRequestType:ZERO withParameter:delecteGoods withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf QueryShoppingCarNumber];
//删除商品
......@@ -507,7 +507,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
number ++;
}
} withFailureBlock:^(NSError *error) {
......@@ -553,7 +553,7 @@
[XBLoadingView hideHUDViewWithDefault];
result(returnValue);//提供是否支持修改的参数
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf CalculateSelectedGoodsAllprice];
[weakSelf QueryShoppingCarNumber];
}else{
......
Class/Tabbar/CustomTabbar/CustomTabbarController.m
View file @ 1cb9debf
......@@ -116,7 +116,7 @@
[self.view addSubview:self.toolview];
self.tabBar.hidden = YES;
//显示体验中心
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:OPENFOLLOWHEARTVC object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showFollowHeart:) name:OPENFOLLOWHEARTVC object:nil];
}
......@@ -317,7 +317,7 @@
}
#pragma mark -推出体验中心控制器
- (void)ShowFollowHeart:(NSNotification *)objc
- (void)showFollowHeart:(NSNotification *)objc
{
if (![Shoppersmanager manager].currentCustomer) {
[XBLoadingView showHUDViewWithText:@"必须设置当前客户才能访问体验中心"];
......
Class/Tabbar/CustomToolView/Toolview.m
View file @ 1cb9debf
......@@ -90,9 +90,14 @@
if (i == titleArray.count) {
SHARED_APPDELEGATE.shoppingCarPoint = [self convertPoint:CGPointMake(button.center.x, button.center.y) toView:self.window];
}
if (i == 2) {
//未读公告
if (i == 3) {
button.instructionsNumber = [Shoppersmanager manager].Shoppers.hasNotReadAffiche;
}
//未读消息
if (i == 2) {
button.instructionsNumber = [Shoppersmanager manager].Shoppers.hasNotReadNotice;
}
}
//创建下划线
CustomButton *Newbutton = (CustomButton *)[self viewWithTag:104];
......@@ -117,6 +122,8 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(promptDrawInformation:) name:PROMPTDRAWINFORMATION object:nil];
//提示未读公告
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notReadAnnouncement:) name:NOTREADANNOUNCEMENT object:nil];
//提示未读消息
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notReadMessage:) name:MESSAGE_COUNT object:nil];
}
#pragma mark -刷新购物车显示数量
......@@ -159,6 +166,14 @@
button.instructionsNumber = number;
}
#pragma mark - 未读消息
- (void)notReadMessage:(NSNotification *)object
{
CustomButton *button = (CustomButton *)[self viewWithTag:101];
NSInteger number = [object.object integerValue];
button.instructionsNumber = number;
}
#pragma mark -更改当前用户名
- (void)ChangeCustomerName:(NSNotification *)object
{
......
Class/UserViewController.m
View file @ 1cb9debf
......@@ -149,7 +149,7 @@
XBLoadingView *progressView = [XBLoadingView showHUDViewProgressLabel:@"上传头像中"];
[[NetworkRequestClassManager manager] uploadImageWithURL:SERVERREQUESTURL(UPLOADHEADER) withRequestType:ONE withImageDatas:data withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf modifyshoppersInformation:returnValue[@"data"] complete:^{
complete(returnValue[@"data"]);
}];
......@@ -182,7 +182,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(MODITYSHOPPERSINFORMATION) withRequestType:ZERO withParameter:employ withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
block();
[XBLoadingView showHUDViewWithSuccessText:@"修改成功" completeBlock:nil];
}else
......@@ -216,7 +216,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(CANCELLOGIN) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[Shoppersmanager manager].currentCustomer = NO;
[Customermanager manager].model = nil;
......@@ -280,7 +280,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(LOGIN) withRequestType:ZERO withParameter:login withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"登陆成功" completeBlock:nil];
LoginResult *result = [[LoginResult alloc] initWithDictionary:returnValue[@"data"] error:nil];
......
Class/WithdrawalViewController.m
View file @ 1cb9debf
......@@ -104,7 +104,7 @@
weakSelf.withdrawalTableView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.withdrawalTableView];
[XBLoadingView hideHUDViewWithDefaultWithView:weakSelf.view];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (isRemoveAll) {
[weakSelf.resultArray removeAllObjects];
}
......
Lighting/Announcement.storyboard
View file @ 1cb9debf
......@@ -188,7 +188,7 @@
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Syz-rn-8Ux">
<rect key="frame" x="20" y="16" width="984" height="21"/>
<mutableString key="text">LabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabel</mutableString>
<string key="text">LabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabel</string>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -199,17 +199,23 @@
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="new" translatesAutoresizingMaskIntoConstraints="NO" id="gIx-9G-Pnj">
<rect key="frame" x="211" y="43" width="29" height="19"/>
</imageView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="RQ0-r1-6gH" secondAttribute="bottom" constant="16" id="53v-Rb-p0e"/>
<constraint firstAttribute="trailing" secondItem="Syz-rn-8Ux" secondAttribute="trailing" constant="20" id="7wn-4N-Td5"/>
<constraint firstItem="gIx-9G-Pnj" firstAttribute="leading" secondItem="RQ0-r1-6gH" secondAttribute="trailing" constant="5" id="C7p-eS-jXi"/>
<constraint firstItem="Syz-rn-8Ux" firstAttribute="leading" secondItem="p34-6E-JxS" secondAttribute="leading" constant="20" id="HHm-Ml-Cxc"/>
<constraint firstItem="RQ0-r1-6gH" firstAttribute="leading" secondItem="Syz-rn-8Ux" secondAttribute="leading" id="M0W-yP-qF3"/>
<constraint firstItem="RQ0-r1-6gH" firstAttribute="top" secondItem="Syz-rn-8Ux" secondAttribute="bottom" constant="5" id="ig4-ri-Zjv"/>
<constraint firstItem="Syz-rn-8Ux" firstAttribute="top" secondItem="p34-6E-JxS" secondAttribute="top" constant="16" id="nBV-3v-nKM"/>
<constraint firstItem="gIx-9G-Pnj" firstAttribute="centerY" secondItem="RQ0-r1-6gH" secondAttribute="centerY" id="q6z-WI-sqG"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="isReadedImageView" destination="gIx-9G-Pnj" id="nlt-XJ-3Fz"/>
<outlet property="messageLabel" destination="Syz-rn-8Ux" id="xy5-dY-veg"/>
<outlet property="releaseTimeLabel" destination="RQ0-r1-6gH" id="FkF-rH-u7I"/>
</connections>
......
Tools/BaseViewController.h
View file @ 1cb9debf
......@@ -208,4 +208,27 @@
- (NSString *)returnUrlString:(NSString *)ChineseString;
/**
UIPopoverPresentationController弹出框
@param viewController 需要弹出的控制器
@param size size
@param sourceView 来源View
@param barbuttonitem 箭头按钮
*/
- (void)popoverPresentationController:(UIViewController *)viewController withPreferredContentSize:(CGSize)size withSourceView:(UIView *)sourceView withBarButtonItem:(UIBarButtonItem *)barbuttonitem;
@end
Tools/BaseViewController.m
View file @ 1cb9debf
......@@ -428,7 +428,7 @@
{
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(QUERYSHOPPINGBAGNUMBER),[Customermanager manager].model.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSLog(@"更新购物车数量成功");
[[NSNotificationCenter defaultCenter]postNotificationName:ADDSHOPPINGCAR object:returnValue[@"data"]];
}
......@@ -662,6 +662,28 @@
return encodedString;
}
/**
UIPopoverPresentationController弹出框
@param viewController 需要弹出的控制器
@param size size
@param sourceView 来源View
@param barbuttonitem 箭头按钮
*/
- (void)popoverPresentationController:(UIViewController *)viewController withPreferredContentSize:(CGSize)size withSourceView:(UIView *)sourceView withBarButtonItem:(UIBarButtonItem *)barbuttonitem
{
viewController.preferredContentSize = size;
viewController.modalPresentationStyle = UIModalPresentationPopover;
UIPopoverPresentationController *pop = viewController.popoverPresentationController;
pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
pop.sourceView = viewController.view;
pop.barButtonItem = barbuttonitem;
[self presentViewController:viewController animated:YES completion:nil];
}
- (void)dealloc
{
NSLog(@"释放%@控制器",self);
......
Tools/CYConstManager.h
View file @ 1cb9debf
......@@ -437,6 +437,11 @@ extern NSString *const FINISHSTUDY;
* 附件播放时间
*/
extern NSString *const ATTACHMENTPLAYTIME;
/**
* 消息已读
*/
extern NSString *const MESSAGE_READ;
/*****************************************接口地址*****************************************/
......@@ -622,3 +627,14 @@ extern NSString *const OPPLE_ASK;
* 消息列表
*/
extern NSString *const MESSAGELIST;
/**
* 消息
*/
extern NSString *const MESSAGE_COUNT;
Tools/CYConstManager.m
View file @ 1cb9debf
......@@ -435,8 +435,10 @@ NSString *const ATTACHMENTPLAYTIME = @"/attachment/play";
* 消息列表
*/
NSString *const MESSAGELIST = @"/notice/query";
/**
* 消息已读
*/
NSString *const MESSAGE_READ = @"/notice/read/%@?employee_id=%@";
/*****************************************接口地址*****************************************/
......@@ -622,6 +624,10 @@ NSString *const REDPACKAGE = @"redPackage";
* 欧普问问
*/
NSString *const OPPLE_ASK = @"欧普问问";
/**
* 消息
*/
NSString *const MESSAGE_COUNT = @"MESSAGE_COUNT";
......
Tools/CustomButton.m
View file @ 1cb9debf
......@@ -48,7 +48,7 @@
}
}
if (_instructionsNumber) {
instructionsLabe *labe = [[instructionsLabe alloc]initWithFrame:CGRectMake(WIDTH-35, 0, 13, 13)];
instructionsLabe *labe = [[instructionsLabe alloc]initWithFrame:CGRectMake(WIDTH-25, 0, 13, 13)];
labe.instructionsNumber = _instructionsNumber;
[self addSubview:labe];
}
......
Tools/NetworkRequestClassManager.m
View file @ 1cb9debf
......@@ -71,7 +71,6 @@ static NetworkRequestClassManager *manager = nil;
withParameter:(JSONModel *) jastorobject
withReturnValueBlock:(ReturnValueBlock) successBlock
withFailureBlock:(FailureBlock) failureBlock
{
AFHTTPSessionManager *manager = [self baseHttpRequest];
if (requestType == 0) {
......
Tools/PrefixHeader.pch
View file @ 1cb9debf
......@@ -81,6 +81,11 @@
//
//#endif
/**
判断请求是否成功
*/
#define RESULT(response) [returnValue[@"code"] isEqualToNumber:@0]
/**
保存账号密码serviceName
*/
......
Tools/SceneViewController.m
View file @ 1cb9debf
......@@ -239,7 +239,7 @@
//场景筛选条件
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
SceneFilter *filterModel = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
//风格
NSMutableArray *styleArray = [NSMutableArray array];
......@@ -305,7 +305,7 @@
weakSelf.sceneOrProductClollectionView.emptyDataSetSource = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.sceneOrProductClollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.sceneDatasArray removeAllObjects];
......@@ -380,7 +380,7 @@
WS(weakSelf);
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(PRODUCTSCREENING) withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (remove) {
[weakSelf.productScreeningDatasArray removeAllObjects];
......@@ -514,7 +514,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(PRODUCTLIST) withRequestType:ZERO withParameter:conditon withReturnValueBlock:^(id returnValue) {
[weakSelf endRefreshingForTableView:weakSelf.sceneOrProductClollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
GoodsResponse *sponse = [[GoodsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
weakSelf.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
//返回结果
......
Tools/ShareGoodsViewController.m
View file @ 1cb9debf
......@@ -35,7 +35,7 @@
[[NetworkRequestClassManager manager] networkWithDictionaryRequestWithURL:SERVERREQUESTURL(shareOrderString) withRequestType:ZERO withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf callSharePlatform:returnValue[@"data"][@"url"] withPlatformTag:sender withTitle:@"欧立方订单一键分享"];
}else
{
......@@ -55,7 +55,7 @@
XBLoadingView *progressView = [XBLoadingView showHUDViewProgressLabel:@"上传图片中"];
[[NetworkRequestClassManager manager] uploadImageWithURL:SERVERREQUESTURL(SHARE) withRequestType:ZERO withImageDatas:imageData withParameter:parameterDict withReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
NSString *shareWeb = returnValue[@"data"][@"url"];
[self callSharePlatform:shareWeb withPlatformTag:sender withTitle:ShareTitle];
}else
......
Tools/ShoppingBagViewController.m
View file @ 1cb9debf
......@@ -258,7 +258,7 @@
[[NetworkRequestClassManager manager] networkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) withRequestType:ZERO withParameter:shopCar withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
if (weakSelf.dismissBlock) {
weakSelf.dismissBlock();
}
......@@ -309,7 +309,7 @@
[XBLoadingView hideHUDViewWithDefault];
result(returnValue);//提供是否支持修改的参数
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (RESULT(returnValue)) {
[weakSelf CalculateSelectedGoodsAllprice];
[weakSelf QueryShoppingCarNumber];
}else{
......
Tools/opple_objc_json_client.h
View file @ 1cb9debf
......@@ -690,6 +690,11 @@ extern NSString * const GRADEMETHOD_MANUL;
是否有未读公告
*/
@property (nonatomic,assign) NSInteger hasNotReadAffiche;
/**
是否有未读消息
*/
@property (nonatomic,assign) NSInteger hasNotReadNotice;
@end /* interface LoginResult */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment