首页创建任务流程优化

wanghengheng · wanghengheng · commit fceef6d2acf2 · 2016-05-19T16:20:40.000+08:00
diff --git a/Coding_iOS/Controllers/EditTaskViewController.h b/Coding_iOS/Controllers/EditTaskViewController.h
@@ -13,5 +13,6 @@
 @interface EditTaskViewController : BaseViewController<UITableViewDataSource, UITableViewDelegate, UIMessageInputViewDelegate>
 @property (strong, nonatomic) Task *myTask, *myCopyTask;
 @property (copy, nonatomic) void(^taskChangedBlock)();
+@property (copy, nonatomic) void(^doneBlock)(EditTaskViewController *vc);
 - (void)queryToRefreshTaskDetail;
 @end
diff --git a/Coding_iOS/Controllers/EditTaskViewController.m b/Coding_iOS/Controllers/EditTaskViewController.m
@@ -216,7 +216,7 @@ - (void)doneBtnClicked{
                 if (_taskChangedBlock) {
                     _taskChangedBlock();
                 }
-                [self.navigationController popViewControllerAnimated:YES];
+                [self handleDone];
             }
         }];
     }else{
@@ -232,14 +232,21 @@ - (void)doneBtnClicked{
                 if (_taskChangedBlock) {
                     _taskChangedBlock();
                 }
-                [self.navigationController popViewControllerAnimated:YES];
+                [self handleDone];
             }else{
                 [NSObject showStatusBarError:error];
             }
         }];
     }
 }
 
+- (void)handleDone{
+    if (self.doneBlock) {
+        self.doneBlock(self);
+    }else{
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
 - (void)deleteTask:(Task *)toDelete{
     if (toDelete.isRequesting) {
         return;
@@ -460,16 +467,15 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         LeftImage_LRTextCellType cellType = _myCopyTask.handleType == TaskHandleTypeAddWithoutProject? indexPath.row : indexPath.row +1;
         if (cellType == LeftImage_LRTextCellTypeTaskProject) {
             ProjectToChooseListViewController *vc = [[ProjectToChooseListViewController alloc] init];
-            vc.projectChoosedBlock = ^(Project *project){
+            vc.projectChoosedBlock = ^(ProjectToChooseListViewController *blockChooseVC, Project *project){
                 ESStrongSelf;
                 _self.myCopyTask.project = project;
                 _self.myCopyTask.owner = nil;//更换新的执行人
                 [_self.myCopyTask.labels removeAllObjects];
                 [_self.myTableView reloadData];
+                [blockChooseVC.navigationController popViewControllerAnimated:YES];
             };
             [self.navigationController pushViewController:vc animated:YES];
-
-            NSLog(@"haimeizuo");
         }else if (cellType == LeftImage_LRTextCellTypeTaskOwner) {
             if (_myCopyTask.project == nil) {
                 [NSObject showHudTipStr:@"需要选定所属项目先~"];
diff --git a/Coding_iOS/Controllers/ProjectToChooseListViewController.h b/Coding_iOS/Controllers/ProjectToChooseListViewController.h
@@ -10,5 +10,5 @@
 #import "Project.h"
 
 @interface ProjectToChooseListViewController : BaseViewController
-@property (copy, nonatomic) void(^projectChoosedBlock)(Project *project);
+@property (copy, nonatomic) void(^projectChoosedBlock)(ProjectToChooseListViewController *chooseVC, Project *project);
 @end
diff --git a/Coding_iOS/Controllers/ProjectToChooseListViewController.m b/Coding_iOS/Controllers/ProjectToChooseListViewController.m
@@ -24,9 +24,8 @@ - (void)viewDidLoad {
     __weak typeof(self) weakSelf = self;
     ProjectListView *listView = [[ProjectListView alloc] initWithFrame:self.view.bounds projects:self.curPros block:^(Project *project) {
         if (weakSelf.projectChoosedBlock) {
-            weakSelf.projectChoosedBlock(project);
+            weakSelf.projectChoosedBlock(self, project);
         }
-        [weakSelf.navigationController popViewControllerAnimated:YES];
     } tabBarHeight:0];
     [self.view addSubview:listView];
     [listView mas_makeConstraints:^(MASConstraintMaker *make) {
diff --git a/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m
@@ -31,6 +31,8 @@
 #import "ZXScanCodeViewController.h"
 #import "OTPListViewController.h"
 #import "WebViewController.h"
+#import "ProjectToChooseListViewController.h"
+
 @interface Project_RootViewController ()<UISearchBarDelegate, UITableViewDataSource, UITableViewDelegate>
 @property (strong, nonatomic) NSMutableDictionary *myProjectsDict;
 @property (strong, nonatomic) UISearchDisplayController *mySearchDisplayController;
@@ -376,10 +378,25 @@ - (void)goToNewProjectVC{
     [self.navigationController pushViewController:newProjectVC animated:YES];
 }
 - (void)goToNewTaskVC{
-    EditTaskViewController *vc = [[EditTaskViewController alloc] init];
-    vc.myTask = [Task taskWithProject:nil andUser:nil];
-    [self.navigationController pushViewController:vc animated:YES];
+    __weak typeof(self) weakSelf = self;
+    ProjectToChooseListViewController *chooseVC = [[ProjectToChooseListViewController alloc] init];
+    chooseVC.projectChoosedBlock = ^(ProjectToChooseListViewController *blockChooseVC, Project *project){
+        [weakSelf goToNewTaskFromVC:blockChooseVC withPro:project];
+    };
+    [self.navigationController pushViewController:chooseVC animated:YES];
+}
+
+- (void)goToNewTaskFromVC:(ProjectToChooseListViewController *)proListVC withPro:(Project *)project{
+    EditTaskViewController *taskVC = [EditTaskViewController new];
+    taskVC.myTask = [Task taskWithProject:project andUser:[Login curLoginUser]];
+    taskVC.myTask.handleType = TaskHandleTypeAddWithoutProject;
+    __weak typeof(self) weakSelf = self;
+    taskVC.doneBlock = ^(EditTaskViewController *vc){
+        [vc.navigationController popToViewController:weakSelf animated:YES];
+    };
+    [proListVC.navigationController pushViewController:taskVC animated:YES];
 }
+
 - (void)goToNewTweetVC{
     TweetSendViewController *vc = [[TweetSendViewController alloc] init];
     vc.sendNextTweet = ^(Tweet *nextTweet){
