From 8928c4d01ba7ecc7bc8883394d06b47588d069ca Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Sun, 7 Jun 2015 12:11:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E4=B8=AD=E5=8F=8C=E5=87=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ash_AWord.xcodeproj/project.pbxproj | 36 ++++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 174 +++++------------- .../Classes/MWTapDetectingImageView.m | 3 +- .../Note/NoteCommentViewController.m | 36 +++- .../Note/NoteCommentViewController.xib | 2 +- .../User/PraiseUserListViewController.h | 16 ++ .../User/PraiseUserListViewController.m | 152 +++++++++++++++ .../User/PraiseUserListViewController.xib | 34 ++++ Ash_AWord/Views/Common/CommentTableViewCell.h | 2 + Ash_AWord/Views/Common/CommentTableViewCell.m | 14 +- .../Views/Common/CommentTableViewCell.xib | 34 +++- Ash_AWord/Views/Common/CommentTextView.h | 3 + Ash_AWord/Views/Common/CommentTextView.m | 5 +- .../Views/User/PraiseUserListTableViewCell.h | 17 ++ .../Views/User/PraiseUserListTableViewCell.m | 28 +++ .../User/PraiseUserListTableViewCell.xib | 47 +++++ 16 files changed, 458 insertions(+), 145 deletions(-) create mode 100644 Ash_AWord/ViewControllers/User/PraiseUserListViewController.h create mode 100644 Ash_AWord/ViewControllers/User/PraiseUserListViewController.m create mode 100644 Ash_AWord/ViewControllers/User/PraiseUserListViewController.xib create mode 100644 Ash_AWord/Views/User/PraiseUserListTableViewCell.h create mode 100644 Ash_AWord/Views/User/PraiseUserListTableViewCell.m create mode 100644 Ash_AWord/Views/User/PraiseUserListTableViewCell.xib diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index 4bf1e11..7dbdbb0 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -94,6 +94,10 @@ A968627C1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A968627B1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png */; }; A968627E1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A968627D1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png */; }; A96F27EE1B2195BA00DA0A66 /* UIImageView+Reloading.m in Sources */ = {isa = PBXBuildFile; fileRef = A96F27ED1B2195BA00DA0A66 /* UIImageView+Reloading.m */; }; + A96F27F41B21C5AC00DA0A66 /* PraiseUserListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A96F27F21B21C5AC00DA0A66 /* PraiseUserListTableViewCell.m */; }; + A96F27F51B21C5AC00DA0A66 /* PraiseUserListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A96F27F31B21C5AC00DA0A66 /* PraiseUserListTableViewCell.xib */; }; + A96F27F91B21C5C800DA0A66 /* PraiseUserListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96F27F71B21C5C800DA0A66 /* PraiseUserListViewController.m */; }; + A96F27FA1B21C5C800DA0A66 /* PraiseUserListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A96F27F81B21C5C800DA0A66 /* PraiseUserListViewController.xib */; }; A9754A1C1ADC080E0018BAAD /* AudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = A9754A0F1ADC080E0018BAAD /* AudioPlayer.m */; }; A9754A1D1ADC080E0018BAAD /* AutoRecoveringHttpDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = A9754A111ADC080E0018BAAD /* AutoRecoveringHttpDataSource.m */; }; A9754A1E1ADC080E0018BAAD /* CoreFoundationDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = A9754A131ADC080E0018BAAD /* CoreFoundationDataSource.m */; }; @@ -360,6 +364,12 @@ A968627D1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cellmorebtnclickN@2x.png"; sourceTree = ""; }; A96F27EC1B2195BA00DA0A66 /* UIImageView+Reloading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+Reloading.h"; sourceTree = ""; }; A96F27ED1B2195BA00DA0A66 /* UIImageView+Reloading.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+Reloading.m"; sourceTree = ""; }; + A96F27F11B21C5AC00DA0A66 /* PraiseUserListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PraiseUserListTableViewCell.h; sourceTree = ""; }; + A96F27F21B21C5AC00DA0A66 /* PraiseUserListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PraiseUserListTableViewCell.m; sourceTree = ""; }; + A96F27F31B21C5AC00DA0A66 /* PraiseUserListTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PraiseUserListTableViewCell.xib; sourceTree = ""; }; + A96F27F61B21C5C800DA0A66 /* PraiseUserListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PraiseUserListViewController.h; sourceTree = ""; }; + A96F27F71B21C5C800DA0A66 /* PraiseUserListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PraiseUserListViewController.m; sourceTree = ""; }; + A96F27F81B21C5C800DA0A66 /* PraiseUserListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PraiseUserListViewController.xib; sourceTree = ""; }; A9754A0E1ADC080E0018BAAD /* AudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioPlayer.h; sourceTree = ""; }; A9754A0F1ADC080E0018BAAD /* AudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioPlayer.m; sourceTree = ""; }; A9754A101ADC080E0018BAAD /* AutoRecoveringHttpDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoRecoveringHttpDataSource.h; sourceTree = ""; }; @@ -787,6 +797,26 @@ path = PSTCollectionView; sourceTree = ""; }; + A96F27EF1B21B98900DA0A66 /* User */ = { + isa = PBXGroup; + children = ( + A96F27F61B21C5C800DA0A66 /* PraiseUserListViewController.h */, + A96F27F71B21C5C800DA0A66 /* PraiseUserListViewController.m */, + A96F27F81B21C5C800DA0A66 /* PraiseUserListViewController.xib */, + ); + path = User; + sourceTree = ""; + }; + A96F27F01B21B9A800DA0A66 /* User */ = { + isa = PBXGroup; + children = ( + A96F27F11B21C5AC00DA0A66 /* PraiseUserListTableViewCell.h */, + A96F27F21B21C5AC00DA0A66 /* PraiseUserListTableViewCell.m */, + A96F27F31B21C5AC00DA0A66 /* PraiseUserListTableViewCell.xib */, + ); + path = User; + sourceTree = ""; + }; A9754A0D1ADC080E0018BAAD /* AudioPlayer */ = { isa = PBXGroup; children = ( @@ -867,6 +897,7 @@ A97C54B71AC8F0370038818A /* ViewControllers */ = { isa = PBXGroup; children = ( + A96F27EF1B21B98900DA0A66 /* User */, A98D65971AD37BDF008668EE /* Message */, A9617A501ACC274C0024AE4A /* My */, A97559AE1ACBC615004ADA42 /* Note */, @@ -893,6 +924,7 @@ A97C54B91AC8F0370038818A /* Views */ = { isa = PBXGroup; children = ( + A96F27F01B21B9A800DA0A66 /* User */, A9CF21231B1C4EA2007490EF /* Common */, A98D65991AD37EFD008668EE /* Message */, A97559C01ACBEE71004ADA42 /* Note */, @@ -1411,6 +1443,7 @@ A9CF211C1B1C36D0007490EF /* mainCellCommentClickN@2x.png in Resources */, A9617A591ACC2EBC0024AE4A /* mine-setting-icon@2x.png in Resources */, A968627C1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png in Resources */, + A96F27FA1B21C5C800DA0A66 /* PraiseUserListViewController.xib in Resources */, A93442041ACA981D00A6B233 /* Default@2x.png in Resources */, A9B6DFE11B202E7D0003C1BC /* comment_support_fake@2x.png in Resources */, A97DBE401ACAE29E00705682 /* Icon@2x.png in Resources */, @@ -1436,6 +1469,7 @@ A950AB411AEC8B5E00D0F6DD /* closeButtonClick@2x.png in Resources */, A97C55031AC933AD0038818A /* UMShareEditViewController.xib in Resources */, A97DBE4E1ACAED4900705682 /* camera-close-select@2x.png in Resources */, + A96F27F51B21C5AC00DA0A66 /* PraiseUserListTableViewCell.xib in Resources */, A97559A91ACB9DE4004ADA42 /* navigationButtonPublishClick@2x.png in Resources */, A93441E21ACA89AA00A6B233 /* Profile_filter_voiceIconClick@2x.png in Resources */, A97559A81ACB9DE4004ADA42 /* navigationButtonPublish@2x.png in Resources */, @@ -1570,6 +1604,7 @@ A9754A261ADC199B0018BAAD /* MyMessageViewController.m in Sources */, A9617A4F1ACC0D0F0024AE4A /* NoteViewModel.m in Sources */, A96862461ACCF0B400DDAA6B /* MWPhoto.m in Sources */, + A96F27F41B21C5AC00DA0A66 /* PraiseUserListTableViewCell.m in Sources */, A968624A1ACCF0B400DDAA6B /* MWZoomingScrollView.m in Sources */, A97C54CF1AC8F10F0038818A /* NSString+HXAddtions.m in Sources */, A96862501ACCF12300DDAA6B /* DACircularProgressView.m in Sources */, @@ -1586,6 +1621,7 @@ A96862741ACCF13300DDAA6B /* PSTCollectionViewItemKey.m in Sources */, A96862451ACCF0B400DDAA6B /* MWGridViewController.m in Sources */, A97C54D01AC8F10F0038818A /* PropertyEntity.m in Sources */, + A96F27F91B21C5C800DA0A66 /* PraiseUserListViewController.m in Sources */, A93441DE1ACA311700A6B233 /* Ash_UIUtil.m in Sources */, A968624C1ACCF0B400DDAA6B /* README.md in Sources */, A9754A1E1ADC080E0018BAAD /* CoreFoundationDataSource.m in Sources */, diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 1ead5c9..5bc3be5 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -1701,7 +1701,7 @@ @@ -1973,111 +1973,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2133,7 +2037,7 @@ - - - - + + + + + + + + diff --git a/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m index 38d9df3..f8c2aeb 100644 --- a/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m +++ b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m @@ -52,11 +52,12 @@ } } - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { + [NSObject cancelPreviousPerformRequestsWithTarget:self]; UITouch *touch = [touches anyObject]; NSUInteger tapCount = touch.tapCount; switch (tapCount) { case 1: - [self handleSingleTap:touch]; + [self performSelector:@selector(handleSingleTap:) withObject:touch afterDelay:0.3]; break; case 2: [self handleDoubleTap:touch]; diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m index 62ad536..e1448e8 100644 --- a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m +++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m @@ -21,6 +21,7 @@ CommentGoodListCellTableViewCell* _commentGoodListCellTableViewCell; NSInteger _page; NSMutableArray* _commentInfoArr; + BOOL _isFirstLoad; } @end @@ -30,6 +31,8 @@ [super viewDidLoad]; // Do any additional setup after loading the view from its nib. _page = 1; + _isFirstLoad = YES; + _commentInfoArr = [[NSMutableArray alloc] init]; [self customViewDidLoad]; self.navigationItem.title = @"评论"; @@ -68,6 +71,12 @@ _commentTextView = [Ash_UIUtil instanceXibView:@"CommentTextView"]; _commentTextView.frame = self.view.frame; + + __weak id weakSelf = self; + [_commentTextView setComentComplete:^(){ + _isFirstLoad = YES; + [weakSelf headerBeginRefreshing]; + }]; [self.view addSubview:_commentTextView]; _commentTextView.recordId = _text_image.messageId; [_commentTextView setHidden:YES]; @@ -75,9 +84,7 @@ [self loadData]; [self requirePraiseUser]; - CGPoint point = self.tableView.contentOffset; - point.y = height; - [self.tableView setContentOffset:point]; + } @@ -132,7 +139,23 @@ { [MBProgressHUD errorHudWithView:self.view label:[viewModel errMessage] hidesAfter:1.0]; } + [self.tableView reloadData]; + if (_isFirstLoad) { + CGPoint point = self.tableView.contentOffset; +// //计算内容加上点赞列表cell高于显示多少，移动到能看到点赞列表。 +// point.y = _headView.frame.size.height+80-self.tableView.frame.size.height; +// +// if (_commentInfoArr.count > 0) { +// point.y += [CommentTableViewCell getHeightWithCommentInfoViewModel:[_commentInfoArr objectAtIndex:0]]; +// } +// [self.tableView setContentOffset:point]; +// [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:YES ]; + point.y = _headView.frame.size.height; + [self.tableView setContentOffset:point animated:YES]; + + _isFirstLoad = NO; + } } failedBlock:^(NSError *error) { @@ -171,7 +194,7 @@ } -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - NSString* cellIdentifier = [NSString stringWithFormat:@"cellIdentifier%ld",indexPath.section]; + NSString* cellIdentifier = [NSString stringWithFormat:@"cellIdentifier%ld",(long)indexPath.section]; CommentTableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; if (!cell) { UINib* nib = nil; @@ -181,6 +204,11 @@ } CommentInfoViewModel* commentInfoViewModel = [_commentInfoArr objectAtIndex:indexPath.row]; + if ([commentInfoViewModel.ownerId isEqualToString:_text_image.ownerId] ) { + [cell setIsAuthor:YES]; + }else{ + [cell setIsAuthor:NO]; + } [cell setCommentInfoViewModel:commentInfoViewModel]; return cell; diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib index 9ec5948..05e9194 100644 --- a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib +++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib @@ -19,7 +19,7 @@ - + diff --git a/Ash_AWord/ViewControllers/User/PraiseUserListViewController.h b/Ash_AWord/ViewControllers/User/PraiseUserListViewController.h new file mode 100644 index 0000000..57c9d80 --- /dev/null +++ b/Ash_AWord/ViewControllers/User/PraiseUserListViewController.h @@ -0,0 +1,16 @@ +// +// PraiseUserListViewController.h +// Ash_AWord +// +// Created by xmfish on 15/6/5. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "BaseRefreshViewController.h" + +@interface PraiseUserListViewController : BaseRefreshViewController +@property (weak, nonatomic) IBOutlet UITableView *tableView; + +@property(assign, nonatomic)NSInteger recordId; +@property(strong, nonatomic)NSArray* firstPraiseUserArr; +@end diff --git a/Ash_AWord/ViewControllers/User/PraiseUserListViewController.m b/Ash_AWord/ViewControllers/User/PraiseUserListViewController.m new file mode 100644 index 0000000..7027725 --- /dev/null +++ b/Ash_AWord/ViewControllers/User/PraiseUserListViewController.m @@ -0,0 +1,152 @@ +// +// PraiseUserListViewController.m +// Ash_AWord +// +// Created by xmfish on 15/6/5. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "PraiseUserListViewController.h" +#import "PraiseUserListTableViewCell.h" +#import "UserViewModel.h" + +@interface PraiseUserListViewController () +{ + NSInteger _page; + NSMutableArray* _dataArr; +} +@end + +@implementation PraiseUserListViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + self.navigationItem.title = @"最近点赞的用户"; + self.tableView.delegate = self; + self.tableView.dataSource = self; + + _page = 1; + _dataArr = [[NSMutableArray alloc] init]; + if (_firstPraiseUserArr.count > 0) { + [_dataArr addObjectsFromArray:_firstPraiseUserArr]; + if (_dataArr.count >= DefaultPageSize) { + [self.tableView addGifFooterWithRefreshingTarget:self refreshingAction:@selector(footerRereshing)]; + } + }else + { + [self headerBeginRefreshing]; + } + +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + + + +#pragma mark MJRefreshDelegate +-(void)headerRereshing +{ + _page=1; + [self loadData]; +} +-(void)footerRereshing +{ + [self loadData]; +} +-(void)loadData +{ + + PropertyEntity* pro = [UserViewModel requireLoadPraiseUserWithRecordId:_recordId withPage:1 withPage_size:DefaultPageSize]; + [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { + if ([viewModel success]) { + UserViewModel* userViewModel = (UserViewModel*)viewModel; + + if (_page <= 1) { + [_dataArr removeAllObjects]; + } + if (userViewModel.userInfoArr) { + [_dataArr addObjectsFromArray:userViewModel.userInfoArr]; + } + [self footerEndRefreshing]; + [self headerEndRefreshing]; + if (userViewModel.userInfoArr.count + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.h b/Ash_AWord/Views/Common/CommentTableViewCell.h index 9bc5903..1db2c89 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.h +++ b/Ash_AWord/Views/Common/CommentTableViewCell.h @@ -13,8 +13,10 @@ @property (weak, nonatomic) IBOutlet UIImageView *avatarImageView; @property (weak, nonatomic) IBOutlet UILabel *nameLabel; @property (weak, nonatomic) IBOutlet UILabel *timeLabel; +@property (weak, nonatomic) IBOutlet UILabel *floorLabel; @property (weak, nonatomic) IBOutlet UITextView *contentTextView; -(void)setCommentInfoViewModel:(CommentInfoViewModel*)commentInfoViewModel; +-(void)setIsAuthor:(BOOL)isAuthor; +(CGFloat)getHeightWithCommentInfoViewModel:(CommentInfoViewModel*)commentInfoViewModel; @end diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.m b/Ash_AWord/Views/Common/CommentTableViewCell.m index 3621eca..02e4a41 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.m +++ b/Ash_AWord/Views/Common/CommentTableViewCell.m @@ -16,6 +16,10 @@ // Initialization code _avatarImageView.layer.masksToBounds = YES; _avatarImageView.layer.cornerRadius = 18.0; + _contentTextView.scrollEnabled = NO; + + _floorLabel.layer.masksToBounds = YES; + _floorLabel.layer.cornerRadius = 8.0; } - (void)setSelected:(BOOL)selected animated:(BOOL)animated { @@ -24,6 +28,14 @@ // Configure the view for the selected state } +-(void)setIsAuthor:(BOOL)isAuthor +{ + if (isAuthor) { + _floorLabel.hidden = NO; + }else{ + _floorLabel.hidden = YES; + } +} -(void)setCommentInfoViewModel:(CommentInfoViewModel *)commentInfoViewModel { [_avatarImageView sd_setImageWithURL:[NSURL URLWithString:commentInfoViewModel.ownerFigureurl] placeholderImage:DefaultUserIcon]; @@ -34,7 +46,7 @@ +(CGFloat)getHeightWithCommentInfoViewModel:(CommentInfoViewModel *)commentInfoViewModel { UIFont *font = [UIFont appFontOfSize:13.0]; - CGSize size = CGSizeMake(kScreenWidth - 50,MAXFLOAT); + CGSize size = CGSizeMake(kScreenWidth - 60,MAXFLOAT); CGRect labelRect = [commentInfoViewModel.content boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:font} context:nil]; diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.xib b/Ash_AWord/Views/Common/CommentTableViewCell.xib index 95205d4..e7d47e2 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.xib +++ b/Ash_AWord/Views/Common/CommentTableViewCell.xib @@ -8,8 +8,8 @@ - - + + @@ -23,36 +23,47 @@ - + + + + - + - + + + - - + + @@ -65,16 +76,19 @@ + + + - + diff --git a/Ash_AWord/Views/Common/CommentTextView.h b/Ash_AWord/Views/Common/CommentTextView.h index 96f56bc..480e68e 100644 --- a/Ash_AWord/Views/Common/CommentTextView.h +++ b/Ash_AWord/Views/Common/CommentTextView.h @@ -8,10 +8,13 @@ #import +typedef void (^CommentComplete)(void); + @interface CommentTextView : UIView @property (nonatomic, assign) NSInteger recordId; +@property (nonatomic, strong) CommentComplete comentComplete; @property (weak, nonatomic) IBOutlet UITextView *contentTextView; @property (weak, nonatomic) IBOutlet UILabel *tipLabel; - (IBAction)cancelBtnClick:(id)sender; diff --git a/Ash_AWord/Views/Common/CommentTextView.m b/Ash_AWord/Views/Common/CommentTextView.m index 89112dd..d71ee6a 100644 --- a/Ash_AWord/Views/Common/CommentTextView.m +++ b/Ash_AWord/Views/Common/CommentTextView.m @@ -120,8 +120,11 @@ if ([viewModel success]) { [MBProgressHUD checkHudWithView:nil label:@"评论成功" hidesAfter:1.0]; - _tipLabel.text = @""; + _contentTextView.text = @""; [self hide]; + if (_comentComplete) { + _comentComplete(); + } }else{ [MBProgressHUD checkHudWithView:nil label:[viewModel errMessage] hidesAfter:1.0]; diff --git a/Ash_AWord/Views/User/PraiseUserListTableViewCell.h b/Ash_AWord/Views/User/PraiseUserListTableViewCell.h new file mode 100644 index 0000000..f3643f2 --- /dev/null +++ b/Ash_AWord/Views/User/PraiseUserListTableViewCell.h @@ -0,0 +1,17 @@ +// +// PraiseUserListTableViewCell.h +// Ash_AWord +// +// Created by xmfish on 15/6/5. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import +@class UserInfoViewModel; +@interface PraiseUserListTableViewCell : UITableViewCell +@property (weak, nonatomic) IBOutlet UIImageView *avatarImageView; +@property (weak, nonatomic) IBOutlet UILabel *nameLabel; + + +-(void)setUserInfoViewModel:(UserInfoViewModel*)userInfoViewModel; +@end diff --git a/Ash_AWord/Views/User/PraiseUserListTableViewCell.m b/Ash_AWord/Views/User/PraiseUserListTableViewCell.m new file mode 100644 index 0000000..06520a0 --- /dev/null +++ b/Ash_AWord/Views/User/PraiseUserListTableViewCell.m @@ -0,0 +1,28 @@ +// +// PraiseUserListTableViewCell.m +// Ash_AWord +// +// Created by xmfish on 15/6/5. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "PraiseUserListTableViewCell.h" +#import "UserViewModel.h" +@implementation PraiseUserListTableViewCell + +- (void)awakeFromNib { + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +-(void)setUserInfoViewModel:(UserInfoViewModel *)userInfoViewModel +{ + [_avatarImageView sd_setImageWithURL:[NSURL URLWithString:userInfoViewModel.figureurl] placeholderImage:DefaultUserIcon]; + _nameLabel.text = userInfoViewModel.name; +} +@end diff --git a/Ash_AWord/Views/User/PraiseUserListTableViewCell.xib b/Ash_AWord/Views/User/PraiseUserListTableViewCell.xib new file mode 100644 index 0000000..f5e0cb3 --- /dev/null +++ b/Ash_AWord/Views/User/PraiseUserListTableViewCell.xib @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +