Commit c3cdea154b7fea115bc8941bd3b6b80ff91c3589
1 parent
ed13ea80
no message
Showing
1 changed file
with
5 additions
and
4 deletions
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
| @@ -66,7 +66,10 @@ static NSString *myAnnouncementsTableViewCell = @"CNMyAnnouncementsTableViewCell | @@ -66,7 +66,10 @@ static NSString *myAnnouncementsTableViewCell = @"CNMyAnnouncementsTableViewCell | ||
| 66 | */ | 66 | */ |
| 67 | #pragma mark - UITableViewDelegate | 67 | #pragma mark - UITableViewDelegate |
| 68 | - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ | 68 | - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ |
| 69 | - return 86; | 69 | + TableData *model = self.data[indexPath.row]; |
| 70 | + CNMyAnnouncementsModel *announcementsModel = [CNMyAnnouncementsModel mj_objectWithKeyValues:[model ToDictionary]]; | ||
| 71 | + return announcementsModel.titleHeight+40; | ||
| 72 | + | ||
| 70 | } | 73 | } |
| 71 | 74 | ||
| 72 | #pragma mark - UITableViewDataSource | 75 | #pragma mark - UITableViewDataSource |
| @@ -87,16 +90,14 @@ static NSString *myAnnouncementsTableViewCell = @"CNMyAnnouncementsTableViewCell | @@ -87,16 +90,14 @@ static NSString *myAnnouncementsTableViewCell = @"CNMyAnnouncementsTableViewCell | ||
| 87 | } | 90 | } |
| 88 | cell.selectionStyle = UITableViewCellSelectionStyleNone; | 91 | cell.selectionStyle = UITableViewCellSelectionStyleNone; |
| 89 | TableData *model = self.data[indexPath.row]; | 92 | TableData *model = self.data[indexPath.row]; |
| 90 | - CNMyAnnouncementsModel *announcementsModel =[CNMyAnnouncementsModel mj_objectWithKeyValues:[model ToDictionary]]; | 93 | + CNMyAnnouncementsModel *announcementsModel = [CNMyAnnouncementsModel mj_objectWithKeyValues:[model ToDictionary]]; |
| 91 | cell.model = announcementsModel; | 94 | cell.model = announcementsModel; |
| 92 | return cell; | 95 | return cell; |
| 93 | 96 | ||
| 94 | - | ||
| 95 | } | 97 | } |
| 96 | 98 | ||
| 97 | - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { | 99 | - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { |
| 98 | TableData *model = self.data[indexPath.row]; | 100 | TableData *model = self.data[indexPath.row]; |
| 99 | -// CNHomeModel *homeModel = [CNHomeModel mj_objectWithKeyValues:[model ToDictionary]]; | ||
| 100 | NSDictionary *_dic = [model ToDictionary]; | 101 | NSDictionary *_dic = [model ToDictionary]; |
| 101 | if ([@"program" isEqualToString:_dic[@"type"]]) { | 102 | if ([@"program" isEqualToString:_dic[@"type"]]) { |
| 102 | //视频 | 103 | //视频 |