Skip to content

Commit cf6806c

Browse files
zhangdadizhangdadi
committed
添加新接口
1 parent f3d228a commit cf6806c

File tree

4 files changed

+47
-60
lines changed

4 files changed

+47
-60
lines changed

‎Coding_iOS/Controllers/ProjectViewController.m‎

Lines changed: 16 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -763,8 +763,16 @@ - (void)resetTaskCount {
763763
__weak typeof(self) weakSelf = self;
764764

765765
[[Coding_NetAPIManager sharedManager] request_tasks_searchWithUserId:_userId role:TaskRoleTypeAll project_id:_myProject.id.stringValue andBlock:^(id data, NSError *error) {
766-
NSInteger ownerDone = [data[@"data"][@"finished"] integerValue];
767-
NSInteger ownerProcessing = [data[@"data"][@"processing"] integerValue];
766+
NSInteger ownerDone, ownerProcessing;
767+
768+
769+
if (_userId == nil) {
770+
ownerDone = [data[@"data"][@"done"] integerValue];
771+
ownerProcessing = [data[@"data"][@"processing"] integerValue];
772+
} else {
773+
ownerDone = [data[@"data"][@"finished"] integerValue];
774+
ownerProcessing = [data[@"data"][@"processing"] integerValue];
775+
}
768776

769777
weakSelf.myFliterMenu.items = @[[NSString stringWithFormat:@"所有任务（%ld）", ownerDone + ownerProcessing],
770778
weakSelf.myFliterMenu.items[1],
@@ -779,74 +787,33 @@ - (void)resetTaskCount {
779787
}];
780788

781789
[[Coding_NetAPIManager sharedManager] request_tasks_searchWithUserId:_userId role:TaskRoleTypeWatcher project_id:_myProject.id.stringValue andBlock:^(id data, NSError *error) {
782-
NSInteger watcherDone = [data[@"data"][@"finished"] integerValue];
783-
NSInteger watcherProcessing = [data[@"data"][@"processing"] integerValue];
790+
NSInteger watcherDone = [data[@"data"][@"watcherDone"] integerValue];
791+
NSInteger watcherProcessing = [data[@"data"][@"watcherProcessing"] integerValue];
792+
NSInteger creatorDone = [data[@"data"][@"creatorDone"] integerValue];
793+
NSInteger creatorProcessing = [data[@"data"][@"creatorProcessing"] integerValue];
784794

785795
weakSelf.myFliterMenu.items = @[weakSelf.myFliterMenu.items[0],
786796
[NSString stringWithFormat:@"我关注的（%ld）", watcherDone + watcherProcessing],
787-
weakSelf.myFliterMenu.items[2]
797+
[NSString stringWithFormat:@"我创建的（%ld）", creatorDone + creatorProcessing]
788798
];
789799
if (_role == TaskRoleTypeWatcher) {
790800
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（%ld）", watcherProcessing],
791801
[NSString stringWithFormat:@"已完成的（%ld）", watcherDone]
792802
];
793803
}
794-
795-
}];
796-
797-
[[Coding_NetAPIManager sharedManager] request_tasks_searchWithUserId:_userId role:TaskRoleTypeCreator project_id:_myProject.id.stringValue andBlock:^(id data, NSError *error) {
798-
NSInteger creatorDone = [data[@"data"][@"finished"] integerValue];
799-
NSInteger creatorProcessing = [data[@"data"][@"processing"] integerValue];
800804

801-
weakSelf.myFliterMenu.items = @[weakSelf.myFliterMenu.items[0],
802-
weakSelf.myFliterMenu.items[1],
803-
[NSString stringWithFormat:@"我创建的（%ld）", creatorDone + creatorProcessing]
804-
];
805805
if (_role == TaskRoleTypeCreator) {
806806
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（%ld）", creatorProcessing],
807807
[NSString stringWithFormat:@"已完成的（%ld）", creatorDone]
808808
];
809809
}
810810

811-
812811
}];
813-
814-
return;
815-
[[Coding_NetAPIManager sharedManager] request_project_user_tasks_countsWithProjectId:_myProject.id.stringValue memberId:_userId andBlock:^(id data, NSError *error) {
816-
NSInteger ownerDone = [data[@"data"][@"ownerDone"] integerValue];
817-
NSInteger ownerProcessing = [data[@"data"][@"ownerProcessing"] integerValue];
818-
819-
NSInteger watcherDone = [data[@"data"][@"watcherDone"] integerValue];
820-
NSInteger watcherProcessing = [data[@"data"][@"watcherProcessing"] integerValue];
821-
822-
NSInteger creatorDone = [data[@"data"][@"creatorDone"] integerValue];
823-
NSInteger creatorProcessing = [data[@"data"][@"creatorProcessing"] integerValue];
824-
825-
826-
weakSelf.myFliterMenu.items = @[[NSString stringWithFormat:@"所有任务（%ld）", ownerDone + ownerProcessing],
827-
[NSString stringWithFormat:@"我关注的（%ld）", watcherDone + watcherProcessing],
828-
[NSString stringWithFormat:@"我创建的（%ld）", creatorDone + creatorProcessing]
829-
];
830-
if (weakSelf.role == TaskRoleTypeWatcher) {
831-
ownerProcessing = watcherProcessing;
832-
ownerDone = watcherDone;
833-
}
834-
835-
if (weakSelf.role == TaskRoleTypeCreator) {
836-
ownerProcessing = creatorProcessing;
837-
ownerDone = creatorDone;
838-
}
839-
840-
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（%ld）", ownerProcessing],
841-
[NSString stringWithFormat:@"已完成的（%ld）", ownerDone]
842-
];
843-
}];
844-
845812
}
846813

