Skip to content

Commit fba8778

Browse files
wanghenghengwanghengheng
committed
冒泡打赏和点赞的 block
1 parent c74ab28 commit fba8778

8 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
404404
}
405405
[_myMsgInputView notAndBecomeFirstResponder];
406406
};
407-
cell.likeBtnClickedBlock = ^(Tweet *tweet){
407+
cell.cellRefreshBlock = ^(){
408408
[weakSelf.myTableView reloadData];
409409
};
410410
cell.userBtnClickedBlock = ^(User *curUser){
@@ -437,7 +437,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
437437
cell.goToDetailTweetBlock = ^(Tweet *curTweet){
438438
[self goToDetailWithTweet:curTweet];
439439
};
440-
cell.refreshSingleCCellBlock = ^(){
440+
cell.cellRefreshBlock = ^(){
441441
[weakSelf.myTableView reloadData];
442442
};
443443
cell.mediaItemClickedBlock = ^(HtmlMediaItem *curItem){

‎Coding_iOS/Controllers/Topic/CSTopicDetailVC.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
197197
}
198198
[_myMsgInputView notAndBecomeFirstResponder];
199199
};
200-
cell.likeBtnClickedBlock = ^(Tweet *tweet){
200+
cell.cellRefreshBlock = ^(){
201201
[weakSelf.myTableView reloadData];
202202
};
203203
cell.userBtnClickedBlock = ^(User *curUser){

‎Coding_iOS/Controllers/TweetDetailViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
236236
cell.commentClickedBlock = ^(id sender){
237237
[self doCommentToComment:nil sender:sender];
238238
};
239-
cell.likeBtnClickedBlock = ^(){
239+
cell.cellRefreshBlock = ^(){
240240
[self.myTableView reloadData];
241241
};
242242
cell.deleteClickedBlock = ^(){

‎Coding_iOS/Controllers/UserTweetsViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
258258
}
259259
[_myMsgInputView notAndBecomeFirstResponder];
260260
};
261-
cell.likeBtnClickedBlock = ^(Tweet *tweet){
261+
cell.cellRefreshBlock = ^(){
262262
[weakSelf.myTableView reloadData];
263263
};
264264
cell.userBtnClickedBlock = ^(User *curUser){
@@ -288,7 +288,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
288288
cell.goToDetailTweetBlock = ^(Tweet *curTweet){
289289
[self goToDetailWithTweet:curTweet];
290290
};
291-
cell.refreshSingleCCellBlock = ^(){
291+
cell.cellRefreshBlock = ^(){
292292
[weakSelf.myTableView reloadData];
293293
};
294294
cell.mediaItemClickedBlock = ^(HtmlMediaItem *curItem){

‎Coding_iOS/Views/Cell/TweetCell.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#import "UITTTAttributedLabel.h"
1515
typedef void (^CommentClickedBlock) (Tweet *curTweet, NSInteger index, id sender);
1616
typedef void (^DeleteClickedBlock) (Tweet *curTweet, NSInteger outTweetsIndex);
17-
typedef void (^LikeBtnClickedBlock) (Tweet *curTweet);
1817
typedef void (^UserBtnClickedBlock) (User *curUser);
1918
typedef void (^MoreLikersBtnClickedBlock) (Tweet *curTweet);
2019
typedef void (^LocationClickedBlock) (Tweet *curTweet);
@@ -25,12 +24,11 @@ typedef void (^LocationClickedBlock) (Tweet *curTweet);
2524
- (void)setTweet:(Tweet *)tweet needTopView:(BOOL)needTopView;
2625

2726
@property (nonatomic, copy) CommentClickedBlock commentClickedBlock;
28-
@property (nonatomic, copy) LikeBtnClickedBlock likeBtnClickedBlock;
2927
@property (nonatomic, copy) UserBtnClickedBlock userBtnClickedBlock;
3028
@property (nonatomic, copy) MoreLikersBtnClickedBlock moreLikersBtnClickedBlock;
3129
@property (nonatomic, copy) DeleteClickedBlock deleteClickedBlock;
3230
@property (nonatomic, copy) void(^goToDetailTweetBlock) (Tweet *curTweet);
33-
@property (copy, nonatomic) void (^refreshSingleCCellBlock)();
31+
@property (copy, nonatomic) void (^cellRefreshBlock)();
3432
@property (copy, nonatomic) void (^mediaItemClickedBlock)(HtmlMediaItem *curItem);
3533

3634

‎Coding_iOS/Views/Cell/TweetCell.m‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,8 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
461461
TweetMediaItemSingleCCell *ccell = [collectionView dequeueReusableCellWithReuseIdentifier:kCCellIdentifier_TweetMediaItemSingle forIndexPath:indexPath];
462462
ccell.curMediaItem = curMediaItem;
463463
ccell.refreshSingleCCellBlock = ^(){
464-
if (_refreshSingleCCellBlock) {
465-
_refreshSingleCCellBlock();
464+
if (_cellRefreshBlock) {
465+
_cellRefreshBlock();
466466
}
467467
};
468468
return ccell;
@@ -629,8 +629,8 @@ - (void)likeBtnClicked:(id)sender{
629629
BOOL preLiked = _tweet.liked.boolValue;
630630
//重新加载likes
631631
[_tweet changeToLiked:[NSNumber numberWithBool:!preLiked]];
632-
if (_likeBtnClickedBlock) {
633-
_likeBtnClickedBlock(_tweet);
632+
if (_cellRefreshBlock) {
633+
_cellRefreshBlock();
634634
}
635635
//开始动画
636636
if (preLiked) {
@@ -642,8 +642,8 @@ - (void)likeBtnClicked:(id)sender{
642642
[[Coding_NetAPIManager sharedManager] request_Tweet_DoLike_WithObj:_tweet andBlock:^(id data, NSError *error) {
643643
if (!data) {//如果请求失败，就再改回来
644644
[_tweet changeToLiked:[NSNumber numberWithBool:preLiked]];
645-
if (_likeBtnClickedBlock) {
646-
_likeBtnClickedBlock(_tweet);
645+
if (_cellRefreshBlock) {
646+
_cellRefreshBlock();
647647
}
648648
[self.likeBtn setImage:[UIImage imageNamed:preLiked? @"tweet_btn_liked" : @"tweet_btn_like"] forState:UIControlStateNormal];
649649
}
@@ -677,7 +677,9 @@ - (void)rewardBtnClicked:(id)sender{
677677
@weakify(self);
678678
[SendRewardManager handleTweet:_tweet completion:^(Tweet *curTweet, BOOL sendSucess) {
679679
@strongify(self);
680-
[self setTweet:curTweet needTopView:_needTopView];
680+
if (self.cellRefreshBlock) {
681+
self.cellRefreshBlock();
682+
}
681683
}];
682684
}
683685
#pragma mark TTTAttributedLabelDelegate

‎Coding_iOS/Views/Cell/TweetDetailCell.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@interface TweetDetailCell : UITableViewCell <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, UIWebViewDelegate>
1616
@property (strong, nonatomic) Tweet *tweet;
1717
@property (nonatomic, copy) void (^commentClickedBlock) (id sender);
18-
@property (nonatomic, copy) void (^likeBtnClickedBlock) ();
18+
@property (nonatomic, copy) void (^cellRefreshBlock) ();
1919
@property (nonatomic, copy) void (^deleteClickedBlock) ();
2020
@property (nonatomic, copy) void (^userBtnClickedBlock) (User *curUser);
2121
@property (nonatomic, copy) void (^moreLikersBtnClickedBlock) ();

‎Coding_iOS/Views/Cell/TweetDetailCell.m‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ - (void)likeBtnClicked:(id)sender{
368368
BOOL preLiked = _tweet.liked.boolValue;
369369
//重新加载likes
370370
[_tweet changeToLiked:[NSNumber numberWithBool:!preLiked]];
371-
if (_likeBtnClickedBlock) {
372-
_likeBtnClickedBlock(_tweet);
371+
if (_cellRefreshBlock) {
372+
_cellRefreshBlock();
373373
}
374374
//开始动画
375375
if (preLiked) {
@@ -381,8 +381,8 @@ - (void)likeBtnClicked:(id)sender{
381381
[[Coding_NetAPIManager sharedManager] request_Tweet_DoLike_WithObj:_tweet andBlock:^(id data, NSError *error) {
382382
if (!data) {//如果请求失败，就再改回来
383383
[_tweet changeToLiked:[NSNumber numberWithBool:preLiked]];
384-
if (_likeBtnClickedBlock) {
385-
_likeBtnClickedBlock(_tweet);
384+
if (_cellRefreshBlock) {
385+
_cellRefreshBlock();
386386
}
387387
[self.likeBtn setImage:[UIImage imageNamed:preLiked? @"tweet_btn_liked" : @"tweet_btn_like"] forState:UIControlStateNormal];
388388
}
@@ -413,7 +413,9 @@ - (void)rewardBtnClicked:(id)sender{
413413
@weakify(self);
414414
[SendRewardManager handleTweet:_tweet completion:^(Tweet *curTweet, BOOL sendSucess) {
415415
@strongify(self);
416-
self.tweet = curTweet;
416+
if (self.cellRefreshBlock) {
417+
self.cellRefreshBlock();
418+
}
417419
}];
418420
}
419421

0 commit comments

Comments
 (0)