Skip to content

Commit 61d88de

Browse files
wanghenghengwanghengheng
committed
看板 - beta
1 parent 925f7e6 commit 61d88de

27 files changed

+1382
-28
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,12 @@
12241224
B14689C31EE100B200B01371 /* vip_4_75@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B14689B31EE100B200B01371 /* vip_4_75@3x.png */; };
12251225
B152ED4E2090B223004A6E8A /* ProjectSettingEntranceController.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED4D2090B223004A6E8A /* ProjectSettingEntranceController.m */; };
12261226
B152ED542091B7CB004A6E8A /* ProjectArchiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED532091B7CB004A6E8A /* ProjectArchiveViewController.m */; };
1227+
B152ED5A2092BF46004A6E8A /* EABoardTaskList.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED592092BF46004A6E8A /* EABoardTaskList.m */; };
1228+
B152ED5D2092D51E004A6E8A /* EATaskBoardListTaskCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED5C2092D51E004A6E8A /* EATaskBoardListTaskCell.m */; };
1229+
B152ED602093018A004A6E8A /* EABoardTaskListView.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED5F2093018A004A6E8A /* EABoardTaskListView.m */; };
1230+
B152ED6320935524004A6E8A /* EABoardTaskListBlankView.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED6220935524004A6E8A /* EABoardTaskListBlankView.m */; };
1231+
B152ED6520935594004A6E8A /* EABoardTaskListBlankView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B152ED6420935594004A6E8A /* EABoardTaskListBlankView.xib */; };
1232+
B152ED68209420CD004A6E8A /* RATaskBoardListListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED67209420CD004A6E8A /* RATaskBoardListListViewController.m */; };
12271233
B16EEF08208DDBB6005ABFD5 /* timeline_icon_read@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B16EEF06208DDBB5005ABFD5 /* timeline_icon_read@3x.png */; };
12281234
B16EEF09208DDBB6005ABFD5 /* timeline_icon_unread@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B16EEF07208DDBB6005ABFD5 /* timeline_icon_unread@3x.png */; };
12291235
B16EEF13209080D7005ABFD5 /* TaskBoardsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B16EEF12209080D7005ABFD5 /* TaskBoardsViewController.m */; };
@@ -3336,6 +3342,17 @@
33363342
B152ED4D2090B223004A6E8A /* ProjectSettingEntranceController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProjectSettingEntranceController.m; sourceTree = "<group>"; };
33373343
B152ED522091B7CB004A6E8A /* ProjectArchiveViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProjectArchiveViewController.h; sourceTree = "<group>"; };
33383344
B152ED532091B7CB004A6E8A /* ProjectArchiveViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProjectArchiveViewController.m; sourceTree = "<group>"; };
3345+
B152ED582092BF46004A6E8A /* EABoardTaskList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EABoardTaskList.h; sourceTree = "<group>"; };
3346+
B152ED592092BF46004A6E8A /* EABoardTaskList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EABoardTaskList.m; sourceTree = "<group>"; };
3347+
B152ED5B2092D51E004A6E8A /* EATaskBoardListTaskCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EATaskBoardListTaskCell.h; sourceTree = "<group>"; };
3348+
B152ED5C2092D51E004A6E8A /* EATaskBoardListTaskCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EATaskBoardListTaskCell.m; sourceTree = "<group>"; };
3349+
B152ED5E2093018A004A6E8A /* EABoardTaskListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EABoardTaskListView.h; sourceTree = "<group>"; };
3350+
B152ED5F2093018A004A6E8A /* EABoardTaskListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EABoardTaskListView.m; sourceTree = "<group>"; };
3351+
B152ED6120935524004A6E8A /* EABoardTaskListBlankView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EABoardTaskListBlankView.h; sourceTree = "<group>"; };
3352+
B152ED6220935524004A6E8A /* EABoardTaskListBlankView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EABoardTaskListBlankView.m; sourceTree = "<group>"; };
3353+
B152ED6420935594004A6E8A /* EABoardTaskListBlankView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EABoardTaskListBlankView.xib; sourceTree = "<group>"; };
3354+
B152ED66209420CD004A6E8A /* RATaskBoardListListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RATaskBoardListListViewController.h; sourceTree = "<group>"; };
3355+
B152ED67209420CD004A6E8A /* RATaskBoardListListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RATaskBoardListListViewController.m; sourceTree = "<group>"; };
33393356
B16EEF06208DDBB5005ABFD5 /* timeline_icon_read@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_read@3x.png"; sourceTree = "<group>"; };
33403357
B16EEF07208DDBB6005ABFD5 /* timeline_icon_unread@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_unread@3x.png"; sourceTree = "<group>"; };
33413358
B16EEF11209080D7005ABFD5 /* TaskBoardsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TaskBoardsViewController.h; sourceTree = "<group>"; };
@@ -5115,6 +5132,11 @@
51155132
4E80E93B1E02353900DE1BC6 /* CodingSearchDisplayView.m */,
51165133
B1890C372015D89A00F52ABA /* WikiMenuListView.h */,
51175134
B1890C362015D89A00F52ABA /* WikiMenuListView.m */,
5135+
B152ED5E2093018A004A6E8A /* EABoardTaskListView.h */,
5136+
B152ED5F2093018A004A6E8A /* EABoardTaskListView.m */,
5137+
B152ED6120935524004A6E8A /* EABoardTaskListBlankView.h */,
5138+
B152ED6220935524004A6E8A /* EABoardTaskListBlankView.m */,
5139+
B152ED6420935594004A6E8A /* EABoardTaskListBlankView.xib */,
51185140
);
51195141
path = TableListView;
51205142
sourceTree = "<group>";
@@ -5756,6 +5778,8 @@
57565778
B1944146206BB89100147158 /* EALocalCodeViewController.m */,
57575779
B16EEF11209080D7005ABFD5 /* TaskBoardsViewController.h */,
57585780
B16EEF12209080D7005ABFD5 /* TaskBoardsViewController.m */,
5781+
B152ED66209420CD004A6E8A /* RATaskBoardListListViewController.h */,
5782+
B152ED67209420CD004A6E8A /* RATaskBoardListListViewController.m */,
57595783
);
57605784
path = Controllers;
57615785
sourceTree = "<group>";
@@ -6259,6 +6283,8 @@
62596283
B19D4EED1F6FCEAC00C598F3 /* CodingSkill.m */,
62606284
B1890C332015D87800F52ABA /* EAWiki.h */,
62616285
B1890C342015D87800F52ABA /* EAWiki.m */,
6286+
B152ED582092BF46004A6E8A /* EABoardTaskList.h */,
6287+
B152ED592092BF46004A6E8A /* EABoardTaskList.m */,
62626288
);
62636289
path = Models;
62646290
sourceTree = "<group>";
@@ -6784,6 +6810,8 @@
67846810
B1817EEC2064FD9400E9BAD1 /* EACodeReleaseAttachmentsOrReferencesCell.m */,
67856811
B1944148206BB8BB00147158 /* EALocalCodeListCell.h */,
67866812
B1944149206BB8BB00147158 /* EALocalCodeListCell.m */,
6813+
B152ED5B2092D51E004A6E8A /* EATaskBoardListTaskCell.h */,
6814+
B152ED5C2092D51E004A6E8A /* EATaskBoardListTaskCell.m */,
67876815
);
67886816
path = Cell;
67896817
sourceTree = "<group>";
@@ -7595,6 +7623,7 @@
75957623
4EB52F121C74691B00B5EBEA /* password_unlook@3x.png in Resources */,
75967624
B16EEF09208DDBB6005ABFD5 /* timeline_icon_unread@3x.png in Resources */,
75977625
D0C447CD1C02DB6700DC1C4B /* pop_Message@3x.png in Resources */,
7626+
B152ED6520935594004A6E8A /* EABoardTaskListBlankView.xib in Resources */,
75987627
4E63840B1B33F9B400D98648 /* comment_bg@2x.png in Resources */,
75997628
4EB52F2E1C77138A00B5EBEA /* button_scan@2x.png in Resources */,
76007629
B1AB5CA0202953E50075A669 /* terminal_triangle@3x.png in Resources */,
@@ -8308,6 +8337,7 @@
83088337
4E72F82D1B144778001B6CE6 /* NSMutableString+Common.m in Sources */,
83098338
4E25271A1C327FAE0032A7F4 /* UIViewController+BackButtonHandler.m in Sources */,
83108339
4EBD7FB41CE4833D00B3AF49 /* CountryCodeCell.m in Sources */,
8340+
B152ED68209420CD004A6E8A /* RATaskBoardListListViewController.m in Sources */,
83118341
13C8FE7F1CA79B90001E30FA /* DynamicActivityCell.m in Sources */,
83128342
4E4D6A791B1C6C7800FD2E49 /* MRPRDetailCell.m in Sources */,
83138343
8EF643CA19FF7E2900F7EEB0 /* TopicContentCell.m in Sources */,
@@ -8422,6 +8452,7 @@
84228452
B12B647A1FFB61AD00ACFDCC /* QBAlbumsViewController.m in Sources */,
84238453
0AB591AC1AB6D2F60076C454 /* TweetSendLocaitonMapViewController.m in Sources */,
84248454
4EA7F1611A6D192B00A046BD /* UIButton+WebCache.m in Sources */,
8455+
B152ED6320935524004A6E8A /* EABoardTaskListBlankView.m in Sources */,
84258456
8EE72BE419E3F2E8002C11D9 /* SDWebImageManager+MJ.m in Sources */,
84268457
3A38784C1AE36EF00078D5DE /* TopicListView.m in Sources */,
84278458
8E1C3DEA19E7D58A00EF3032 /* AbstractActionSheetPicker.m in Sources */,
@@ -8473,6 +8504,7 @@
84738504
8EA6D13219E240C40076D59C /* RegisterViewController.m in Sources */,
84748505
923399661C00441700F29E04 /* ShopBanner.m in Sources */,
84758506
8EF643C519FF7E2900F7EEB0 /* TitleRImageMoreCell.m in Sources */,
8507+
B152ED602093018A004A6E8A /* EABoardTaskListView.m in Sources */,
84768508
4E4969401DCB0BCE0065028E /* FileShare.m in Sources */,
84778509
4ED6181B1C3A72AE0017946C /* ShopMutileValueCell.m in Sources */,
84788510
4E217F151A70EDC700F6DF88 /* SVWebViewControllerActivitySafari.m in Sources */,
@@ -8664,6 +8696,7 @@
86648696
927AFF411BFF613500AAE593 /* BaseModel.m in Sources */,
86658697
09A058951E0AAA2F00C1CA3F /* TaskSelectionView.m in Sources */,
86668698
8EF643BD19FF7E2900F7EEB0 /* ProjectListCell.m in Sources */,
8699+
B152ED5A2092BF46004A6E8A /* EABoardTaskList.m in Sources */,
86678700
4E0BD86F1B6C7E3D0061CAA6 /* CSTopicDetailVC.m in Sources */,
86688701
8EF643C819FF7E2900F7EEB0 /* ToMessageCell.m in Sources */,
86698702
4E217F111A70EDC700F6DF88 /* SVWebViewControllerActivityChrome.m in Sources */,
@@ -8680,6 +8713,7 @@
86808713
4E3068401E0B781A00AEE0CE /* LDNetDiagnoService.m in Sources */,
86818714
4E2F6A571C437D1D00A25502 /* EditCodeViewController.m in Sources */,
86828715
8EF83F9419EB78CC00E86DE7 /* SettingTextViewController.m in Sources */,
8716+
B152ED5D2092D51E004A6E8A /* EATaskBoardListTaskCell.m in Sources */,
86838717
4ED618181C3A6CA50017946C /* LocationCell.m in Sources */,
86848718
B12B64761FFB61AD00ACFDCC /* QBVideoIconView.m in Sources */,
86858719
8EA6D1B019E240C40076D59C /* Comment.m in Sources */,

