冒泡详情 - 调整

wanghengheng · wanghengheng · commit be6994eefe1e · 2017-04-26T15:38:01.000+08:00
diff --git a/Coding_iOS/Controllers/TweetDetailViewController.m b/Coding_iOS/Controllers/TweetDetailViewController.m
@@ -279,9 +279,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         cell.commentToCommentBlock = ^(Comment *toComment, id sender){
             [self doCommentToComment:toComment sender:sender];
         };
-        [cell.ownerIconView addTapBlock:^(id obj) {
-            [self goToUserInfo:curComment.owner];
-        }];
+//        [cell.ownerIconView addTapBlock:^(id obj) {
+//            [self goToUserInfo:curComment.owner];
+//        }];
         cell.contentLabel.delegate = self;
         [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
         return cell;
diff --git a/Coding_iOS/Views/Cell/TweetDetailCell.m b/Coding_iOS/Views/Cell/TweetDetailCell.m
@@ -11,12 +11,12 @@
 #define kTweetDetailCell_LikeComment_Height 27.0
 #define kTweetDetailCell_LikeComment_Width 50.0
 #define kTweetDetailCell_ContentWidth (kScreen_Width - 2*kPaddingLeftWidth)
-#define kTweetDetailCell_PadingTop 55.0
+#define kTweetDetailCell_PadingTop 70.0
 #define kTweetDetailCell_PadingBottom 10.0
 #define kTweetDetailCell_LikeUserCCell_Height 25.0
-#define kTweetDetailCell_LikeUserCCell_Pading 10.0
+#define kTweetDetailCell_LikeUserCCell_Pading 5.0
 
-#define kTweetDetailCell_MaxCollectionNum (kDevice_Is_iPhone6Plus? 12: kDevice_Is_iPhone6? 11: 9)
+#define kTweetDetailCell_MaxCollectionNum (kDevice_Is_iPhone6Plus? 11: kDevice_Is_iPhone6? 10: 9)
 
 
 
@@ -54,13 +54,13 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         self.selectionStyle = UITableViewCellSelectionStyleNone;
         //        self.backgroundColor = [UIColor colorWithHexString:@"0xf3f3f3"];
         if (!self.ownerImgView) {
-            self.ownerImgView = [[UITapImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 10, 38, 38)];
+            self.ownerImgView = [[UITapImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 10, 45, 45)];
             [self.ownerImgView doCircleFrame];
             [self.contentView addSubview:self.ownerImgView];
         }
         if (!self.ownerNameBtn) {
             self.ownerNameBtn = [UIButton buttonWithUserStyle];
-            self.ownerNameBtn.frame = CGRectMake(kTweetDetailCell_PadingLeft, CGRectGetMinY(self.ownerImgView.frame), kScreen_Width/2, 20);
+            self.ownerNameBtn.frame = CGRectMake(CGRectGetMaxX(_ownerImgView.frame) + 15, CGRectGetMinY(self.ownerImgView.frame), kScreen_Width/2, 24);
             [self.ownerNameBtn addTarget:self action:@selector(userBtnClicked) forControlEvents:UIControlEventTouchUpInside];
             [self.contentView addSubview:self.ownerNameBtn];
         }
@@ -70,11 +70,11 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
 //            [self.contentView addSubview:self.timeClockIconView];
 //        }
         if (!self.timeLabel) {
-            self.timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMinX(self.ownerNameBtn.frame), CGRectGetMaxY(self.ownerImgView.frame) - 12, kScreen_Width/2, 12)];
+            self.timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMinX(self.ownerNameBtn.frame), CGRectGetMaxY(self.ownerImgView.frame) - 17, kScreen_Width/2, 17)];
 //            self.timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kScreen_Width - kPaddingLeftWidth - 70, 18, 70, 12)];
             self.timeLabel.font = kTweet_TimtFont;
 //            self.timeLabel.textAlignment = NSTextAlignmentRight;
-            self.timeLabel.textColor = kColor999;
+            self.timeLabel.textColor = kColorDark7;
             [self.contentView addSubview:self.timeLabel];
         }
 
@@ -128,7 +128,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         if (!self.fromLabel) {
             self.fromLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(self.fromPhoneIconView.frame) + 5, 0, kScreen_Width/2, 15)];
             self.fromLabel.font = kTweet_TimtFont;
