文件 - 添加/删除 评论

wanghengheng · wanghengheng · commit 03f617434f31 · 2015-08-13T15:55:31.000+08:00
diff --git a/Coding_iOS/Controllers/FileActivitiesViewController.m b/Coding_iOS/Controllers/FileActivitiesViewController.m
@@ -22,7 +22,6 @@
 
 @interface FileActivitiesViewController ()<UITableViewDataSource, UITableViewDelegate, TTTAttributedLabelDelegate, EaseToolBarDelegate>
 @property (strong, nonatomic) ProjectFile *curFile;
-@property (strong, nonatomic) Project *curProject;
 @property (strong, nonatomic) NSMutableArray *activityList;
 
 @property (strong, nonatomic) UITableView *myTableView;
@@ -39,17 +38,6 @@ + (instancetype)vcWithFile:(ProjectFile *)file{
     return vc;
 }
 
-- (void)setCurFile:(ProjectFile *)curFile{
-    _curFile = curFile;
-    if (!_curProject) {
-        NSString *project_id_str = [[[[_curFile.owner_preview componentsSeparatedByString:@"project/"] lastObject] componentsSeparatedByString:@"/"] firstObject];
-        if (project_id_str.length > 0 && [project_id_str isPureInt]) {
-            _curProject = [Project new];
-            _curProject.id = [NSNumber numberWithInteger:project_id_str.integerValue];
-        }
-    }
-}
-
 - (void)viewDidLoad
 {
     [super viewDidLoad];
@@ -194,52 +182,59 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         }else if ([title isEqualToString:@"&#21024;&#38500;"]){
             [weakSelf deleteCommentOfActivity:curActivity];
         }else if ([title isEqualToString:@"&#22238;&#22797;"]){
-            [weakSelf goToAddCommentVCToUser:curActivity.projectFileComment.owner.name];
+            [weakSelf goToAddCommentVCToActivity:curActivity];
         }
     }];
 }
 
 
 #pragma mark Comment
-- (void)goToAddCommentVCToUser:(NSString *)userName{
-    DebugLog(@"%@", userName);
+- (void)goToAddCommentVCToActivity:(ProjectActivity *)curActivity{
+    Project *curProject;
+    if (curActivity.project) {
+        curProject = curActivity.project;
+    }
+    if (!curProject && _activityList.count > 0) {
+        curProject = [(ProjectActivity *)[_activityList firstObject] project];
+    }
+    if (!curProject) {
+        curProject = [Project new];
+    }
+    curProject.id = _curFile.project_id;
+    
     AddMDCommentViewController *vc = [AddMDCommentViewController new];
+
+    vc.curProject = curProject;
     
-//    vc.curProject = _curProject;
-//    vc.requestPath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/line_notes", _curMRPR.des_owner_name, _curMRPR.des_project_name];
-//    vc.requestParams = [@{
-//                          @"noteable_type" : [self.curMRPRInfo.mrpr isMR]? @"MergeRequestBean" : @"PullRequestBean",
-//                          @"noteable_id" : _curMRPRInfo.mrpr.id,
-//                          } mutableCopy];
-//    vc.contentStr = userName.length > 0? [NSString stringWithFormat:@"@%@ ", userName]: nil;
-//    @weakify(self);
-//    vc.completeBlock = ^(id data){
-//        @strongify(self);
-//        if (data && [data isKindOfClass:[ProjectLineNote class]]) {
-//            [self.curMRPRInfo.discussions addObject:@[data]];
-//            [self.myTableView reloadData];
-//        }
-//    };
+    vc.requestPath = [NSString stringWithFormat:@"api/project/%@/files/%@/comment", _curFile.project_id.stringValue, _curFile.file_id.stringValue];
+    vc.requestParams = [@{} mutableCopy];
+    vc.contentStr = curActivity? [NSString stringWithFormat:@"@%@ ", curActivity.user.name]: nil;
     
+    @weakify(self);
+    vc.completeBlock = ^(id data){
+        @strongify(self);
+        if (data) {
+            [self refresh];
+        }
+    };
     [self.navigationController pushViewController:vc animated:YES];
 }
 
 
-- (void)deleteCommentOfActivity:(ProjectActivity *)lineNote{
-//    __weak typeof(self) weakSelf = self;
-//    [[Coding_NetAPIManager sharedManager] request_DeleteLineNote:lineNote.id inProject:_curMRPRInfo.mrpr.des_project_name ofUser:_curMRPRInfo.mrpr.des_owner_name andBlock:^(id data, NSError *error) {
-//        if (data) {
-//            [weakSelf.curMRPRInfo.discussions removeObject:@[lineNote]];
-//            [weakSelf.myTableView reloadData];
-//        }
-//    }];
+- (void)deleteCommentOfActivity:(ProjectActivity *)curActivity{
+    __weak typeof(self) weakSelf = self;
+    [[Coding_NetAPIManager sharedManager] request_DeleteComment:curActivity.projectFileComment.id inFile:_curFile andBlock:^(id data, NSError *error) {
+        if (data) {
+            [weakSelf.activityList removeObject:curActivity];
+            [weakSelf.myTableView reloadData];
+        }
+    }];
 }
 
-
 #pragma mark EaseToolBarDelegate
 - (void)easeToolBar:(EaseToolBar *)toolBar didClickedIndex:(NSInteger)index{
     //&#21435;&#28155;&#21152;&#35780;&#35770;
-    
+    [self goToAddCommentVCToActivity:nil];
 }
 
 @end
diff --git a/Coding_iOS/Models/Project.m b/Coding_iOS/Models/Project.m
@@ -19,6 +19,20 @@ - (instancetype)init
     }
     return self;
 }
