curProject 的问题

wanghengheng · wanghengheng · commit b8d2c629093a · 2015-06-05T17:31:54.000+08:00
diff --git a/Coding_iOS/Controllers/AddMDCommentViewController.h b/Coding_iOS/Controllers/AddMDCommentViewController.h
@@ -7,10 +7,13 @@
 //
 
 #import "BaseViewController.h"
+#import "Project.h"
 
 @interface AddMDCommentViewController : BaseViewController
 @property (strong, nonatomic) void (^completeBlock)(id data);
 @property (strong, nonatomic) NSString *requestPath;
 @property (strong, nonatomic) NSMutableDictionary *requestParams;
 @property (strong, nonatomic) NSString *contentStr;
+@property (strong, nonatomic) Project *curProject;
+
 @end
diff --git a/Coding_iOS/Controllers/AddMDCommentViewController.m b/Coding_iOS/Controllers/AddMDCommentViewController.m
@@ -100,7 +100,7 @@ - (void)setCurIndex:(NSInteger)curIndex{
 - (void)loadEditView{
     if (!_editView) {
         _editView = [[EaseMarkdownTextView alloc] initWithFrame:self.view.bounds];
-//        _editView.curProject = self.curTask.project;
+        _editView.curProject = self.curProject;
         _editView.backgroundColor = [UIColor clearColor];
         _editView.textColor = [UIColor colorWithHexString:@"0x666666"];
         _editView.font = [UIFont systemFontOfSize:16];
diff --git a/Coding_iOS/Controllers/CommitFilesViewController.h b/Coding_iOS/Controllers/CommitFilesViewController.h
@@ -7,7 +7,9 @@
 //
 
 #import "BaseViewController.h"
+#import "Project.h"
 
 @interface CommitFilesViewController : BaseViewController
 @property (strong, nonatomic) NSString *ownerGK, *projectName, *commitId;
+@property (strong, nonatomic) Project *curProject;
 @end
diff --git a/Coding_iOS/Controllers/CommitFilesViewController.m b/Coding_iOS/Controllers/CommitFilesViewController.m
@@ -85,6 +85,17 @@ - (void)refresh{
             [weakSelf refresh];
         }];
     }];