847814
- (void)loadTasksLabels {
848815
__weak typeof(self) weakSelf = self;
849-
[[Coding_NetAPIManager sharedManager] request_projects_tasks_labelsWithRole:_role projectId:_myProject.id.stringValue projectName:_myProject.name memberId:_userId andBlock:^(id data, NSError *error) {
816+
[[Coding_NetAPIManager sharedManager] request_projects_tasks_labelsWithRole:_role projectId:_myProject.id.stringValue projectName:_myProject.name memberId:_userId owner_user_name:_myProject.owner_user_name andBlock:^(id data, NSError *error) {
850817
if (data != nil) {
851818
weakSelf.screenView.labels = data;
852819
}

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ typedef NS_ENUM(NSInteger, PurposeType) {
172172
- (void)request_project_task_countWithProjectId:(NSString *)projectId andBlock:(void (^)(id data, NSError *error))block;
173173
- (void)request_project_user_tasks_countsWithProjectId:(NSString *)projectId memberId:(NSString *)memberId andBlock:(void (^)(id data, NSError *error))block;
174174
- (void)request_tasks_searchWithUserId:(NSString *)userId role:(TaskRoleType )role project_id:(NSString *)project_id andBlock:(void (^)(id data, NSError *error))block;
175-
- (void)request_projects_tasks_labelsWithRole:(TaskRoleType)role projectId:(NSString *)projectId projectName:(NSString *)projectName memberId:(NSString *)memberId andBlock:(void (^)(id data, NSError *error))block;
175+
- (void)request_projects_tasks_labelsWithRole:(TaskRoleType)role projectId:(NSString *)projectId projectName:(NSString *)projectName memberId:(NSString *)memberId owner_user_name:(NSString *)owner_user_name andBlock:(void (^)(id data, NSError *error))block;
176176

177177

178178
#pragma mark - User

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,6 +1612,8 @@ - (void)request_project_user_tasks_countsWithProjectId:(NSString *)projectId mem
16121612
}
16131613

16141614
- (void)request_tasks_searchWithUserId:(NSString *)userId role:(TaskRoleType )role project_id:(NSString *)project_id andBlock:(void (^)(id data, NSError *error))block {
1615+
1616+
/*
16151617
NSMutableDictionary *param = @{@"page": @(1), @"pageSize": @(1)}.mutableCopy;
16161618
if (userId != nil) {
16171619
[param setValue:userId forKey:@"owner"];
@@ -1624,9 +1626,26 @@ - (void)request_tasks_searchWithUserId:(NSString *)userId role:(TaskRoleType )ro
16241626
if (role < roleArray.count) {
16251627
[param setValue:[Login curLoginUser].id.stringValue forKey:roleArray[role]];
16261628
1629+
}
1630+
*/
1631+
NSString *urlStr;
1632+
NSDictionary *param;
1633+
if (userId == nil) { //无成员时
1634+
if (role == TaskRoleTypeWatcher || role == TaskRoleTypeCreator) { //创建和关注
1635+
urlStr = [NSString stringWithFormat:@"api/project/%@/tasks/counts", project_id];
1636+
} else { //全部任务
1637+
urlStr = [NSString stringWithFormat:@"api/project/%@/task/count", project_id];
1638+
}
1639+
} else { //有成员时
1640+
if (role == TaskRoleTypeWatcher || role == TaskRoleTypeCreator) { //创建和关注
1641+
urlStr = [NSString stringWithFormat:@"api/project/%@/user/%@/tasks/counts", project_id, userId];
1642+
} else {
1643+
urlStr = @"api/tasks/search";
1644+
param = @{@"owner": userId, @"project_id": project_id};
1645+
}
16271646
}
16281647

1629-
[[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/tasks/search" withParams:param withMethodType:Get andBlock:^(id data, NSError *error) {
1648+
[[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:urlStr withParams:param withMethodType:Get andBlock:^(id data, NSError *error) {
16301649

16311650
if (data) {
16321651
block(data, nil);
@@ -1636,23 +1655,22 @@ - (void)request_tasks_searchWithUserId:(NSString *)userId role:(TaskRoleType )ro
16361655
}];
16371656
}
16381657

1639-
- (void)request_projects_tasks_labelsWithRole:(TaskRoleType)role projectId:(NSString *)projectId projectName:(NSString *)projectName memberId:(NSString *)memberId andBlock:(void (^)(id data, NSError *error))block {
1640-
NSString *roleStr;
1658+
- (void)request_projects_tasks_labelsWithRole:(TaskRoleType)role projectId:(NSString *)projectId projectName:(NSString *)projectName memberId:(NSString *)memberId owner_user_name:(NSString *)owner_user_name andBlock:(void (^)(id data, NSError *error))block {
1659+
NSDictionary *param;
16411660
NSArray *roleArray = @[@"owner", @"watcher", @"creator"];
16421661
if (role < roleArray.count) {
1643-
roleStr = roleArray[role];
1662+
param = @{@"role": roleArray[role]};
16441663
}
16451664
NSString *urlStr;
1646-
NSDictionary *param;
1647-
if (projectId != nil && memberId != nil) {
1665+
if (projectId != nil && memberId != nil) { //有成员
16481666
urlStr = [NSString stringWithFormat:@"api/project/%@/user/%@/tasks/labels", projectId, memberId];
1649-
param = @{@"role": roleStr};
1667+
16501668
} else {
16511669
if (role == TaskRoleTypeWatcher || role == TaskRoleTypeCreator) {
16521670
urlStr = [NSString stringWithFormat:@"api/project/%@/tasks/labels", projectId];
1653-
param = @{@"role": roleStr};
1671+
16541672
} else {
1655-
urlStr = [NSString stringWithFormat:@"api/user/%@/project/%@/task/label?withCount=true", [Login curLoginUser].global_key, projectName];
1673+
urlStr = [NSString stringWithFormat:@"api/user/%@/project/%@/task/label?withCount=true", owner_user_name, projectName];
16561674
}
16571675
}
16581676

‎Coding_iOS/Views/ScreenView.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
7575
} else {
7676
ScreenCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_ScreenCell forIndexPath:indexPath];
7777
cell.color = _labels[indexPath.row - _tastArray.count][@"color"];
78-
cell.title = _labels[indexPath.row - _tastArray.count][@"name"];
78+
cell.title = [NSString stringWithFormat:@"%@（%@/%@）", _labels[indexPath.row - _tastArray.count][@"name"], _labels[indexPath.row - _tastArray.count][@"processing"], _labels[indexPath.row - _tastArray.count][@"count"]];
7979
cell.isSel = indexPath.row == _selectNum;
8080

8181
return cell;
@@ -206,6 +206,8 @@ - (void)resetButtonClick {
206206
- (void)show {
207207
_searchBar.text = _keyword;
208208
_mainView.x = kScreen_Width - KMainLeftWith;
209+
self.backgroundColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:.5];
210+
209211
self.hidden = NO;
210212
[UIView animateWithDuration:.3 animations:^{
211213
self.alpha = 1;

0 commit comments

Comments
 (0)