标签管理的 bug - 任务 | 讨论

wanghengheng · wanghengheng · commit 16f85506769d · 2016-02-26T17:19:39.000+08:00
diff --git a/Coding_iOS/Coding_iOS-Info.plist b/Coding_iOS/Coding_iOS-Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3.8.201602231730</string>
+	<string>3.8.201602251530</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>
diff --git a/Coding_iOS/Controllers/EditLabelViewController.h b/Coding_iOS/Controllers/EditLabelViewController.h
@@ -14,6 +14,6 @@
 @property (strong, nonatomic) NSArray *orignalTags;
 @property (strong, nonatomic) Project *curProject;
 
-@property (copy, nonatomic) void(^tagsChangedBlock)(EditLabelViewController *vc, NSMutableArray *selectedTags);
+@property (copy, nonatomic) void(^tagsSelectedBlock)(EditLabelViewController *vc, NSMutableArray *selectedTags);
 
 @end
diff --git a/Coding_iOS/Controllers/EditLabelViewController.m b/Coding_iOS/Controllers/EditLabelViewController.m
@@ -78,6 +78,21 @@ - (void)viewWillAppear:(BOOL)animated
     [self.myTableView reloadData];
 }
 
+- (void)viewWillDisappear:(BOOL)animated{
+    [super viewWillDisappear:YES];
+    if (_tagList.count > 0 && _selectedTags.count > 0) {
+        for (ProjectTag *tag in _tagList) {
+            ProjectTag *orignalTag = [ProjectTag tags:_selectedTags hasTag:tag];
+            if (orignalTag) {
+                [_selectedTags replaceObjectAtIndex:[_selectedTags indexOfObject:orignalTag] withObject:tag];
+            }
+        }
+    }
+    if (_tagsSelectedBlock) {
+        _tagsSelectedBlock(self, _selectedTags);
+    }
+}
+
 - (void)sendRequest
 {
     [self.view beginLoading];
@@ -88,15 +103,11 @@ - (void)sendRequest
             weakSelf.tagList = data;
             [weakSelf.myTableView reloadData];
         }
-    }];
-}
+    }];}
 
 #pragma mark - click
-- (void)okBtnClick
-{
-    if (self.tagsChangedBlock) {
-        self.tagsChangedBlock(self, _selectedTags);
-    }
+- (void)okBtnClick{
+    [self.navigationController popViewControllerAnimated:YES];
 }
 
 - (void)addBtnClick:(UIButton *)sender
diff --git a/Coding_iOS/Controllers/EditTaskViewController.m b/Coding_iOS/Controllers/EditTaskViewController.m
@@ -571,39 +571,32 @@ - (void)goToTagsVC{
     vc.curProject = self.myCopyTask.project;
     vc.orignalTags = self.myCopyTask.labels;
     @weakify(self);
-    vc.tagsChangedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){
+    vc.tagsSelectedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){
         @strongify(self);
         [self tagsHasChanged:selectedTags fromVC:vc];
     };
     [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (void)tagsHasChanged:(NSMutableArray *)selectedTags fromVC:(EditLabelViewController *)vc{
-    if ([ProjectTag tags:self.myCopyTask.labels isEqualTo:selectedTags]) {
-        [vc.navigationController popViewControllerAnimated:YES];
+    if ([ProjectTag tags:self.myCopyTask.labels isEqualTo:self.myTask.labels] || self.myCopyTask.handleType > TaskHandleTypeEdit) {
+        self.myTask.labels = [selectedTags mutableCopy];
+        self.myCopyTask.labels = [selectedTags mutableCopy];
+        [self.myTableView reloadData];
     }else{
-        if (self.myCopyTask.handleType > TaskHandleTypeEdit) {
-            self.myCopyTask.labels = selectedTags;
-            self.myTask.labels = [self.myCopyTask.labels mutableCopy];
-            [self.myTableView reloadData];
-            [vc.navigationController popViewControllerAnimated:YES];
-        }else{
-            vc.navigationItem.rightBarButtonItem.enabled = NO;
-            @weakify(self);
-            [[Coding_NetAPIManager sharedManager] request_EditTask:_myCopyTask withTags:selectedTags andBlock:^(id data, NSError *error) {
-                @strongify(self);
-                vc.navigationItem.rightBarButtonItem.enabled = YES;
-                if (data) {
-                    self.myCopyTask.labels = selectedTags;
-                    self.myTask.labels = [self.myCopyTask.labels mutableCopy];
-                    [self.myTableView reloadData];
-                    if (self.taskChangedBlock) {
-                        self.taskChangedBlock();
-                    }
-                    [vc.navigationController popViewControllerAnimated:YES];
+        @weakify(self);
+        [[Coding_NetAPIManager sharedManager] request_EditTask:_myCopyTask withTags:selectedTags andBlock:^(id data, NSError *error) {
+            @strongify(self);
+            if (data) {
+                self.myCopyTask.labels = [selectedTags mutableCopy];
+                self.myTask.labels = [selectedTags mutableCopy];
+                [self.myTableView reloadData];
+                if (self.taskChangedBlock) {
+                    self.taskChangedBlock();
                 }
-            }];
-        }
+            }
+        }];
+
     }
 }
 
diff --git a/Coding_iOS/Controllers/EditTopicViewController.m b/Coding_iOS/Controllers/EditTopicViewController.m
@@ -282,10 +282,9 @@ - (void)addtitleBtnClick
     vc.curProject = _curProTopic.project;
     vc.orignalTags = _curProTopic.mdLabels;
     @weakify(self);
-    vc.tagsChangedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){
+    vc.tagsSelectedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){
         @strongify(self);
         self.curProTopic.mdLabels = selectedTags;
-        [vc.navigationController popViewControllerAnimated:YES];
     };
     [self.navigationController pushViewController:vc animated:YES];
 }
diff --git a/Coding_iOS/Controllers/ResetLabelViewController.m b/Coding_iOS/Controllers/ResetLabelViewController.m
@@ -48,11 +48,11 @@ - (void)viewDidLoad {
         }];
         tableView;
     });
