Xchn
diff --git a/Collapse file
‎Coding_iOS/Controllers/TopicDetailViewController.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/TopicDetailViewController.m
+10-8Lines changed: 10 additions & 8 deletions b/Collapse file
‎Coding_iOS/Controllers/TopicDetailViewController.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/TopicDetailViewController.m
+10-8Lines changed: 10 additions & 8 deletions
diff --git a/Collapse file
‎Coding_iOS/Models/ProjectTopic.h‎
Copy file name to clipboardExpand all lines: Coding_iOS/Models/ProjectTopic.h
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎Coding_iOS/Models/ProjectTopic.h‎
Copy file name to clipboardExpand all lines: Coding_iOS/Models/ProjectTopic.h
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎Coding_iOS/Util/Manager/Coding_NetAPIManager.h‎
Copy file name to clipboardExpand all lines: Coding_iOS/Util/Manager/Coding_NetAPIManager.h
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎Coding_iOS/Util/Manager/Coding_NetAPIManager.h‎
Copy file name to clipboardExpand all lines: Coding_iOS/Util/Manager/Coding_NetAPIManager.h
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Util/Manager/Coding_NetAPIManager.m
+14Lines changed: 14 additions & 0 deletions b/Collapse file
‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Util/Manager/Coding_NetAPIManager.m
+14Lines changed: 14 additions & 0 deletions
@@ -404,19 +404,21 @@ - (void)doCommentToTopic:(ProjectTopic *)toComment sender:(id)sender
 - (void)deleteTopic:(ProjectTopic *)curTopic isComment:(BOOL)isC{
     if (curTopic) {
         __weak typeof(self) weakSelf = self;
-        [[Coding_NetAPIManager sharedManager] request_ProjectTopic_Delete_WithObj:curTopic andBlock:^(id data, NSError *error) {
-            if (data) {
-                if (isC) {
-                    [weakSelf.curTopic.comments.list removeObject:_toComment];
-                    [weakSelf.myTableView reloadData];
-                }else{
+        if (!isC) {
+            [[Coding_NetAPIManager sharedManager] request_ProjectTopic_Delete_WithObj:curTopic andBlock:^(id data, NSError *error) {
+                if (data) {
                     if (weakSelf.deleteTopicBlock) {
                         weakSelf.deleteTopicBlock(weakSelf.curTopic);
                     }
                     [weakSelf.navigationController popViewControllerAnimated:YES];
                 }
-            }
-        }];
+            }];
+        }else{
+            [[Coding_NetAPIManager sharedManager] request_ProjectTopicComment_Delete_WithObj:curTopic projectId:_curTopic.project.id andBlock:^(id data, NSError *error) {
+                [weakSelf.curTopic.comments.list removeObject:_toComment];
+                [weakSelf.myTableView reloadData];
+            }];
+        }
     }
 }
 
 
@@ -16,7 +16,7 @@
 
 @interface ProjectTopic : NSObject
 
-@property (readwrite, nonatomic, strong) NSNumber *id, *child_count, *current_user_role_id, *owner_id, *project_id, *parent_id, *number,*resource_id;
+@property (readwrite, nonatomic, strong) NSNumber *id, *child_count, *current_user_role_id, *owner_id, *project_id, *parent_id, *number,*resource_id, *topic_id;
 @property (readwrite, nonatomic, strong) NSDate *created_at;
 @property (readwrite, nonatomic, strong) NSDate *updated_at;
 @property (readwrite, nonatomic, strong) NSString *title, *content, *path,*contentStr;
 
@@ -166,6 +166,7 @@ typedef NS_ENUM(NSInteger, PurposeType) {
 - (void)request_Comments_WithProjectTpoic:(ProjectTopic *)proTopic andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_DoComment_WithProjectTpoic:(ProjectTopic *)proTopic andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_ProjectTopic_Delete_WithObj:(ProjectTopic *)proTopic andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_ProjectTopicComment_Delete_WithObj:(ProjectTopic *)proTopic projectId:(NSNumber *)projectId andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_ChangeWatcher:(User *)watcher ofTopic:(ProjectTopic *)proTopic andBlock:(void (^)(id data, NSError *error))block;
 
 - (void)request_ModifyProjectTpoicLabel:(ProjectTopic *)proTopic
 
@@ -1546,6 +1546,20 @@ - (void)request_ProjectTopic_Delete_WithObj:(ProjectTopic *)proTopic andBlock:(v
         }
     }];
 }
+
+- (void)request_ProjectTopicComment_Delete_WithObj:(ProjectTopic *)proTopic projectId:(NSNumber *)projectId andBlock:(void (^)(id data, NSError *error))block{
+    NSString *path = [NSString stringWithFormat:@"api/project/%@/topic/%@/comment/%@", projectId, proTopic.topic_id, proTopic.id];
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Delete andBlock:^(id data, NSError *error) {
+        if (data) {
+            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"讨论评论_删除"];
+            
+            block(data, nil);
+        }else{
+            block(nil, error);
+        }
+    }];
+}
+
 - (void)request_ChangeWatcher:(User *)watcher ofTopic:(ProjectTopic *)proTopic andBlock:(void (^)(id data, NSError *error))block{
     NSString *path = [NSString stringWithFormat:@"api/topic/%@/user/%@/watch", proTopic.id.stringValue, watcher.global_key];
     User *hasWatcher = [proTopic hasWatcher:watcher];