-            self.fromLabel.textColor = kColor999;
+            self.fromLabel.textColor = kColorDark7;
             [self.contentView addSubview:self.fromLabel];
         }
         if (!self.likeUsersView) {
@@ -291,7 +291,7 @@ + (CGFloat)likeCommentBtn_BottomPadingWithTweet:(Tweet *)tweet{
 + (CGFloat)likeUsersHeightWithTweet:(Tweet *)tweet{
     CGFloat likeUsersHeight = 0;
     if ([tweet hasLikesOrRewards]) {
-        likeUsersHeight = 35;
+        likeUsersHeight = [TweetLikeUserCCell ccellSize].height + 15 + 5;
         //        +30*(ceilf([tweet.like_users count]/kTweet_LikeUsersLineCount)-1);
     }
     return likeUsersHeight;
@@ -435,14 +435,12 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
     return ccell;
 }
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
-    CGSize itemSize;
-    itemSize = CGSizeMake(kTweetDetailCell_LikeUserCCell_Height, kTweetDetailCell_LikeUserCCell_Height);
+    CGSize itemSize = [TweetLikeUserCCell ccellSize];
     return itemSize;
 }
 - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
     UIEdgeInsets insetForSection;
-
-        insetForSection = UIEdgeInsetsMake(kTweetDetailCell_LikeUserCCell_Pading, kPaddingLeftWidth, kTweetDetailCell_LikeUserCCell_Pading, kPaddingLeftWidth);
+    insetForSection = UIEdgeInsetsMake(15, kPaddingLeftWidth, 5, kPaddingLeftWidth);
     return insetForSection;
 }
 - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
diff --git a/Coding_iOS/Views/Cell/TweetDetailCommentCell.h b/Coding_iOS/Views/Cell/TweetDetailCommentCell.h
@@ -17,7 +17,7 @@
 @property (strong, nonatomic) Comment *toComment;
 @property (nonatomic, copy) void (^commentToCommentBlock)(Comment *, id);
 @property (strong, nonatomic) UITTTAttributedLabel *contentLabel;
-@property (strong, nonatomic) UITapImageView *ownerIconView;
+//@property (strong, nonatomic) UITapImageView *ownerIconView;
 
 + (CGFloat)cellHeightWithObj:(id)obj;
 
diff --git a/Coding_iOS/Views/Cell/TweetDetailCommentCell.m b/Coding_iOS/Views/Cell/TweetDetailCommentCell.m
@@ -12,7 +12,11 @@
 #import "Login.h"
 
 @interface TweetDetailCommentCell ()
-@property (strong, nonatomic) UILabel *timeLabel;
+//@property (strong, nonatomic) UILabel *timeLabel;
+
+@property (strong, nonatomic) UILabel *userNameLabel, *timeLabel;
+@property (strong, nonatomic) UIImageView *timeClockIconView;
+
 @end
 
 @implementation TweetDetailCommentCell
@@ -22,29 +26,35 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         // Initialization code
-        CGFloat curBottomY = 10;
-        if (!_ownerIconView) {
-            _ownerIconView = [[UITapImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, curBottomY, 33, 33)];
-            [_ownerIconView doCircleFrame];
-            [self.contentView addSubview:_ownerIconView];
-        }
-        CGFloat curWidth = kScreen_Width - 40 - 2*kPaddingLeftWidth;
         if (!_contentLabel) {
-            _contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kPaddingLeftWidth + 40, curBottomY, curWidth, 30)];
+            _contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 15, kScreen_Width - 2*kPaddingLeftWidth, 30)];
             _contentLabel.numberOfLines = 0;
-            _contentLabel.textColor = kColor222;
+            _contentLabel.textColor = kColorDark4;
             _contentLabel.font = kTweetDetailCommentCell_FontContent;
             _contentLabel.linkAttributes = kLinkAttributes;
             _contentLabel.activeLinkAttributes = kLinkAttributesActive;
             [self.contentView addSubview:_contentLabel];
         }