+    _tempStr = _ptLabel.name;
 }
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    _tempStr = _ptLabel.name;
     [_myTableView reloadData];
 }
 
@@ -105,7 +105,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     [cell.labelField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
     [cell.colorBtn addTarget:self action:@selector(colorBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     cell.backgroundColor = kColorTableBG;
-    cell.labelField.text = _ptLabel.name;
+    cell.labelField.text = _tempStr;
     cell.colorBtn.backgroundColor = [UIColor colorWithHexString:[_ptLabel.color stringByReplacingOccurrencesOfString:@"#" withString:@"0x"]];
     return cell;
 }
diff --git a/Coding_iOS/Controllers/TopicDetailViewController.m b/Coding_iOS/Controllers/TopicDetailViewController.m
@@ -135,27 +135,26 @@ - (void)addtitleBtnClick
     vc.curProject = self.curTopic.project;
     vc.orignalTags = self.curTopic.mdLabels;
     @weakify(self);
-    vc.tagsChangedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){
+    vc.tagsSelectedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){
         @strongify(self);
         [self tagsHasChanged:selectedTags fromVC:vc];
     };
     [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (void)tagsHasChanged:(NSMutableArray *)selectedTags fromVC:(EditLabelViewController *)vc{
-    self.curTopic.mdLabels = selectedTags;
     if ([ProjectTag tags:self.curTopic.mdLabels isEqualTo:self.curTopic.labels]) {
-        [vc.navigationController popViewControllerAnimated:YES];
+        self.curTopic.mdLabels = [selectedTags mutableCopy];
+        self.curTopic.labels = [selectedTags mutableCopy];
+        [self.myTableView reloadData];
     }else{
-        vc.navigationItem.rightBarButtonItem.enabled = NO;
         @weakify(self);
         [[Coding_NetAPIManager sharedManager] request_ModifyProjectTpoicLabel:self.curTopic andBlock:^(id data, NSError *error) {
             @strongify(self);
-            vc.navigationItem.rightBarButtonItem.enabled = YES;
             if (data) {
+                self.curTopic.mdLabels = [selectedTags mutableCopy];
                 self.curTopic.labels = [self.curTopic.mdLabels mutableCopy];
                 [self.myTableView reloadData];
-                [vc.navigationController popViewControllerAnimated:YES];
             }
         }];
     }

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ - (void)viewDidLoad {`
`48`	`48`	`}];`
`49`	`49`	`tableView;`
`50`	`50`	`});`
	`51`	`+ _tempStr = _ptLabel.name;`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`- (void)viewWillAppear:(BOOL)animated{`
`54`	`55`	`[super viewWillAppear:animated];`
`55`		`- _tempStr = _ptLabel.name;`
`56`	`56`	`[_myTableView reloadData];`
`57`	`57`	`}`
`58`	`58`
`@@ -105,7 +105,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`105`	`105`	`[cell.labelField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];`
`106`	`106`	`[cell.colorBtn addTarget:self action:@selector(colorBtnClick:) forControlEvents:UIControlEventTouchUpInside];`
`107`	`107`	`cell.backgroundColor = kColorTableBG;`
`108`		`- cell.labelField.text = _ptLabel.name;`
	`108`	`+ cell.labelField.text = _tempStr;`
`109`	`109`	`cell.colorBtn.backgroundColor = [UIColor colorWithHexString:[_ptLabel.color stringByReplacingOccurrencesOfString:@"#" withString:@"0x"]];`
`110`	`110`	`return cell;`
`111`	`111`	`}`