+    //&#25512;&#36865;&#36807;&#26469;&#30340;&#39029;&#38754;&#65292;&#21487;&#33021; curProject &#23545;&#35937;&#20026;&#31354;
+    if (!_curProject) {
+        _curProject = [Project new];
+        _curProject.owner_user_name = _ownerGK;
+        _curProject.name = _projectName;
+        [[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_curProject andBlock:^(id data, NSError *error) {
+            if (data) {
+                weakSelf.curProject = data;
+            }
+        }];
+    }
 }
 
 - (void)configListGroups{
@@ -228,6 +239,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         FileChange *curFileChange = [curList objectAtIndex:indexPath.row];
         
         FileChangeDetailViewController *vc = [FileChangeDetailViewController new];
+        vc.curProject = _curProject;
         vc.requestPath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/commitDiffContent/%@/%@", _ownerGK, _projectName, _commitId, curFileChange.path];
         vc.filePath = nil;
         [self.navigationController pushViewController:vc animated:YES];
@@ -244,6 +256,7 @@ - (void)goToAddCommentVCToUser:(NSString *)userName{
     DebugLog(@"%@", userName);
     AddMDCommentViewController *vc = [AddMDCommentViewController new];
     
+    vc.curProject = _curProject;
     vc.requestPath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/line_notes", _ownerGK, _projectName];
     vc.requestParams = [@{
                           @"noteable_type" : @"Commit",
diff --git a/Coding_iOS/Controllers/FileChangeDetailViewController.h b/Coding_iOS/Controllers/FileChangeDetailViewController.h
@@ -8,7 +8,9 @@
 
 #import "BaseViewController.h"
 #import "MRPR.h"
+#import "Project.h"
 
 @interface FileChangeDetailViewController : BaseViewController
 @property (strong, nonatomic) NSString *requestPath, *filePath;
+@property (strong, nonatomic) Project *curProject;
 @end
diff --git a/Coding_iOS/Controllers/MRPRAcceptViewController.h b/Coding_iOS/Controllers/MRPRAcceptViewController.h
@@ -7,7 +7,9 @@
 //
 
 #import "BaseViewController.h"
+#import "Project.h"
 
 @interface MRPRAcceptViewController : BaseViewController
+@property (strong, nonatomic) Project *curProject;
 
 @end
diff --git a/Coding_iOS/Controllers/MRPRCommitsViewController.h b/Coding_iOS/Controllers/MRPRCommitsViewController.h
@@ -9,8 +9,10 @@
 #import "BaseViewController.h"
 #import "MRPR.h"
 #import "Commit.h"
+#import "Project.h"
 
 @interface MRPRCommitsViewController : BaseViewController
 @property (strong, nonatomic) MRPR *curMRPR;
+@property (strong, nonatomic) Project *curProject;
 
 @end
diff --git a/Coding_iOS/Controllers/MRPRCommitsViewController.m b/Coding_iOS/Controllers/MRPRCommitsViewController.m
@@ -129,6 +129,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     DebugLog(@"%@", curCommit.fullMessage);
     
     CommitFilesViewController *vc = [CommitFilesViewController new];
+    vc.curProject = _curProject;
     vc.ownerGK = _curMRPR.des_owner_name;
     vc.projectName = _curMRPR.des_project_name;
     vc.commitId = curCommit.commitId;
diff --git a/Coding_iOS/Controllers/MRPRDetailViewController.h b/Coding_iOS/Controllers/MRPRDetailViewController.h
@@ -8,7 +8,10 @@
 
 #import "BaseViewController.h"
 #import "MRPRBaseInfo.h"
+#import "Project.h"
 
 @interface MRPRDetailViewController : BaseViewController
 @property (strong, nonatomic) MRPR *curMRPR;
+@property (strong, nonatomic) Project *curProject;
+
 @end
diff --git a/Coding_iOS/Controllers/MRPRDetailViewController.m b/Coding_iOS/Controllers/MRPRDetailViewController.m
@@ -108,6 +108,18 @@ - (void)refresh{
             [weakSelf refresh];
         }];
     }];
+    
+    //&#25512;&#36865;&#36807;&#26469;&#30340;&#39029;&#38754;&#65292;&#21487;&#33021; curProject &#23545;&#35937;&#20026;&#31354;
+    if (!_curProject) {
+        _curProject = [Project new];
+        _curProject.owner_user_name = _curMRPR.des_owner_name;
+        _curProject.name = _curMRPR.des_project_name;
+        [[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_curProject andBlock:^(id data, NSError *error) {
+            if (data) {
+                weakSelf.curProject = data;
+            }
+        }];
+    }
 }
 
 #pragma mark TableM Footer Header
@@ -206,10 +218,12 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         if (indexPath.row == 0) {
             MRPRCommitsViewController *vc = [MRPRCommitsViewController new];
             vc.curMRPR = _curMRPR;
+            vc.curProject = _curProject;
             [self.navigationController pushViewController:vc animated:YES];
         }else{
             MRPRFilesViewController *vc = [MRPRFilesViewController new];
             vc.curMRPR = _curMRPR;
+            vc.curProject = _curProject;
             [self.navigationController pushViewController:vc animated:YES];
         }
     }else if (_curMRPRInfo.discussions.count > 0 && indexPath.section == 2){//Comment
@@ -225,6 +239,7 @@ - (void)goToAddCommentVCToUser:(NSString *)userName{
     DebugLog(@"%@", userName);
     AddMDCommentViewController *vc = [AddMDCommentViewController new];
     
+    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" : @"MergeRequestBean",
diff --git a/Coding_iOS/Controllers/MRPRFilesViewController.h b/Coding_iOS/Controllers/MRPRFilesViewController.h
@@ -9,8 +9,10 @@
 #import "BaseViewController.h"
 #import "MRPR.h"
 #import "FileChanges.h"
+#import "Project.h"
 
 @interface MRPRFilesViewController : BaseViewController
 @property (strong, nonatomic) MRPR *curMRPR;
+@property (strong, nonatomic) Project *curProject;
 
 @end
diff --git a/Coding_iOS/Controllers/MRPRFilesViewController.m b/Coding_iOS/Controllers/MRPRFilesViewController.m
@@ -169,6 +169,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         FileChange *curFileChange = [curList objectAtIndex:indexPath.row];
         
         FileChangeDetailViewController *vc = [FileChangeDetailViewController new];
+        vc.curProject = _curProject;
         vc.requestPath = [_curMRPR toFileLineChangesPath];
         vc.filePath = curFileChange.path;
         [self.navigationController pushViewController:vc animated:YES];
diff --git a/Coding_iOS/Controllers/MRPRListViewController.m b/Coding_iOS/Controllers/MRPRListViewController.m
@@ -171,7 +171,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     MRPR *curMRPR = [[self curMRPRS].list objectAtIndex:indexPath.row];
     MRPRListCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_MRPRListCell forIndexPath:indexPath];
-    [cell configWithMRPR:curMRPR];
+    cell.curMRPR = curMRPR;
     [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:60];
     return cell;
 }
