打赏 - 冒泡列表

Author: wanghengheng

Coding_iOS/Models/Tweet.h

@@ -44,8 +44,10 @@
 - (NSInteger)numOfComments;
 - (BOOL)hasMoreComments;
 
-- (NSInteger)numOfLikers;
-- (BOOL)hasMoreLikers;
+- (NSArray *)like_reward_users;
+- (BOOL)hasLikesOrRewards;
+- (BOOL)hasMoreLikesOrRewards;
+- (BOOL)rewardedBy:(User *)user;
 
 - (NSString *)toDoLikePath;
 - (void)changeToLiked:(NSNumber *)liked;

Coding_iOS/Models/Tweet.m

@@ -83,24 +83,39 @@ - (BOOL)hasMoreComments{
     return (_comments.intValue > _comment_list.count || _comments.intValue > 5);
 }
 
-- (NSInteger)numOfLikers{
-    return MIN(_like_users.count +1,
-               MIN(_likes.intValue,
-                   [self maxLikerNum]));
-}
-
-- (NSInteger)maxLikerNum{
-    NSInteger maxNum = 9;
-    if (kDevice_Is_iPhone6) {
-        maxNum = 11;
-    }else if (kDevice_Is_iPhone6Plus){
-        maxNum = 12;
+- (NSArray *)like_reward_users{
+    if (_reward_users.count > 0) {
+        NSLog(@"_reward_users.count > 0");
     }
-    return maxNum;
+    NSMutableArray *like_reward_users = _like_users.count > 0? _like_users.mutableCopy: @[].mutableCopy;//点赞的人多，用点赞的人列表做基
+    [_reward_users enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(User *obj, NSUInteger idx, BOOL *stop) {
+        __block NSInteger originalIndex = NSNotFound;
+        [like_reward_users enumerateObjectsUsingBlock:^(User *obj_, NSUInteger idx_, BOOL *stop_) {
+            if ([obj.global_key isEqualToString:obj_.global_key]) {
+                originalIndex = idx_;
+            }
+        }];
+        if (originalIndex != NSNotFound) {
+            [like_reward_users exchangeObjectAtIndex:originalIndex withObjectAtIndex:0];
+        }else{
+            [like_reward_users insertObject:obj atIndex:0];
+        }
+    }];
+    return like_reward_users;
 }
-
-- (BOOL)hasMoreLikers{
-    return (_likes.intValue > _like_users.count || _likes.intValue > [self maxLikerNum] - 1);
+- (BOOL)hasLikesOrRewards{
+    return (_likes.integerValue + _rewards.integerValue) > 0;
+}
+- (BOOL)hasMoreLikesOrRewards{
+    return (_likes.integerValue > _like_users.count || _rewards.integerValue > _reward_users.count);
+}
+- (BOOL)rewardedBy:(User *)user{
+    for (User *obj in _reward_users) {
+        if ([obj.global_key isEqualToString:user.global_key]) {
+            return YES;
+        }
+    }
+    return NO;
 }
 
 - (NSString *)toDoLikePath{

Coding_iOS/Views/CCell/TweetLikeUserCCell.h

@@ -13,6 +13,6 @@
 
 @interface TweetLikeUserCCell : UICollectionViewCell
 
-- (void)configWithUser:(User *)user likesNum:(NSNumber *)likes;
+- (void)configWithUser:(User *)user rewarded:(BOOL)rewarded;
 
 @end

Coding_iOS/Views/CCell/TweetLikeUserCCell.m

@@ -11,47 +11,43 @@
 #import "TweetLikeUserCCell.h"
 
 @interface TweetLikeUserCCell ()
-@property (strong, nonatomic) User *curUser;
-@property (strong, nonatomic) NSNumber *likes;
 @property (strong, nonatomic) UIImageView *imgView;
 @property (strong, nonatomic) UILabel *likesLabel;
 
 @end
 
 @implementation TweetLikeUserCCell
-- (void)configWithUser:(User *)user likesNum:(NSNumber *)likes{
-    self.curUser = user;
-    self.likes = likes;
-    
+- (void)configWithUser:(User *)user rewarded:(BOOL)rewarded{
     if (!self.imgView) {
         self.imgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kTweetCell_LikeUserCCell_Height, kTweetCell_LikeUserCCell_Height)];
-        [self.imgView doCircleFrame];
+        self.imgView.layer.masksToBounds = YES;
+        self.imgView.layer.cornerRadius = kTweetCell_LikeUserCCell_Height/2;
+        self.imgView.layer.borderColor = [UIColor colorWithHexString:@"0xFFAE03"].CGColor;
         [self.contentView addSubview:self.imgView];
     }
-    if (_curUser) {
-        [self.imgView sd_setImageWithURL:[_curUser.avatar urlImageWithCodePathResizeToView:_imgView] placeholderImage:kPlaceholderMonkeyRoundView(_imgView)];
+    if (user) {
+        [self.imgView sd_setImageWithURL:[user.avatar urlImageWithCodePathResizeToView:_imgView] placeholderImage:kPlaceholderMonkeyRoundView(_imgView)];
         if (_likesLabel) {
             _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];
+            _likesLabel = [[UILabel alloc] initWithFrame:_imgView.bounds];
             _likesLabel.backgroundColor = [UIColor clearColor];
             _likesLabel.textColor = [UIColor whiteColor];
             _likesLabel.font = [UIFont systemFontOfSize:15];
             _likesLabel.minimumScaleFactor = 0.5;
             _likesLabel.textAlignment = NSTextAlignmentCenter;
-            [self.contentView addSubview:_likesLabel];
+            [self.imgView addSubview:_likesLabel];
         }
-        _likesLabel.text = [NSString stringWithFormat:@"%d", _likes.intValue];
+        _likesLabel.text = @"···";
         _likesLabel.hidden = NO;
     }
+    self.imgView.layer.borderWidth = rewarded? 1.0 : 0.0;
 }
 - (void)layoutSubviews{
     [super layoutSubviews];
 }
-
-
 @end

Coding_iOS/Views/Cell/TweetCell.m

@@ -21,6 +21,8 @@
 #define kTweet_TimtFont [UIFont systemFontOfSize:12]
 #define kTweet_LikeUsersLineCount 7.0
 
+#define kTweetCell_MaxCollectionNum (kDevice_Is_iPhone6Plus? 12: kDevice_Is_iPhone6? 10 : 9)
+
 #import "TweetCell.h"
 #import "TweetLikeUserCCell.h"
 #import "TweetCommentCell.h"
@@ -36,6 +38,7 @@
 
 @interface TweetCell ()
 @property (strong, nonatomic) Tweet *tweet;
+@property (strong, nonatomic) NSArray *like_reward_users;
 @property (assign, nonatomic) BOOL needTopView;
 
 @property (strong, nonatomic) UIView *topView;
@@ -53,11 +56,6 @@ @interface TweetCell ()
 
 @implementation TweetCell
 
-- (void)setTweet:(Tweet *)tweet needTopView:(BOOL)needTopView{
-    _tweet = tweet;
-    _needTopView = needTopView;
-}
-
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
@@ -213,22 +211,11 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     }
     return self;
 }
+- (void)setTweet:(Tweet *)tweet needTopView:(BOOL)needTopView{
+    _tweet = tweet;
+    _like_reward_users = [_tweet like_reward_users];
+    _needTopView = needTopView;
 
-- (void)awakeFromNib
-{
-    // Initialization code
-    self.selectionStyle = UITableViewCellSelectionStyleNone;
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
-}
-
-- (void)layoutSubviews{
-    [super layoutSubviews];
     if (!_tweet) {
         return;
     }
@@ -320,7 +307,7 @@ - (void)layoutSubviews{
     curBottomY += kTweetCell_LikeComment_Height;
     curBottomY += [TweetCell likeCommentBtn_BottomPadingWithTweet:_tweet];
 
-    if (_tweet.numOfLikers > 0 || _tweet.numOfComments > 0) {
+    if ([_tweet hasLikesOrRewards] || _tweet.numOfComments > 0) {
         [_commentOrLikeBeginImgView setY:(curBottomY - CGRectGetHeight(_commentOrLikeBeginImgView.frame) + 1)];
         _commentOrLikeBeginImgView.hidden = NO;
     }else{
@@ -329,7 +316,7 @@ - (void)layoutSubviews{
 
     //点赞的人_列表
     //    可有可无
-    if (_tweet.numOfLikers > 0) {
+    if ([_tweet hasLikesOrRewards]) {
         CGFloat likeUsersHeight = [TweetCell likeUsersHeightWithTweet:_tweet];
         [self.likeUsersView setFrame:CGRectMake(kTweetCell_PadingLeft, curBottomY, kTweetCell_ContentWidth, likeUsersHeight)];
         [self.likeUsersView reloadData];
@@ -341,7 +328,7 @@ - (void)layoutSubviews{
         }
     }
     //评论与赞的分割线
-    if (_tweet.numOfLikers > 0 && _tweet.numOfComments > 0) {
+    if ([_tweet hasLikesOrRewards] && _tweet.numOfComments > 0) {
         [_commentOrLikeSplitlineView setY:(curBottomY -1)];
         _commentOrLikeSplitlineView.hidden = NO;
     }else{
@@ -460,7 +447,7 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe
     if (collectionView == _mediaView) {
         row = _tweet.htmlMedia.imageItems.count;
     }else{
-        row = _tweet.numOfLikers;
+        row = MIN(kTweetCell_MaxCollectionNum, [_tweet hasMoreLikesOrRewards]? _like_reward_users.count + 1: _like_reward_users.count);
     }
     return row;
 }
@@ -485,11 +472,12 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
         }
     }else{
         TweetLikeUserCCell *ccell = [collectionView dequeueReusableCellWithReuseIdentifier:kCCellIdentifier_TweetLikeUser forIndexPath:indexPath];
-        if (indexPath.row >= _tweet.numOfLikers-1 && _tweet.hasMoreLikers) {
-            [ccell configWithUser:nil likesNum:_tweet.likes];
+        if (indexPath.row >= kTweetCell_MaxCollectionNum -1
+            || indexPath.row >= _like_reward_users.count) {
+            [ccell configWithUser:nil rewarded:NO];
         }else{
-            User *curUser = [_tweet.like_users objectAtIndex:indexPath.row];
-            [ccell configWithUser:curUser likesNum:nil];
+            User *curUser = [_like_reward_users objectAtIndex:indexPath.row];
+            [ccell configWithUser:curUser rewarded:[_tweet rewardedBy:curUser]];
         }
         return ccell;
     }
@@ -556,12 +544,13 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
         browser.photos = photos; // 设置所有的图片
         [browser show];
     }else{
-        if (indexPath.row >= _tweet.numOfLikers-1 && _tweet.hasMoreLikers) {
+        if (indexPath.row >= kTweetCell_MaxCollectionNum -1
+            || indexPath.row >= _like_reward_users.count) {
             if (_moreLikersBtnClickedBlock) {
                 _moreLikersBtnClickedBlock(_tweet);
             }
         }else{
-            User *curUser = [_tweet.like_users objectAtIndex:indexPath.row];
+            User *curUser = [_like_reward_users objectAtIndex:indexPath.row];
             if (_userBtnClickedBlock) {
                 _userBtnClickedBlock(curUser);
             }

Coding_iOS/Views/Cell/TweetDetailCell.m

@@ -15,7 +15,8 @@
 #define kTweetDetailCell_PadingBottom 10.0
 #define kTweetDetailCell_LikeUserCCell_Height 25.0
 #define kTweetDetailCell_LikeUserCCell_Pading 10.0
-#define kTweetDetailCell_LikeNumMax (kDevice_Is_iPhone6Plus? 12: kDevice_Is_iPhone6? 11: 9)
+
+#define kTweetDetailCell_MaxCollectionNum (kDevice_Is_iPhone6Plus? 12: kDevice_Is_iPhone6? 11: 9)
 
 
 
@@ -29,6 +30,8 @@
 #import "SendRewardManager.h"
 
 @interface TweetDetailCell ()
+@property (strong, nonatomic) NSArray *like_reward_users;
+
 @property (strong, nonatomic) UITapImageView *ownerImgView;
 @property (strong, nonatomic) UIButton *ownerNameBtn;
 @property (strong, nonatomic) UILabel *timeLabel, *fromLabel;
@@ -164,22 +167,14 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     return self;
 }
 
-- (void)awakeFromNib
-{
-    // Initialization code
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
-}
-
 - (void)setTweet:(Tweet *)tweet{
-    if (tweet) {
-        _tweet = tweet;
+    _tweet = tweet;
+    _like_reward_users = [_tweet like_reward_users];
+
+    if (!_tweet) {
+        return;
     }
+    
     BOOL isProjectTweet = _tweet.project_id != nil;
     self.likeBtn.hidden = isProjectTweet;
     self.rewardBtn.hidden = isProjectTweet;
@@ -254,7 +249,7 @@ - (void)setTweet:(Tweet *)tweet{
 
     //点赞的人_列表
     //    可有可无
-    if (_tweet.likes.intValue > 0) {
+    if ([_tweet hasLikesOrRewards]) {
         CGFloat likeUsersHeight = [[self class] likeUsersHeightWithTweet:_tweet];
         [self.likeUsersView setFrame:CGRectMake(0, curBottomY, kScreen_Width, likeUsersHeight)];
         [self.likeUsersView reloadData];
@@ -424,29 +419,19 @@ - (void)rewardBtnClicked:(id)sender{
 
 #pragma mark Collection M
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
-    NSInteger row = 0;
-    if (_tweet.like_users.count > 0) {
-        row = _tweet.like_users.count;
-        if (_tweet.likes.integerValue > _tweet.like_users.count) {
-            row++;
-        }
-        row = MIN(row, kTweetDetailCell_LikeNumMax);
-    }
+    NSInteger row = MIN(kTweetDetailCell_MaxCollectionNum, [_tweet hasMoreLikesOrRewards]? _like_reward_users.count + 1: _like_reward_users.count);
     return row;
 }
 
 // The cell that is returned must be retrieved from a call to -dequeueReusableCellWithReuseIdentifier:forIndexPath:
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
     TweetLikeUserCCell *ccell = [collectionView dequeueReusableCellWithReuseIdentifier:kCCellIdentifier_TweetLikeUser forIndexPath:indexPath];
-    if (indexPath.row >= kTweetDetailCell_LikeNumMax-1) {
-        [ccell configWithUser:nil likesNum:_tweet.likes];
+    if (indexPath.row >= kTweetDetailCell_MaxCollectionNum -1
+        || indexPath.row >= _like_reward_users.count) {
+        [ccell configWithUser:nil rewarded:NO];
     }else{
-        if (_tweet.like_users.count > indexPath.row) {
-            User *curUser = [_tweet.like_users objectAtIndex:indexPath.row];
-            [ccell configWithUser:curUser likesNum:nil];
-        }else {
-            [ccell configWithUser:nil likesNum:_tweet.likes];
-        }
+        User *curUser = [_like_reward_users objectAtIndex:indexPath.row];
+        [ccell configWithUser:curUser rewarded:[_tweet rewardedBy:curUser]];
     }
     return ccell;
 }
@@ -469,14 +454,13 @@ - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectio
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
-    NSInteger numberOfItems = MIN(_tweet.like_users.count +1, _tweet.like_users.count);
-    numberOfItems = MIN(numberOfItems, kTweetDetailCell_LikeNumMax);
-    if (indexPath.row >= numberOfItems-1) {
+    if (indexPath.row >= kTweetDetailCell_MaxCollectionNum -1
+        || indexPath.row >= _like_reward_users.count) {
         if (_moreLikersBtnClickedBlock) {
             _moreLikersBtnClickedBlock(_tweet);
         }
-    }else if (_tweet.like_users.count > indexPath.row){
-        User *curUser = [_tweet.like_users objectAtIndex:indexPath.row];
+    }else{
+        User *curUser = [_like_reward_users objectAtIndex:indexPath.row];
         if (_userBtnClickedBlock) {
             _userBtnClickedBlock(curUser);
         }