换了好多好多好多图

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -25,7 +25,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         // Initialization code
         self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
         if (!_iconView) {
-            _iconView = [[UIImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, ([LeftImage_LRTextCell cellHeight] - 28) / 2, 28, 28)];
+            _iconView = [[UIImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, ([LeftImage_LRTextCell cellHeight] - 33) / 2, 33, 33)];
             _iconView.contentMode = UIViewContentModeCenter;
             [self.contentView addSubview:_iconView];
         }

Coding_iOS/Images/file_activity_icon/file_activity_icon_create@2x.png

@@ -6,7 +6,9 @@
 //  Copyright (c) 2015年 Coding. All rights reserved.
 //
 
-#define kTaskActivityCell_LeftContentPading (kPaddingLeftWidth + 40)
+#define kTaskActivityCell_BorderWidth 2.0
+#define kTaskActivityCell_IconWidth 33.0
+#define kTaskActivityCell_LeftContentPading (kPaddingLeftWidth + kTaskActivityCell_IconWidth + 15)
 #define kTaskActivityCell_ContentWidth (kScreen_Width - kTaskActivityCell_LeftContentPading - kPaddingLeftWidth)
 
 #import "TaskActivityCell.h"
@@ -31,8 +33,8 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             [self.contentView addSubview:_timeLineView];
         }
         if (!_tipIconView) {
-            CGFloat borderWidth = 2;
-            _tipIconView = [[UIImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth - borderWidth, 10, 28 + 2*borderWidth, 28 + 2*borderWidth)];
+            CGFloat borderWidth = kTaskActivityCell_BorderWidth;
+            _tipIconView = [[UIImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth - borderWidth, 6, kTaskActivityCell_IconWidth + 2*borderWidth, kTaskActivityCell_IconWidth + 2*borderWidth)];
             _tipIconView.contentMode = UIViewContentModeCenter;
 
             _tipIconView.layer.masksToBounds = YES;
@@ -41,11 +43,21 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             _tipIconView.layer.borderColor = kColorTableBG.CGColor;
 
             [self.contentView addSubview:_tipIconView];
+            [_tipIconView mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.size.mas_equalTo(CGSizeMake(kTaskActivityCell_IconWidth + 2*borderWidth, kTaskActivityCell_IconWidth + 2*borderWidth));
+                make.left.equalTo(self.contentView).offset(kPaddingLeftWidth - borderWidth);
+                make.centerY.equalTo(self.contentView);
+            }];
         }
         if (!_contentLabel) {
             _contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kTaskActivityCell_LeftContentPading, 13, kTaskActivityCell_ContentWidth, 15)];
             _contentLabel.numberOfLines = 0;
             [self.contentView addSubview:_contentLabel];
+            [_contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.left.equalTo(self.contentView).offset(kTaskActivityCell_LeftContentPading);
+                make.centerY.equalTo(self.contentView);
+                make.width.mas_equalTo(kTaskActivityCell_ContentWidth);
+            }];
         }
     }
     return self;
@@ -67,8 +79,8 @@ - (void)setCurActivity:(ProjectActivity *)curActivity{
     }
     _tipIconView.image = [UIImage imageNamed:tipIconImageName];
     NSAttributedString *attrContent = [[self class] attrContentWithObj:_curActivity];
-    CGFloat contentHeight = [attrContent boundingRectWithSize:CGSizeMake(kTaskActivityCell_ContentWidth, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil].size.height;
-    [self.contentLabel setHeight:contentHeight];
+//    CGFloat contentHeight = [attrContent boundingRectWithSize:CGSizeMake(kTaskActivityCell_ContentWidth, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil].size.height;
+//    [self.contentLabel setHeight:contentHeight];
     self.contentLabel.attributedText = attrContent;
 }
 
@@ -152,8 +164,9 @@ + (CGFloat)cellHeightWithObj:(id)obj{
     if ([obj isKindOfClass:[ProjectActivity class]]) {
         NSAttributedString *attrContent = [self  attrContentWithObj:obj];
         CGFloat contentHeight = [attrContent boundingRectWithSize:CGSizeMake(kTaskActivityCell_ContentWidth, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil].size.height;
-        cellHeight = ceilf(contentHeight + 26);
-        cellHeight = MAX(44, cellHeight);
+        contentHeight = MAX(contentHeight, kTaskActivityCell_IconWidth);
+        
+        cellHeight = contentHeight + 16;
     }
     return cellHeight;
 }

Coding_iOS/Images/file_activity_icon/file_activity_icon_create@3x.png

@@ -7,9 +7,8 @@
 //
 
 #define kTaskCommentCell_FontContent [UIFont systemFontOfSize:15]
-#define kTaskCommentCell_LeftPading 30.0
-#define kTaskCommentCell_LeftContentPading (kTaskCommentCell_LeftPading + 40)
-#define kTaskCommentCell_ContentWidth (kScreen_Width - kTaskCommentCell_LeftContentPading - kTaskCommentCell_LeftPading)
+#define kTaskCommentCell_LeftContentPading (30 + 15 * 2 + 15)
+#define kTaskCommentCell_ContentWidth (kScreen_Width - kTaskCommentCell_LeftContentPading - 15 * 2)
 
 #import "TaskCommentCell.h"
 #import "UICustomCollectionView.h"
@@ -34,7 +33,6 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     if (self) {
         // Initialization code
         self.selectionStyle = UITableViewCellSelectionStyleNone;
-        CGFloat curBottomY = 25;
         if (!_contentBGView) {
             _contentBGView = [UIImageView new];
             _contentBGView.image = [[UIImage imageNamed:@"comment_bg"] resizableImageWithCapInsets:UIEdgeInsetsMake(35, 15, 5, 5)];
@@ -49,23 +47,22 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         if (!_ownerIconView) {
             CGFloat borderWidth = 2;
 
-            UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth - borderWidth, curBottomY, 28+ 2*borderWidth, 28 + 2*borderWidth)];
+            UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth - borderWidth, 12, 33+ 2*borderWidth, 33 + 2*borderWidth)];
             bgView.backgroundColor = kColorTableBG;
 