-        CGFloat commentBtnWidth = 40;
+        if (!_userNameLabel) {
+            _userNameLabel = [[UILabel alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 0, 150, 15)];
+            _userNameLabel.backgroundColor = [UIColor clearColor];
+            _userNameLabel.font = [UIFont boldSystemFontOfSize:12];
+            _userNameLabel.textColor = kColorDark7;
+            [self.contentView addSubview:_userNameLabel];
+        }
         if (!_timeLabel) {
-            _timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kPaddingLeftWidth +40, 0, curWidth- commentBtnWidth, 20)];
-            _timeLabel.textColor = kColor999;
+            _timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(75, 0, 80, 15)];
+            _timeLabel.backgroundColor = [UIColor clearColor];
             _timeLabel.font = [UIFont systemFontOfSize:12];
+            _timeLabel.textColor = kColorDark7;
             [self.contentView addSubview:_timeLabel];
         }
+        if (!_timeClockIconView) {
+            _timeClockIconView = [[UIImageView alloc] initWithFrame:CGRectMake(60, 0, 15, 15)];
+            _timeClockIconView.contentMode = UIViewContentModeCenter;
+            _timeClockIconView.image = [UIImage imageNamed:@"time_clock_icon"];
+            [self.contentView addSubview:_timeClockIconView];
+        }
     }
     return self;
 }
@@ -62,10 +72,8 @@ - (void)layoutSubviews{
     if (!_toComment) {
         return;
     }
-    CGFloat curBottomY = 10;
-    CGFloat curWidth = kScreen_Width - 40 - 2*kPaddingLeftWidth;
-    [_ownerIconView sd_setImageWithURL:[_toComment.owner.avatar urlImageWithCodePathResizeToView:_ownerIconView] placeholderImage:kPlaceholderMonkeyRoundView(_ownerIconView)];
-    
+    CGFloat curBottomY = 15;
+    CGFloat curWidth = kScreen_Width - 2*kPaddingLeftWidth;
     [_contentLabel setWidth:curWidth];
     _contentLabel.text = _toComment.content;
     [_contentLabel sizeToFit];
@@ -76,9 +84,23 @@ - (void)layoutSubviews{
         }
     }
     
-    curBottomY += [_toComment.content getHeightWithFont:kTweetDetailCommentCell_FontContent constrainedToSize:CGSizeMake(curWidth, CGFLOAT_MAX)] + 5;
-    [_timeLabel setY:curBottomY];
-    _timeLabel.text = [NSString stringWithFormat:@"%@ &#21457;&#24067;&#20110; %@", _toComment.owner.name, [_toComment.created_at stringDisplay_HHmm]];
+    curBottomY += [_toComment.content getHeightWithFont:kTweetDetailCommentCell_FontContent constrainedToSize:CGSizeMake(curWidth, CGFLOAT_MAX)] + 10;
+    
+    
+    _userNameLabel.text = _toComment.owner.name;
+    _timeLabel.text = [_toComment.created_at stringDisplay_HHmm];
+    [_userNameLabel setY:curBottomY];
+    [_userNameLabel sizeToFit];
+    
+    CGRect frame = _timeClockIconView.frame;
+    frame.origin.y = curBottomY;
+    frame.origin.x = 10 + CGRectGetMaxX(_userNameLabel.frame);
+    _timeClockIconView.frame = frame;
+    
+    frame.origin.x += 5 + CGRectGetWidth(_timeClockIconView.frame);
+    frame.size = _timeLabel.frame.size;
+    _timeLabel.frame = frame;
+    [_timeLabel sizeToFit];
 }
 
 - (void)commentBtnClicked:(id)sender{
@@ -92,8 +114,8 @@ + (CGFloat)cellHeightWithObj:(id)obj{
     CGFloat cellHeight = 0;
     if ([obj isKindOfClass:[Comment class]]) {
         Comment *toComment = (Comment *)obj;
-        CGFloat curWidth = kScreen_Width - 40 - 2*kPaddingLeftWidth;
-        cellHeight += 10 +[toComment.content getHeightWithFont:kTweetDetailCommentCell_FontContent constrainedToSize:CGSizeMake(curWidth, CGFLOAT_MAX)] + 5 +20 +10;
+        CGFloat curWidth = kScreen_Width - 2*kPaddingLeftWidth;
+        cellHeight += 15 +[toComment.content getHeightWithFont:kTweetDetailCommentCell_FontContent constrainedToSize:CGSizeMake(curWidth, CGFLOAT_MAX)] + 10 +15 +15;
     }
     return cellHeight;
 }
