Skip to content

陈高翔 / DreamSleep-iOS

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

完成用户签到列表、每日任务列表、新手任务列表数据解析

1 个父辈 86372c21
内嵌 并排
正在显示 9 个修改的文件 包含 208 行增加 和 7 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
......@@ -155,6 +155,9 @@
D0BB9AA728164DFB00DB209E /* NickNameController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BB9AA628164DFB00DB209E /* NickNameController.m */; };
D0BE32E62814D42B006539BE /* HomeRequestModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BE32E52814D42B006539BE /* HomeRequestModel.m */; };
D0BE32E9281551EB006539BE /* ShareAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BE32E8281551EB006539BE /* ShareAlertView.m */; };
D0BE536E2845A7AF007F15B3 /* SignModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BE536D2845A7AF007F15B3 /* SignModel.m */; };
D0BE53712845AFD8007F15B3 /* NewTaskModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BE53702845AFD8007F15B3 /* NewTaskModel.m */; };
D0BE53742845B27E007F15B3 /* DailyTaskModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BE53732845B27E007F15B3 /* DailyTaskModel.m */; };
D0C09ED728007D9100709D4C /* relax_normal_lottie.json in Resources */ = {isa = PBXBuildFile; fileRef = D0C09ED328007D9100709D4C /* relax_normal_lottie.json */; };
D0C09ED828007D9100709D4C /* 478_lottie.json in Resources */ = {isa = PBXBuildFile; fileRef = D0C09ED428007D9100709D4C /* 478_lottie.json */; };
D0C09ED928007D9100709D4C /* 478normal_lottie.json in Resources */ = {isa = PBXBuildFile; fileRef = D0C09ED528007D9100709D4C /* 478normal_lottie.json */; };
......@@ -506,6 +509,12 @@
D0BE32E52814D42B006539BE /* HomeRequestModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeRequestModel.m; sourceTree = "<group>"; };
D0BE32E7281551EB006539BE /* ShareAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareAlertView.h; sourceTree = "<group>"; };
D0BE32E8281551EB006539BE /* ShareAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareAlertView.m; sourceTree = "<group>"; };
D0BE536C2845A7AF007F15B3 /* SignModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SignModel.h; sourceTree = "<group>"; };
D0BE536D2845A7AF007F15B3 /* SignModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SignModel.m; sourceTree = "<group>"; };
D0BE536F2845AFD8007F15B3 /* NewTaskModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewTaskModel.h; sourceTree = "<group>"; };
D0BE53702845AFD8007F15B3 /* NewTaskModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewTaskModel.m; sourceTree = "<group>"; };
D0BE53722845B27E007F15B3 /* DailyTaskModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DailyTaskModel.h; sourceTree = "<group>"; };
D0BE53732845B27E007F15B3 /* DailyTaskModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DailyTaskModel.m; sourceTree = "<group>"; };
D0C09ED328007D9100709D4C /* relax_normal_lottie.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = relax_normal_lottie.json; sourceTree = "<group>"; };
D0C09ED428007D9100709D4C /* 478_lottie.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = 478_lottie.json; sourceTree = "<group>"; };
D0C09ED528007D9100709D4C /* 478normal_lottie.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = 478normal_lottie.json; sourceTree = "<group>"; };
......@@ -1009,6 +1018,12 @@
D0D4107B2844B8DB00009638 /* DailyTaskController.m */,
D0D4107D2844D38400009638 /* RankModel.h */,
D0D4107E2844D38400009638 /* RankModel.m */,
D0BE536C2845A7AF007F15B3 /* SignModel.h */,
D0BE536D2845A7AF007F15B3 /* SignModel.m */,
D0BE53722845B27E007F15B3 /* DailyTaskModel.h */,
D0BE53732845B27E007F15B3 /* DailyTaskModel.m */,
D0BE536F2845AFD8007F15B3 /* NewTaskModel.h */,
D0BE53702845AFD8007F15B3 /* NewTaskModel.m */,
);
path = ScoreTaskAI;
sourceTree = "<group>";
......@@ -1732,11 +1747,14 @@
D0DB33A528204E7C00E15914 /* FirstLeadAlertView.m in Sources */,
D054CCB82830E3AC00420DC4 /* NoisePlayItem.m in Sources */,
D0C50B3027FD1BEB00DC68F0 /* PrivacyView.m in Sources */,
D0BE53712845AFD8007F15B3 /* NewTaskModel.m in Sources */,
D0B5ECD527F2F0B2003EDFE3 /* AdaptationUtil.m in Sources */,
D070509A28071BAF006D72E1 /* DSNetworkTool.m in Sources */,
D01814D127FFCBAF00583D4E /* CWCarousel.m in Sources */,
D0B5ECB727F2D9E0003EDFE3 /* main.m in Sources */,
D0BE53742845B27E007F15B3 /* DailyTaskModel.m in Sources */,
D07DACA62810557D0067A1BF /* RSKTouchView.m in Sources */,
D0BE536E2845A7AF007F15B3 /* SignModel.m in Sources */,
D0D69ED628236E0800A0D5EB /* SafeSleepListController.m in Sources */,
D09D0E9A280D507F008DEDAB /* ProfileAlertView.m in Sources */,
D0FAC41F281B817D00D4B859 /* UIScrollView+GKPhotoBrowser.m in Sources */,
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskModel.h 0 → 100644
//
// DailyTaskModel.h
// DreamSleep
//
// Created by peter on 2022/5/31.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// 每日任务数据model
@interface DailyTaskModel : NSObject
/// 任务id
@property (nonatomic, assign) int task_id;
/// 任务状态：0:去完成，1:待领取，2:已领取
@property (nonatomic, assign) int state;
/// 完成数
@property (nonatomic, assign) int finish;
/// 总数
@property (nonatomic, assign) int total;
/// 任务积分值
@property (nonatomic, assign) int points;
/// 任务已完成积分
@property (nonatomic, assign) int finish_point;
/// 任务总积分
@property (nonatomic, assign) int integral;
/// 任务描述详情
@property (nonatomic, copy) NSString *task_description;
/// 任务描述
@property (nonatomic, copy) NSString *item_name;
/// 跳转页面url
@property (nonatomic, copy) NSString *url;
/// 任务图标
@property (nonatomic, copy) NSString *img_url;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskModel.m 0 → 100644
//
// DailyTaskModel.m
// DreamSleep
//
// Created by peter on 2022/5/31.
//
#import "DailyTaskModel.h"
@implementation DailyTaskModel
+ (nullable NSDictionary<NSString *, id> *)modelCustomPropertyMapper {
return @{@"task_id" : @"id",
@"task_description" : @"description"};
}
@end
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/NewTaskModel.h 0 → 100644
//
// NewTaskModel.h
// DreamSleep
//
// Created by peter on 2022/5/31.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// 新手任务数据model
@interface NewTaskModel : NSObject
/// 任务id
@property (nonatomic, assign) int task_id;
/// 任务积分值
@property (nonatomic, assign) int integral;
/// 任务状态：0:去完成，1:待领取，2:已领取
@property (nonatomic, assign) int state;
/// 跳转页面url
@property (nonatomic, copy) NSString *url;
/// 任务名
@property (nonatomic, copy) NSString *name;
/// 任务图标
@property (nonatomic, copy) NSString *img_url;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/NewTaskModel.m 0 → 100644
//
// NewTaskModel.m
// DreamSleep
//
// Created by peter on 2022/5/31.
//
#import "NewTaskModel.h"
@implementation NewTaskModel
+ (nullable NSDictionary<NSString *, id> *)modelCustomPropertyMapper {
return @{@"task_id" : @"id"};
}
@end
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/ScoreTaskRequestModel.h
......@@ -14,17 +14,34 @@ NS_ASSUME_NONNULL_BEGIN
/// 任务积分请求数据接口
@interface ScoreTaskRequestModel : DSNetworkTool
#pragma mark - 积分数据
/// 我的积分数据
@property (nonatomic, strong) MyScoreModel *scoreModel;
/// 当前用户积分排名数据
@property (nonatomic, strong) RankModel *userRankModel;
/// 其他用户积分排名数据列表
@property (nonatomic, strong) NSArray *otherRankList;
/// 积分明细列表数据
@property (nonatomic, strong) NSArray *pointList;
#pragma mark - 用户签到列表数据
/// 当日是第几天
@property (nonatomic, assign) int cur_day;
/// 签到标识 0 未签到 1 签到
@property (nonatomic, assign) int sign_flag;
/// 签到列表
@property (nonatomic, strong) NSArray *signList;
#pragma mark - 每日任务、新手任务列表数据
/// 今日积分值
@property (nonatomic, assign) int points;
/// 背景图
@property (nonatomic, copy) NSString *bg_img;
/// 每日任务列表
@property (nonatomic, strong) NSArray *task_items;
/// 新手任务数据列表
@property (nonatomic, strong) NSArray *task_news;
/// 我的积分等级接口
/// @param completion completion
+ (NSURLSessionDataTask *)queryUserIntegralRankWithCompletion:(void (^)(ScoreTaskRequestModel *requestModel))completion;
......@@ -39,11 +56,11 @@ NS_ASSUME_NONNULL_BEGIN
/// @param completion completion
+ (NSURLSessionDataTask *)queryUserPointsDetailListWithParams:(NSDictionary *)params completion:(void (^)(ScoreTaskRequestModel *requestModel))completion;
/// 每日任务-用户签到
/// 每日任务-用户签到列表
/// @param completion completion
+ (NSURLSessionDataTask *)queryUserSignListWithCompletion:(void (^)(ScoreTaskRequestModel *requestModel))completion;
/// 每日任务、新手任务-列表数据（显示任务状态）
/// 每日任务、新手任务列表数据
/// @param completion completion
+ (NSURLSessionDataTask *)queryUserDailyTaskListWithCompletion:(void (^)(ScoreTaskRequestModel *requestModel))completion;
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/ScoreTaskRequestModel.m
......@@ -7,6 +7,9 @@
#import "ScoreTaskRequestModel.h"
#import "ScoreDetailModel.h"
#import "SignModel.h"
#import "DailyTaskModel.h"
#import "NewTaskModel.h"
@implementation ScoreTaskRequestModel
......@@ -80,9 +83,18 @@
NSString *argStr = [NSString stringWithFormat:@"query{%@}", api];
ScoreTaskRequestModel * requestModel = [[ScoreTaskRequestModel alloc] init];
return [self httpPostBodyRequestWithAPI:api params:@{@"query" : argStr} view:nil hasNetActivity:YES loadingInfo:nil hasFailInfo:YES success:^(NSDictionary *apiDic) {
DSLog(@"每日任务-用户签到接口dataDic：%@", apiDic);
DSLog(@"每日任务-用户签到列表接口dataDic：%@", apiDic);
NSDictionary *resultDic = apiDic[@"result"];
NSArray *sign_list = resultDic[@"sign_list"];
NSMutableArray *tmpArr = [NSMutableArray array];
requestModel.resCode = DSResCodeSuccess;
requestModel.cur_day = [resultDic[@"cur_day"] intValue];
requestModel.sign_flag = [resultDic[@"sign_flag"] intValue];
for (int index = 0; index < sign_list.count; index++) {
SignModel *signModel = [SignModel yy_modelWithDictionary:sign_list[index]];
[tmpArr addObject:signModel];
}
requestModel.signList = [tmpArr copy];
completion(requestModel);
} failure:^(id failure) {
requestModel.resCode = DSResCodeNetFail;
......@@ -96,8 +108,29 @@
NSString *argStr = [NSString stringWithFormat:@"query{%@}", api];
ScoreTaskRequestModel * requestModel = [[ScoreTaskRequestModel alloc] init];
return [self httpPostBodyRequestWithAPI:api params:@{@"query" : argStr} view:nil hasNetActivity:YES loadingInfo:nil hasFailInfo:YES success:^(NSDictionary *apiDic) {
DSLog(@"每日任务、新手任务-列表数据接口dataDic：%@", apiDic);
DSLog(@"每日任务、新手任务列表数据接口dataDic：%@", apiDic);
NSDictionary *resultDic = apiDic[@"result"];
requestModel.resCode = DSResCodeSuccess;
requestModel.points = [resultDic[@"points"] intValue];
requestModel.bg_img = resultDic[@"bg_img"];
// 每日任务数据
NSArray *task_items = resultDic[@"task_items"];
NSMutableArray *tmp_task_items = [NSMutableArray array];
for (int index = 0; index < task_items.count; index++) {
DailyTaskModel *dailyTaskModel = [DailyTaskModel yy_modelWithDictionary:task_items[index]];
[tmp_task_items addObject:dailyTaskModel];
}
requestModel.task_items = [tmp_task_items copy];
// 新手任务数据
NSArray *task_news = resultDic[@"task_news"];
NSMutableArray *tmp_task_news = [NSMutableArray array];
for (int index = 0; index < task_news.count; index++) {
NewTaskModel *newTaskModel = [NewTaskModel yy_modelWithDictionary:task_news[index]];
[tmp_task_news addObject:newTaskModel];
}
requestModel.task_news = [tmp_task_news copy];
completion(requestModel);
} failure:^(id failure) {
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/SignModel.h 0 → 100644
//
// SignModel.h
// DreamSleep
//
// Created by peter on 2022/5/31.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// 用户签到数据model
@interface SignModel : NSObject
/// 第几天
@property (nonatomic, assign) int day;
/// 当日签到积分值
@property (nonatomic, assign) int point;
/// 签到状态 0:未签到 1: 已签到
@property (nonatomic, assign) int state;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/SignModel.m 0 → 100644
//
// SignModel.m
// DreamSleep
//
// Created by peter on 2022/5/31.
//
#import "SignModel.h"
@implementation SignModel
@end
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!