@@ -185,6 +185,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     MRPR *curMRPR = [[self curMRPRS].list objectAtIndex:indexPath.row];
     MRPRDetailViewController *vc = [MRPRDetailViewController new];
     vc.curMRPR = curMRPR;
+    vc.curProject = _curProject;
     [self.navigationController pushViewController:vc animated:YES];
 }
 
diff --git a/Coding_iOS/Controllers/ProjectCommitsViewController.h b/Coding_iOS/Controllers/ProjectCommitsViewController.h
@@ -7,7 +7,9 @@
 //
 
 #import "BaseViewController.h"
+#import "Project.h"
 
 @interface ProjectCommitsViewController : BaseViewController
+@property (strong, nonatomic) Project *curProject;
 
 @end
diff --git a/Coding_iOS/Models/MRPR.h b/Coding_iOS/Models/MRPR.h
@@ -24,10 +24,11 @@ typedef NS_ENUM(NSInteger, MRPRStatus) {
 @property (strong, nonatomic) User *author, *action_author;
 @property (strong, nonatomic) NSDate *created_at, *action_at;
 @property (strong, nonatomic) Depot *source_depot;
-@property (strong, nonatomic) NSAttributedString *attributeTitle, *attributeTail;
 @property (assign, nonatomic) MRPRStatus status;
 @property (assign, nonatomic) BOOL isLoading;
 
++ (MRPR *)mrprWithPath:(NSString *)path;
+
 - (NSString *)statusDisplay;
 
 - (BOOL)isMR;
diff --git a/Coding_iOS/Models/MRPR.m b/Coding_iOS/Models/MRPR.m
@@ -9,30 +9,11 @@
 #import "MRPR.h"
 
 @implementation MRPR
-- (NSAttributedString *)attributeTitle{
-    NSString *iidStr = [NSString stringWithFormat:@"#%@", _iid.stringValue? _iid.stringValue: @""];
-    NSString *titleStr = _title? _title: @"";
-    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", iidStr, titleStr]];
-    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:14],
-                                 NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x4E90BF"]}
-                         range:NSMakeRange(0, iidStr.length)];
-    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:14],
-                                 NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x333333"]}
-                         range:NSMakeRange(iidStr.length + 1, titleStr.length)];
-    return attrString;
 
-}
-- (NSAttributedString *)attributeTail{
-    NSString *nameStr = _author.name? _author.name: @"";
-    NSString *timeStr = _created_at? [_created_at stringTimesAgo]: @"";
-    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", nameStr, timeStr]];
-    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:12],
-                                 NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x333333"]}
-                         range:NSMakeRange(0, nameStr.length)];
-    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:12],
-                                 NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0xA9A9A9"]}
-                         range:NSMakeRange(nameStr.length + 1, timeStr.length)];
-    return attrString;
++ (MRPR *)mrprWithPath:(NSString *)path{
+    MRPR *mrpr = [MRPR new];
+    mrpr.path = path;
+    return mrpr;
 }
 
 - (void)setPath:(NSString *)path{
diff --git a/Coding_iOS/Models/ProjectLineNote.m b/Coding_iOS/Models/ProjectLineNote.m
@@ -11,7 +11,7 @@
 @implementation ProjectLineNote
 - (void)setContent:(NSString *)content{
     if (_content != content) {
-        _htmlMedia = [HtmlMedia htmlMediaWithString:content showType:MediaShowTypeAll];
+        _htmlMedia = [HtmlMedia htmlMediaWithString:content showType:MediaShowTypeCode];
         _content = _htmlMedia.contentDisplay;
     }
 }
diff --git a/Coding_iOS/Views/Cell/MRPRCommentCell.m b/Coding_iOS/Views/Cell/MRPRCommentCell.m
@@ -48,7 +48,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             _timeLabel.font = [UIFont systemFontOfSize:12];
             [self.contentView addSubview:_timeLabel];
         }
