bugfix

wanghengheng · wanghengheng · commit 7bcef467b7b5 · 2015-03-23T17:18:37.000+08:00
diff --git a/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m b/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m
@@ -91,7 +91,8 @@ - (void)refresh{
             CGFloat readMeHeight = weakSelf.myProject.readMeHeight;
             weakSelf.myProject = data;
             weakSelf.myProject.readMeHeight = readMeHeight;
-            
+            weakSelf.myProActs = [ProjectActivities proActivitiesWithPro:weakSelf.myProject type:ProjectActivityTypeAll];
+
             weakSelf.myTableView.showsInfiniteScrolling = !weakSelf.myProject.is_public.boolValue;
             
             if (weakSelf.myProject.is_public.boolValue) {
@@ -113,13 +114,13 @@ - (void)refreshReadMe{
         [weakSelf.view endLoading];
         if (data) {
             weakSelf.myProject.readMeHtml = data;
-            [weakSelf.myTableView reloadData];
         }
+        [weakSelf.myTableView reloadData];
     }];
 }
 
 - (void)refreshActivityMore:(BOOL)loadMore{
-    if (_myProActs.isLoading) {
+    if (!_myProActs.user_id || _myProActs.isLoading) {
         return;
     }
     _myProActs.willLoadMore = loadMore;
@@ -131,9 +132,9 @@ - (void)refreshActivityMore:(BOOL)loadMore{
         [weakSelf.myTableView.infiniteScrollingView stopAnimating];
         if (data) {
             [weakSelf.myProActs configWithProActList:data];
-            [weakSelf.myTableView reloadData];
             weakSelf.myTableView.showsInfiniteScrolling = weakSelf.myProActs.canLoadMore;
         }
+        [weakSelf.myTableView reloadData];
     }];
 }
 
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -1275,13 +1275,28 @@ - (void)request_ForkProject:(Project *)project andBlock:(void (^)(id data, NSErr
 }
 - (void)request_ReadMeOFProject:(Project *)project andBlock:(void (^)(id data, NSError *error))block{
     [MobClick event:kUmeng_Event_Request label:@"&#39033;&#30446;_README"];
-    NSString *path = [NSString stringWithFormat:@"api/user/%@/project/%@/git/tree/master",project.owner_user_name, project.name];
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
-        if (data) {
-            NSString *readMeHtml = [[[data valueForKey:@"data"] valueForKey:@"readme"] valueForKey:@"preview"];
-            block(readMeHtml? readMeHtml: @"&#25105;&#20204;&#25512;&#33616;&#27599;&#20010;&#39033;&#30446;&#37117;&#26032;&#24314;&#19968;&#20010;README&#25991;&#20214;", nil);
+    
+    [[Coding_NetAPIManager sharedManager] request_CodeBranchOrTagWithPath:@"list_branches" withPro:project andBlock:^(id dataTemp, NSError *errorTemp) {
+        if (dataTemp) {
+            __block NSString *defultBranch = @"master";
+            NSArray *branchList = (NSArray *)dataTemp;
+            [branchList enumerateObjectsUsingBlock:^(CodeBranchOrTag *obj, NSUInteger idx, BOOL *stop) {
+                if (obj.is_default_branch.boolValue) {
+                    defultBranch = obj.name;
+                }
+            }];
+            
+            NSString *path = [NSString stringWithFormat:@"api/user/%@/project/%@/git/tree/%@",project.owner_user_name, project.name, defultBranch];
+            [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
+                if (data) {
+                    NSString *readMeHtml = [[[data valueForKey:@"data"] valueForKey:@"readme"] valueForKey:@"preview"];
+                    block(readMeHtml? readMeHtml: @"&#25105;&#20204;&#25512;&#33616;&#27599;&#20010;&#39033;&#30446;&#37117;&#26032;&#24314;&#19968;&#20010;README&#25991;&#20214;", nil);
+                }else{
+                    block(nil, error);
+                }
+            }];
         }else{
-            block(nil, error);
+            block(nil, errorTemp);
         }
     }];
 }
diff --git a/Coding_iOS/Views/CCell/TweetLikeUserCCell.m b/Coding_iOS/Views/CCell/TweetLikeUserCCell.m
@@ -34,6 +34,7 @@ - (void)configWithUser:(User *)user likesNum:(NSNumber *)likes{
             _likesLabel.hidden = YES;
         }
     }else{
+        [self.imgView sd_setImageWithURL:nil];
         [self.imgView setImage:[UIImage imageWithColor:[UIColor colorWithHexString:@"0xdadada"]]];
         if (!_likesLabel) {
             _likesLabel = [[UILabel alloc] initWithFrame:_imgView.frame];
diff --git a/Coding_iOS/Views/Cell/TweetDetailCell.m b/Coding_iOS/Views/Cell/TweetDetailCell.m
@@ -16,7 +16,7 @@
 #define kTweetDetailCell_PadingBottom 10.0
 #define kTweetDetailCell_LikeUserCCell_Height 25.0
 #define kTweetDetailCell_LikeUserCCell_Pading 10.0
-#define kTweetDetailCell_LikeNumMax 10
+#define kTweetDetailCell_LikeNumMax ((kDevice_Is_iPhone6 || kDevice_Is_iPhone6Plus)? 11: 9)
 
 
 
@@ -44,6 +44,7 @@ @implementation TweetDetailCell
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
+    
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         // Initialization code
@@ -383,7 +384,7 @@ - (void)locationBtnClicked:(id)sender{
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
     NSInteger row = 0;
     if (_tweet.like_users.count > 0) {
-        row = MIN(_tweet.like_users.count, kTweetDetailCell_LikeNumMax);
+        row = MIN(_tweet.like_users.count +1, kTweetDetailCell_LikeNumMax);
     }
     return row;
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ - (void)configWithUser:(User )user likesNum:(NSNumber )likes{`
`34`	`34`	`_likesLabel.hidden = YES;`
`35`	`35`	`}`
`36`	`36`	`}else{`
	`37`	`+ [self.imgView sd_setImageWithURL:nil];`
`37`	`38`	`[self.imgView setImage:[UIImage imageWithColor:[UIColor colorWithHexString:@"0xdadada"]]];`
`38`	`39`	`if (!_likesLabel) {`
`39`	`40`	`_likesLabel = [[UILabel alloc] initWithFrame:_imgView.frame];`