‎Coding_iOS/.DS_Store

0 Bytes
Binary file not shown.

‎Coding_iOS/Controllers/EditTaskViewController.m

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#import "NProjectViewController.h"
2727
#import "FunctionTipsManager.h"
2828
#import "MartFunctionTipView.h"
29+
#import "RATaskBoardListListViewController.h"
2930

3031
@interface EditTaskViewController ()<TTTAttributedLabelDelegate>
3132
@property (strong, nonatomic) UITableView *myTableView;
@@ -91,10 +92,11 @@ - (void)viewDidLoad
9192
RAC(self.navigationItem.rightBarButtonItem, enabled) =
9293
[RACSignal combineLatest:@[RACObserve(self, myCopyTask.content),
9394
RACObserve(self, myCopyTask.owner),
95+
RACObserve(self, myCopyTask.task_board_list),
9496
RACObserve(self, myCopyTask.priority),
9597
RACObserve(self, myCopyTask.status),
9698
RACObserve(self, myCopyTask.deadline),
97-
RACObserve(self, myCopyTask.task_description.markdown)] reduce:^id (NSString *content, User *owner, NSNumber *priority, NSNumber *status, NSString *deadline){
99+
RACObserve(self, myCopyTask.task_description.markdown)] reduce:^id (NSString *content, EABoardTaskList *task_board_list, User *owner, NSNumber *priority, NSNumber *status, NSString *deadline){
98100
@strongify(self);
99101
BOOL enabled = ![self.myCopyTask isSameToTask:self.myTask];
100102
if (self.myCopyTask.handleType > TaskHandleTypeEdit) {
@@ -338,6 +340,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
338340
}else if (section == 1){
339341
TaskHandleType handleType = self.myCopyTask.handleType;
340342
row = handleType == TaskHandleTypeEdit? 5: handleType == TaskHandleTypeAddWithProject? 4: 5;
343+
row += 1;//加一个看板项
341344
}else if (section == 2 && _myTask.resourceReference.itemList.count > 0){
342345
row = 1;
343346
}else{
@@ -514,6 +517,34 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
514517
[_self.myTableView reloadData];
515518
} cellBtnBlock:nil];
516519
[self.navigationController pushViewController:vc animated:YES];
520+
}else if (cellType == LeftImage_LRTextCellTypeTaskBoardList) {
521+
if (_myCopyTask.project == nil) {
522+
[NSObject showHudTipStr:@"需要选定所属项目先~"];
523+
return;
524+
}
525+
RATaskBoardListListViewController *vc = [RATaskBoardListListViewController new];
526+
vc.curPro = _myCopyTask.project;
527+
vc.selectedBoardTL = _myCopyTask.task_board_list;
528+
vc.needToShowDoneBoardTL = (_myCopyTask.handleType == TaskHandleTypeEdit);
529+
vc.selectedBlock = ^(EABoardTaskList *selectedBoardTL) {
530+
ESStrongSelf;
531+
if (_self.myCopyTask.handleType == TaskHandleTypeEdit) {//看板只能单项修改
532+
[NSObject showStatusBarQueryStr:@"正在修改看板列表"];
533+
[[Coding_NetAPIManager sharedManager] request_PutTask:_self.myCopyTask toBoardTaskList:selectedBoardTL andBlock:^(id data, NSError *error) {
534+
if (data) {
535+
[NSObject showStatusBarSuccessStr:@"看板列表已修改"];
536+
_self.myCopyTask.task_board_list = _self.myTask.task_board_list = selectedBoardTL;
537+
[_self.myTableView reloadData];
538+
}else{
539+
[NSObject showStatusBarError:error];
540+
}
541+
}];
542+
}else{
543+
_self.myCopyTask.task_board_list = selectedBoardTL;
544+
[_self.myTableView reloadData];
545+
}
546+
};
547+
[self.navigationController pushViewController:vc animated:YES];
517548
}else if (cellType == LeftImage_LRTextCellTypeTaskPriority){
518549
ValueListViewController *vc = [[ValueListViewController alloc] init];
519550
[vc setTitle:@"优先级" valueList:kTaskPrioritiesDisplay defaultSelectIndex:_myCopyTask.priority.intValue type:ValueListTypeTaskPriority selectBlock:^(NSInteger index) {

‎Coding_iOS/Controllers/MeSetting/SettingTextViewController.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ - (void)doneBtnClicked:(id)sender{
8686
if (self.doneBlock) {
8787
self.doneBlock(_myTextValue);
8888
}
89-
if (self.settingType == SettingTypeOnlyText) {
90-
[self.navigationController popViewControllerAnimated:YES];
91-
}else{
89+
if (self.navigationController.viewControllers.count <= 1) {
9290
[self.view endEditing:YES];
9391
[self dismissViewControllerAnimated:YES completion:^{
9492
}];
93+
}else{
94+
[self.navigationController popViewControllerAnimated:YES];
9595
}
9696
}
9797
- (void)dismissSelf{

‎Coding_iOS/Controllers/ProjectViewController.m

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -231,20 +231,15 @@ - (void)configRightBarButtonItemWithViewType:(ProjectViewType)viewType{
231231
if ((viewType == ProjectViewTypeMembers && _myProject.current_user_role_id.integerValue >= 90)
232232
|| viewType == ProjectViewTypeTasks
233233
|| viewType == ProjectViewTypeTopics
234-
|| viewType == ProjectViewTypeFiles) {
234+
|| viewType == ProjectViewTypeFiles
235+
|| viewType == ProjectViewTypeCodes) {
235236
navRightBtn = [[UIBarButtonItem alloc]
236237
initWithImage:[UIImage
237-
imageNamed:(viewType == ProjectViewTypeCodes ? @"timeBtn_Nav" : @"addBtn_Nav")]
238+
imageNamed:(viewType == ProjectViewTypeCodes ? @"moreBtn_Nav" : @"addBtn_Nav")]
238239
style:UIBarButtonItemStylePlain
239240
target:self
240241
action:@selector(navRightBtnClicked)];
241-
}else if (viewType == ProjectViewTypeCodes){
242-
UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
243-
[button setImage:[UIImage imageNamed:@"moreBtn_Nav"] forState:UIControlStateNormal];
244-
[button addTarget:self action:@selector(navRightBtnClicked) forControlEvents:UIControlEventTouchUpInside];
245-
navRightBtn = [[UIBarButtonItem alloc] initWithCustomView:button];
246-
}
247-
242+
}
248243
if (ProjectViewTypeTasks == viewType) {
249244
UIBarButtonItem *screenBar = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"task_filter_nav_unchecked"] style:UIBarButtonItemStylePlain target:self action:@selector(screenItemClicked:)];
250245
self.navigationItem.rightBarButtonItems = @[navRightBtn, screenBar];

‎Coding_iOS/Controllers/RATaskBoardListListViewController.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// RATaskBoardListListViewController.h
3+
// Coding_iOS
4+
//
5+
// Created by Easeeeeeeeee on 2018/4/28.
6+
// Copyright © 2018年 Coding. All rights reserved.
7+
//
8+
9+
#import "BaseViewController.h"
10+
#import "ProjectViewController.h"
11+
#import "EABoardTaskList.h"
12+
13+
@interface RATaskBoardListListViewController : BaseViewController
14+
@property (strong, nonatomic) Project *curPro;
15+
@property (strong, nonatomic) EABoardTaskList *selectedBoardTL;
16+
@property (assign, nonatomic) BOOL needToShowDoneBoardTL;
17+
@property (copy, nonatomic) void(^selectedBlock)(EABoardTaskList *selectedBoardTL);
18+
@end

0 commit comments

Comments
 (0)