-        if ([reuseIdentifier isEqualToString:kCellIdentifier_MRPRCommentCell_Media]) {
+        if ([reuseIdentifier rangeOfString:@"Media"].location != NSNotFound) {
             if (!self.imageCollectionView) {
                 UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
                 self.imageCollectionView = [[UICustomCollectionView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth + 40, 0, curWidth, 43) collectionViewLayout:layout];
diff --git a/Coding_iOS/Views/Cell/MRPRListCell.h b/Coding_iOS/Views/Cell/MRPRListCell.h
@@ -12,6 +12,7 @@
 #import "MRPR.h"
 
 @interface MRPRListCell : UITableViewCell
-- (void)configWithMRPR:(MRPR *)curMRPR;
+@property (strong, nonatomic) MRPR *curMRPR;
+
 + (CGFloat)cellHeight;
 @end
diff --git a/Coding_iOS/Views/Cell/MRPRListCell.m b/Coding_iOS/Views/Cell/MRPRListCell.m
@@ -59,11 +59,45 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     return self;
 }
 
-- (void)configWithMRPR:(MRPR *)curMRPR{
-    [_imgView sd_setImageWithURL:[curMRPR.author.avatar urlImageWithCodePathResize:2*kMRPRListCell_UserWidth] placeholderImage:kPlaceholderMonkeyRoundWidth(2*kMRPRListCell_UserWidth)];
-    _titleLabel.attributedText = curMRPR.attributeTitle;
-    _subTitleLabel.attributedText = curMRPR.attributeTail;
+- (void)setCurMRPR:(MRPR *)curMRPR{
+    _curMRPR = curMRPR;
+    if (!_curMRPR) {
+        return;
+    }
+    [_imgView sd_setImageWithURL:[_curMRPR.author.avatar urlImageWithCodePathResize:2*kMRPRListCell_UserWidth] placeholderImage:kPlaceholderMonkeyRoundWidth(2*kMRPRListCell_UserWidth)];
+    _titleLabel.attributedText = [self attributeTitle];
+    _subTitleLabel.attributedText = [self attributeTail];
+    
+}
+
+- (NSAttributedString *)attributeTitle{
+    NSString *iidStr = [NSString stringWithFormat:@"#%@", _curMRPR.iid.stringValue? _curMRPR.iid.stringValue: @""];
+    NSString *titleStr = _curMRPR.title? _curMRPR.title: @"";
+    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", iidStr, titleStr]];
+    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:14],
+                                NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x4E90BF"]}
+                        range:NSMakeRange(0, iidStr.length)];
+    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:14],
+                                NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x333333"]}
+                        range:NSMakeRange(iidStr.length + 1, titleStr.length)];
+    return attrString;
+    
 }
+
+- (NSAttributedString *)attributeTail{
+    NSString *nameStr = _curMRPR.author.name? _curMRPR.author.name: @"";
+    NSString *timeStr = _curMRPR.created_at? [_curMRPR.created_at stringTimesAgo]: @"";
+    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", nameStr, timeStr]];
+    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:12],
+                                NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x333333"]}
+                        range:NSMakeRange(0, nameStr.length)];
+    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:12],
+                                NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0xA9A9A9"]}
+                        range:NSMakeRange(nameStr.length + 1, timeStr.length)];
+    return attrString;
+}
+
+
 + (CGFloat)cellHeight{
     return 70.0;
 }
diff --git a/Coding_iOS/Views/Cell/MRPRTopCell.m b/Coding_iOS/Views/Cell/MRPRTopCell.m
@@ -129,7 +129,7 @@ - (void)setCurMRPRInfo:(MRPRBaseInfo *)curMRPRInfo{
     [_userIconView sd_setImageWithURL:[_curMRPRInfo.mrpr.author.avatar urlImageWithCodePathResizeToView:_userIconView] placeholderImage:kPlaceholderMonkeyRoundView(_userIconView)];
     [_userIconView setY:curBottomY];
     
-    _timeL.attributedText = _curMRPRInfo.mrpr.attributeTail;
+    _timeL.attributedText = [self attributeTail];
     _statusL.text =  _curMRPRInfo.mrpr.statusDisplay;
     
     NSString *fromStr, *toStr;
@@ -179,6 +179,19 @@ - (NSAttributedString *)p_styleStr:(NSString *)str{
     return attrString;
 }
 
+- (NSAttributedString *)attributeTail{
+    NSString *nameStr = _curMRPRInfo.mrpr.author.name? _curMRPRInfo.mrpr.author.name: @"";
+    NSString *timeStr = _curMRPRInfo.mrpr.created_at? [_curMRPRInfo.mrpr.created_at stringTimesAgo]: @"";
+    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", nameStr, timeStr]];
+    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:12],
+                                NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x333333"]}
+                        range:NSMakeRange(0, nameStr.length)];
+    [attrString addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:12],
+                                NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0xA9A9A9"]}
+                        range:NSMakeRange(nameStr.length + 1, timeStr.length)];
+    return attrString;
+}
+
 + (CGFloat)cellHeightWithObj:(id)obj{
     CGFloat cellHeight = 0;
     if ([obj isKindOfClass:[MRPRBaseInfo class]]) {