-            _ownerIconView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 28)];
+            _ownerIconView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 33, 33)];
             _ownerIconView.layer.masksToBounds = YES;
             _ownerIconView.layer.cornerRadius = _ownerIconView.frame.size.width/2;
 
             [bgView addSubview:_ownerIconView];
             [_ownerIconView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.width.height.mas_equalTo(28.0);
+                make.width.height.mas_equalTo(33.0);
                 make.center.equalTo(bgView);
             }];
-            
             [self.contentView addSubview:bgView];
         }
         if (!_contentLabel) {
-            _contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kTaskCommentCell_LeftContentPading, curBottomY, kTaskCommentCell_ContentWidth, 30)];
+            _contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kTaskCommentCell_LeftContentPading, 7 + 15, kTaskCommentCell_ContentWidth, 30)];
             _contentLabel.textColor = kColor222;
             _contentLabel.font = kTaskCommentCell_FontContent;
             _contentLabel.linkAttributes = kLinkAttributes;
@@ -93,7 +90,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             }
         }
         [_contentBGView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self.contentView).insets(UIEdgeInsetsMake(10, 60- 7, 10, 20));
+            make.edges.equalTo(self.contentView).insets(UIEdgeInsetsMake(7, 33 + 15* 2 - 9, 7, 15));
         }];
         if (!_detailBtn) {
             _detailBtn = [UIButton buttonWithTitle:@"查看详情" titleColor:kColorBrandGreen];
@@ -122,7 +119,6 @@ - (void)setCurComment:(TaskComment *)curComment{
         return;
     }
     _detailBtn.hidden = ![self.curComment.htmlMedia needToShowDetail];
-    CGFloat curBottomY = 25;
     [_ownerIconView sd_setImageWithURL:[_curComment.owner.avatar urlImageWithCodePathResizeToView:_ownerIconView] placeholderImage:kPlaceholderMonkeyRoundWidth(33.0)];
 
     NSString *contentStr = _curComment.content;
@@ -134,19 +130,19 @@ - (void)setCurComment:(TaskComment *)curComment{
         }
     }
 
-    curBottomY += [contentStr getHeightWithFont:kTaskCommentCell_FontContent constrainedToSize:CGSizeMake(kTaskCommentCell_ContentWidth, CGFLOAT_MAX)] + 5;
+    CGFloat curBottomY = CGRectGetMinY(_contentLabel.frame) + [contentStr getHeightWithFont:kTaskCommentCell_FontContent constrainedToSize:CGSizeMake(kTaskCommentCell_ContentWidth, CGFLOAT_MAX)];
 
     NSInteger imagesCount = _curComment.htmlMedia.imageItems.count;
     if (imagesCount > 0) {
+        curBottomY += 5;
         self.imageCollectionView.hidden = NO;
         [self.imageCollectionView setFrame:CGRectMake(kTaskCommentCell_LeftContentPading, curBottomY, kTaskCommentCell_ContentWidth, [TaskCommentCell imageCollectionViewHeightWithCount:imagesCount])];
         [self.imageCollectionView reloadData];
+        curBottomY += [TaskCommentCell imageCollectionViewHeightWithCount:imagesCount];
     }else{
+        curBottomY += 10;
         self.imageCollectionView.hidden = YES;
     }
-    
-    curBottomY += [TaskCommentCell imageCollectionViewHeightWithCount:imagesCount];
-    
     [_timeLabel setY:curBottomY];
     _timeLabel.width = _detailBtn.hidden? kTaskCommentCell_ContentWidth: kTaskCommentCell_ContentWidth - 60;
     _timeLabel.text = [NSString stringWithFormat:@"%@ 发布于 %@", _curComment.owner.name, [_curComment.created_at stringDisplay_HHmm]];
@@ -172,9 +168,17 @@ + (CGFloat)cellHeightWithObj:(id)obj{
         || [obj isKindOfClass:[FileComment class]]) {
         TaskComment *curComment = (TaskComment *)obj;
         NSString *contentStr = curComment.content;
-        cellHeight += 20 +[contentStr getHeightWithFont:kTaskCommentCell_FontContent constrainedToSize:CGSizeMake(kTaskCommentCell_ContentWidth, CGFLOAT_MAX)] + 5 +20 +10;
-        cellHeight += [self imageCollectionViewHeightWithCount:curComment.htmlMedia.imageItems.count];
+        cellHeight += 7 + 15 +[contentStr getHeightWithFont:kTaskCommentCell_FontContent constrainedToSize:CGSizeMake(kTaskCommentCell_ContentWidth, CGFLOAT_MAX)];
+        if (curComment.htmlMedia.imageItems.count > 0) {
+            cellHeight += 5 + [self imageCollectionViewHeightWithCount:curComment.htmlMedia.imageItems.count];
+        }else{
+            cellHeight += 10;
+        }
         cellHeight += 20;
+        cellHeight += 15 + 7;
+//        + 5 +20 +10;
+//        cellHeight += [self imageCollectionViewHeightWithCount:curComment.htmlMedia.imageItems.count];
+//        cellHeight += 20;
     }
     return cellHeight;
 }