Skip to content

Commit 93a0af6

Browse files
wanghenghengwanghengheng
committed
动态、讨论、文件、成员、代码顶部出现了任务筛选
1 parent ddd3a44 commit 93a0af6

File tree

2 files changed

+63
-70
lines changed

2 files changed

+63
-70
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7488,7 +7488,7 @@
74887488
isa = XCBuildConfiguration;
74897489
baseConfigurationReference = 34E37865A7DAAE68AEF68258 /* Pods-Coding_iOS.debug.xcconfig */;
74907490
buildSettings = {
7491-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconTemp;
7491+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
74927492
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
74937493
CODE_SIGN_ENTITLEMENTS = Coding_iOS/Coding_iOS.entitlements;
74947494
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -7533,7 +7533,7 @@
75337533
isa = XCBuildConfiguration;
75347534
baseConfigurationReference = 2FD5D8DD0689696D28A6D49E /* Pods-Coding_iOS.release.xcconfig */;
75357535
buildSettings = {
7536-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconTemp;
7536+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
75377537
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
75387538
CODE_SIGN_ENTITLEMENTS = Coding_iOS/Coding_iOS.entitlements;
75397539
CODE_SIGN_IDENTITY = "iPhone Developer";

‎Coding_iOS/Controllers/ProjectViewController.m

+61-68
Original file line numberDiff line numberDiff line change
@@ -108,68 +108,66 @@ - (void)viewDidLoad
108108
[self refreshWithNewIndex:_curIndex];
109109
}
110110
}
111-
[self setupTitleBtn];
112-
113111
UIView *curView = [self getCurContentView];
114112
if ([curView isKindOfClass:[ProjectTasksView class]]) {
113+
[self setupTitleBtn];
114+
115115
ProjectTasksView *tasksView = (ProjectTasksView *)curView;
116116
[self assignmentWithlistView:tasksView];
117117
[tasksView refresh];
118-
}
119-
120-
_role = TaskRoleTypeAll;
121-
//初始化过滤目录
122-
_myFliterMenu = [[TaskSelectionView alloc] initWithFrame:CGRectMake(0, 64, kScreen_Width, kScreen_Height - 64) items:@[@"所有任务（0）", @"我关注的（0）", @"我创建的（0）"]];
123-
__weak typeof(self) weakSelf = self;
124-
_myFliterMenu.clickBlock = ^(NSInteger pageIndex){
125-
_role = pageIndex;
126-
if (pageIndex == 0) {
127-
_role = TaskRoleTypeAll;
128-
}
129-
130-
NSString *title = weakSelf.myFliterMenu.items[pageIndex];
131-
[weakSelf.titleBtn setTitle:[title substringToIndex:4] forState:UIControlStateNormal];
132118

133-
UIView *curView = [weakSelf getCurContentView];
134-
if (![curView isKindOfClass:[ProjectTasksView class]]) {
135-
return;
136-
}
137-
ProjectTasksView *tasksView = (ProjectTasksView *)curView;
138-
[weakSelf assignmentWithlistView:tasksView];
139-
[tasksView refresh];
140-
[weakSelf resetTaskCount];
141-
[weakSelf loadTasksLabels];
142-
143-
};
144-
_myFliterMenu.closeBlock=^(){
145-
[weakSelf.myFliterMenu dismissMenu];
146-
};
147-
148-
_screenView = [ScreenView creat];
149-
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（0）"],
150-
[NSString stringWithFormat:@"已完成的（0）"]
151-
];
152-
153-
_screenView.selectBlock = ^(NSString *keyword, NSString *status, NSString *label) {
154-
[((UIButton *)weakSelf.screenBar.customView) setImage:[UIImage imageNamed:@"a1-hasScreen"] forState:UIControlStateNormal];
155-
weakSelf.keyword = keyword;
156-
weakSelf.status = status;
157-
weakSelf.label = label;
158-
if (keyword == nil && status == nil && label == nil) {
159-
[((UIButton *)weakSelf.screenBar.customView) setImage:[UIImage imageNamed:@"a1-screen"] forState:UIControlStateNormal];
119+
_role = TaskRoleTypeAll;
120+
//初始化过滤目录
121+
_myFliterMenu = [[TaskSelectionView alloc] initWithFrame:CGRectMake(0, 64, kScreen_Width, kScreen_Height - 64) items:@[@"所有任务（0）", @"我关注的（0）", @"我创建的（0）"]];
122+
__weak typeof(self) weakSelf = self;
123+
_myFliterMenu.clickBlock = ^(NSInteger pageIndex){
124+
_role = pageIndex;
125+
if (pageIndex == 0) {
126+
_role = TaskRoleTypeAll;
127+
}
160128

161-
}
162-
UIView *curView = [weakSelf getCurContentView];
163-
if (![curView isKindOfClass:[ProjectTasksView class]]) {
164-
return;
165-
}
166-
ProjectTasksView *tasksView = (ProjectTasksView *)curView;
167-
[weakSelf assignmentWithlistView:tasksView];
168-
[tasksView refresh];
129+
NSString *title = weakSelf.myFliterMenu.items[pageIndex];
130+
[weakSelf.titleBtn setTitle:[title substringToIndex:4] forState:UIControlStateNormal];
131+
132+
UIView *curView = [weakSelf getCurContentView];
133+
if (![curView isKindOfClass:[ProjectTasksView class]]) {
134+
return;
135+
}
136+
ProjectTasksView *tasksView = (ProjectTasksView *)curView;
137+
[weakSelf assignmentWithlistView:tasksView];
138+
[tasksView refresh];
139+
[weakSelf resetTaskCount];
140+
[weakSelf loadTasksLabels];
141+
142+
};
143+
_myFliterMenu.closeBlock=^(){
144+
[weakSelf.myFliterMenu dismissMenu];
145+
};
169146

170-
};
171-
172-
147+
_screenView = [ScreenView creat];
148+
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（0）"],
149+
[NSString stringWithFormat:@"已完成的（0）"]
150+
];
151+
152+
_screenView.selectBlock = ^(NSString *keyword, NSString *status, NSString *label) {
153+
[((UIButton *)weakSelf.screenBar.customView) setImage:[UIImage imageNamed:@"a1-hasScreen"] forState:UIControlStateNormal];
154+
weakSelf.keyword = keyword;
155+
weakSelf.status = status;
156+
weakSelf.label = label;
157+
if (keyword == nil && status == nil && label == nil) {
158+
[((UIButton *)weakSelf.screenBar.customView) setImage:[UIImage imageNamed:@"a1-screen"] forState:UIControlStateNormal];
159+
160+
}
161+
UIView *curView = [weakSelf getCurContentView];
162+
if (![curView isKindOfClass:[ProjectTasksView class]]) {
163+
return;
164+
}
165+
ProjectTasksView *tasksView = (ProjectTasksView *)curView;
166+
[weakSelf assignmentWithlistView:tasksView];
167+
[tasksView refresh];
168+
169+
};
170+
}
173171
}
174172
- (void)didReceiveMemoryWarning
175173
{
@@ -220,7 +218,9 @@ - (void)requestForMyProject{
220218
}
221219

222220
- (void)configNavBtnWithMyProject{
223-
// self.title = _myProject.name;
221+
if (self.curType != ProjectViewTypeTasks) {
222+
self.title = _myProject.name;
223+
}
224224
}
225225

226226
- (void)configRightBarButtonItemWithViewType:(ProjectViewType)viewType{
@@ -758,18 +758,18 @@ - (void)assignmentWithlistView:(ProjectTasksView *)listView {
758758
}
759759

760760
- (void)resetTaskCount {
761+
if (self.curType != ProjectViewTypeTasks) {
762+
return;
763+
}
761764
__weak typeof(self) weakSelf = self;
762-
763765
if (_userId != nil) {
764-
765766
[[Coding_NetAPIManager sharedManager] request_tasks_searchWithUserId:_userId role:TaskRoleTypeAll project_id:_myProject.id.stringValue andBlock:^(id data, NSError *error) {
766767
NSInteger ownerDone = [data[@"data"][@"memberDone"] integerValue];
767768
NSInteger ownerProcessing = [data[@"data"][@"memberProcessing"] integerValue];
768769
NSInteger watcherDone = [data[@"data"][@"watcherDone"] integerValue];
769770
NSInteger watcherProcessing = [data[@"data"][@"watcherProcessing"] integerValue];
770771
NSInteger creatorDone = [data[@"data"][@"creatorDone"] integerValue];
771772
NSInteger creatorProcessing = [data[@"data"][@"creatorProcessing"] integerValue];
772-
773773
weakSelf.myFliterMenu.items = @[[NSString stringWithFormat:@"所有任务（%ld）", ownerDone + ownerProcessing],
774774
[NSString stringWithFormat:@"我关注的（%ld）", watcherDone + watcherProcessing],
775775
[NSString stringWithFormat:@"我创建的（%ld）", creatorDone + creatorProcessing]
@@ -779,20 +779,16 @@ - (void)resetTaskCount {
779779
[NSString stringWithFormat:@"已完成的（%ld）", ownerDone]
780780
];
781781
}
782-
783782
if (_role == TaskRoleTypeWatcher) {
784783
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（%ld）", watcherProcessing],
785784
[NSString stringWithFormat:@"已完成的（%ld）", watcherDone]
786785
];
787786
}
788-
789787
if (_role == TaskRoleTypeCreator) {
790788
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（%ld）", creatorProcessing],
791789
[NSString stringWithFormat:@"已完成的（%ld）", creatorDone]
792790
];
793791
}
794-
795-
796792
}];
797793

798794
} else {
@@ -812,15 +808,12 @@ - (void)resetTaskCount {
812808
[NSString stringWithFormat:@"已完成的（%ld）", ownerDone]
813809
];
814810
}
815-
816811
}];
817-
818812
[[Coding_NetAPIManager sharedManager] request_tasks_searchWithUserId:nil role:TaskRoleTypeWatcher project_id:_myProject.id.stringValue andBlock:^(id data, NSError *error) {
819813
NSInteger watcherDone = [data[@"data"][@"watcherDone"] integerValue];
820814
NSInteger watcherProcessing = [data[@"data"][@"watcherProcessing"] integerValue];
821815
NSInteger creatorDone = [data[@"data"][@"creatorDone"] integerValue];
822816
NSInteger creatorProcessing = [data[@"data"][@"creatorProcessing"] integerValue];
823-
824817
weakSelf.myFliterMenu.items = @[weakSelf.myFliterMenu.items[0],
825818
[NSString stringWithFormat:@"我关注的（%ld）", watcherDone + watcherProcessing],
826819
[NSString stringWithFormat:@"我创建的（%ld）", creatorDone + creatorProcessing]
@@ -830,19 +823,19 @@ - (void)resetTaskCount {
830823
[NSString stringWithFormat:@"已完成的（%ld）", watcherDone]
831824
];
832825
}
833-
834826
if (_role == TaskRoleTypeCreator) {
835827
weakSelf.screenView.tastArray = @[[NSString stringWithFormat:@"进行中的（%ld）", creatorProcessing],
836828
[NSString stringWithFormat:@"已完成的（%ld）", creatorDone]
837829
];
838830
}
839-
840831
}];
841-
842832
}
843833
}
844834

845835
- (void)loadTasksLabels {
836+
if (self.curType != ProjectViewTypeTasks) {
837+
return;
838+
}
846839
__weak typeof(self) weakSelf = self;
847840
[[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) {
848841
if (data != nil) {

0 commit comments

Comments
 (0)