+
+- (void)setFull_name:(NSString *)full_name{
+    _full_name = full_name;
+    NSArray *components = [_full_name componentsSeparatedByString:@"/"];
+    if (components.count == 2) {
+        if (!_owner_user_name) {
+            _owner_user_name = components[0];
+        }
+        if (_name) {
+            _name = components[1];
+        }
+    }
+}
+
 +(Project *)project_All{
     Project *pro = [[Project alloc] init];
     pro.id = [NSNumber numberWithInteger:-1];
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -101,6 +101,8 @@ typedef NS_ENUM(NSUInteger, VerifyType){
 - (void)request_FileDetail:(ProjectFile *)file andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_ActivityListOfFile:(ProjectFile *)file andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_VersionListOfFile:(ProjectFile *)file andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_DeleteComment:(NSNumber *)comment_id inFile:(ProjectFile *)file andBlock:(void (^)(id data, NSError *error))block;
+
 //Code
 - (void)request_CodeTree:(CodeTree *)codeTree withPro:(Project *)project codeTreeBlock:(void (^)(id codeTreeData, NSError *codeTreeError))block;
 - (void)request_CodeFile:(CodeFile *)codeFile withPro:(Project *)project andBlock:(void (^)(id data, NSError *error))block;
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -789,6 +789,19 @@ - (void)request_VersionListOfFile:(ProjectFile *)file andBlock:(void (^)(id data
         }
     }];
 }
+
+- (void)request_DeleteComment:(NSNumber *)comment_id inFile:(ProjectFile *)file andBlock:(void (^)(id data, NSError *error))block{
+    [MobClick event:kUmeng_Event_Request label:@"&#25991;&#20214;&#21024;&#38500;&#35780;&#35770;"];
+    NSString *path = [NSString stringWithFormat:@"api/project/%@/files/%@/comment/%@", file.project_id.stringValue, file.file_id.stringValue, comment_id.stringValue];
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Delete andBlock:^(id data, NSError *error) {
+        if (data) {
+            block(data, nil);
+        }else{
+            block(nil, error);
+        }
+    }];
+}
+
 #pragma mark Code
 - (void)request_CodeTree:(CodeTree *)codeTree withPro:(Project *)project codeTreeBlock:(void (^)(id codeTreeData, NSError *codeTreeError))block{
     [MobClick event:kUmeng_Event_Request label:@"&#20195;&#30721;&#30446;&#24405;"];
