no message

zhangxiaowen
1 parent bbf0d3a0
Showing 6 changed files with 135 additions and 51 deletions
CNLiveCollectionModule.podspec
CNLiveCollectionModule/Classes/Controller/CNLiveCollectionController.m
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.h
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.m
CNLiveCollectionModule/Classes/View/CNLiveCollectionCell.m
Example/CNLiveCollectionModule.xcodeproj/project.pbxproj
@@ -92,4 +92,7 @@ TODO: 网家家-我的模块.
   #
   s.dependency 'CNLiveCustomUI'
+  s.dependency 'CNLiveCommonCategory'
+  s.dependency 'CNLiveBaseKit'
+
 end
@@ -35,8 +35,6 @@
 @end
 @implementation CNLiveCollectionController
-static const NSInteger margin = 20;
-static const CGFloat timeValue = 1.5;
 #pragma mark - 数据
 - (void)loadData{
     NSDictionary *params = @{
@@ -48,6 +46,9 @@ static const CGFloat timeValue = 1.5;
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [QMUITips showLoadingInView:self.view];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNDarenCollectListDataSourceUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if(_pageNo == 1 && self.data.count > 0){
+            [self.data removeAllObjects];
+        }
         [QMUITips hideAllTipsInView:self.view];
         [self hideEmptyView];
@@ -103,7 +104,6 @@ static const CGFloat timeValue = 1.5;
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor = [UIColor blackColor];
     if (@available(iOS 11, *)) {
     }
     else {
@@ -136,11 +136,10 @@ static const CGFloat timeValue = 1.5;
     }
 }
-#pragma mark - 代理
 #pragma mark - UITableViewDelegate
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-//    CNLiveCollectionModel *model = self.data[indexPath.row];
-    return 120.0;
+    CNLiveCollectionModel *model = self.data[indexPath.row];
+    return model.height;
 }
 #pragma mark - UITableViewDataSource
@@ -244,9 +243,11 @@ static const CGFloat timeValue = 1.5;
             [self loadData];
         }];
-        _tableView.mj_footer = [CNLiveRrfreshFooter footerWithRefreshingBlock:^{
+        CNLiveRrfreshFooter *footer = [CNLiveRrfreshFooter footerWithRefreshingBlock:^{
             [self loadMoreData];
         }];
+        footer.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
+        _tableView.mj_footer = footer;
     }
     return _tableView;
 }
@@ -16,7 +16,7 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) {
     CNLiveCollectionCellVideo             = 3,
 };
-@interface CNLiveIcon
+@interface CNLiveIcon : NSObject 
 @property (nonatomic, copy) NSString *userId;
 @property (nonatomic, copy) NSString *nickName;
@@ -50,6 +50,14 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) {
 @property (nonatomic, copy) NSMutableAttributedString *attributedString;
+
+@property (nonatomic, copy) NSURL *imageUrl;
+@property (nonatomic, copy) NSMutableAttributedString *title;
+@property (nonatomic, copy) NSString *nameTime;
+
+@property (nonatomic, assign) CGFloat height;
+
+
 @end
 NS_ASSUME_NONNULL_END
@@ -7,14 +7,57 @@
 //
 #import "CNLiveCollectionModel.h"
+#import "CNLiveBaseKit.h"
+#import "CNLiveCommonCategory.h"
 @implementation CNLiveCollectionModel
-//static const NSInteger margin = 10;
-//+ (NSDictionary *)mj_objectClassInArray{
-//    return @{
-//             @"icon" : @"CNLiveIcon"
-//             };
-//}
++ (NSDictionary *)mj_objectClassInArray{
+    return @{
+             @"icon" : @"CNLiveIcon"
+             };
+}
+
+- (void)setUpAttributedString{
+    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+    style.alignment = NSTextAlignmentLeft;
+    style.lineBreakMode = NSLineBreakByTruncatingTail;
+    NSDictionary *attributes = @{ NSFontAttributeName:UIFontCNMake(17), NSParagraphStyleAttributeName:style};
+    
+//    NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithAttributedString:[CNTools replaceQQemojiWithCustomText:self.text ? self.text : @""]];
+//    [str setAttributes:attributes];
+    
+//    YYTextContainer *textContainer = [YYTextContainer containerWithSize:CGSizeMake(MainScreenWidth() -(100*RATIO+50), CGFLOAT_MAX)];
+//    YYTextLayout *textLayout = [YYTextLayout layoutWithContainer:textContainer text:str];
+//    _attributedString = str;
+}
+- (CGFloat)height{
+    if ([self.type isEqualToString:@"1"]||[self.type isEqualToString:@"2"]||[self.type isEqualToString:@"3"]||[self.type isEqualToString:@"4"]) {
+        return 180;
+    }
+    return 80;
+}
+
+- (NSMutableAttributedString *)title{
+    return nil;
+}
+
+- (NSString *)nameTime{
+    NSString *str = [NSString stringWithFormat:@"%ld",self.time];
+    NSTimeInterval time = ceil([str doubleValue] / 1000);
+    NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:time];
+    NSString *timeString = [detaildate shortTimeTextOfDate];
+    
+    return self.icon == nil ? [NSString stringWithFormat:@"%@",timeString]:[NSString stringWithFormat:@"%@  %@",self.icon.nickName,timeString];
+}
+
+- (NSURL *)imageUrl{
+    return [NSURL URLWithString:(self.imagePath&&![self.imagePath isEqualToString:@""])?self.imagePath:self.videoImg];
+}
+
+@end
+
+
+@implementation CNLiveIcon
 @end
@@ -10,15 +10,17 @@
 #import <Masonry/Masonry.h>
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
+#import "CNLiveCategory.h"
+#import "CNLiveBaseKit.h"
 #import "CNLiveCollectionModel.h"
 @interface CNLiveCollectionCell()
-
+@property (nonatomic, strong) UIView *bgView;
 @property (nonatomic, strong) UIImageView *leftImage;
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UILabel *timeLabel;
-@property (nonatomic, strong) UILabel *contentLabel;
+@property (nonatomic, strong) UIButton *playerBtn;
 @end
@@ -29,51 +31,57 @@ static const NSInteger margin = 10;
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
-        self.contentView.backgroundColor = [UIColor whiteColor];
+        self.contentView.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
         [self setupUI];
-        
     }
     return self;
 }
 #pragma mark - UI
 - (void)setupUI{
+    [self.contentView addSubview:self.bgView];
     [self.contentView addSubview:self.leftImage];
     [self.contentView addSubview:self.titleLabel];
     [self.contentView addSubview:self.timeLabel];
-    [self.contentView addSubview:self.contentLabel];
+    [self.contentView addSubview:self.playerBtn];
 }
 - (void)layoutSubviews{
     [super layoutSubviews];
-    [_leftImage mas_makeConstraints:^(MASConstraintMaker *make) {
+    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.contentView.mas_top).with.offset(margin);
-        make.left.equalTo(self.contentView.mas_left).with.offset(margin*3/4.0);
-        make.width.offset(30);
-        make.height.offset(30);
+        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-0);
+        make.left.equalTo(self.contentView.mas_left).with.offset(margin);
+        make.right.equalTo(self.contentView.mas_right).with.offset(-margin);
     }];
+    [_leftImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(_bgView.mas_top).with.offset(margin);
+        make.left.equalTo(_bgView.mas_left).with.offset(margin);
+        make.width.offset(120);
+        make.height.offset(130);
+    }];
     [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.contentView.mas_top).with.offset(margin/2.0);
-        make.left.equalTo(_leftImage.mas_right).with.offset(margin*3/4.0);
-        make.right.equalTo(_leftImage.mas_left).with.offset(-margin*3/4.0);
-        make.height.offset(20);
-        
+        make.top.equalTo(_leftImage.mas_top);
+        make.left.equalTo(_leftImage.mas_right).with.offset(margin);
+        make.right.equalTo(self.contentView.mas_right).with.offset(-margin);
+        make.bottom.equalTo(_leftImage.mas_bottom).with.offset(0);
+
     }];
-    
+
     [_timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(_titleLabel.mas_bottom).with.offset(margin/2.0);
-        make.left.equalTo(_leftImage.mas_right).with.offset(margin*3/4.0);
-        make.height.offset(10);
-        
+        make.top.equalTo(_leftImage.mas_bottom).with.offset(0);
+        make.left.equalTo(self.leftImage.mas_left);
+        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-0);
+        make.right.equalTo(self.leftImage.mas_right);
+
     }];
-    [_contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(_titleLabel.mas_bottom).with.offset(margin/2.0);
-        make.left.equalTo(_timeLabel.mas_right).with.offset(margin*3/4.0);
-        make.height.offset(10);
-        
+    [_playerBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(_leftImage.mas_centerX);
+        make.centerY.equalTo(_leftImage.mas_centerY);
+        make.width.height.offset(50);
     }];
 }
@@ -81,7 +89,11 @@ static const NSInteger margin = 10;
 #pragma mark - Data
 - (void)setModel:(CNLiveCollectionModel *)model{
     _model = model;
-    [_leftImage sd_setImageWithURL:[NSURL URLWithString:model.imagePath] placeholderImage:nil];
+    [_leftImage sd_setImageWithURL:model.imageUrl placeholderImage:nil];
+     
+    _timeLabel.text = model.nameTime;
+    
+    _playerBtn.hidden = [model.videoId isEqualToString:@""];
 }
 - (void)awakeFromNib {
@@ -95,7 +107,23 @@ static const NSInteger margin = 10;
     // Configure the view for the selected state
 }
-#pragma mark - Lazy loading
+#pragma mark - 响应方法
+- (void)playerDidClicked:(UIButton *)btn{
+    
+}
+
+#pragma mark - 懒加载
+- (UIView *)bgView {
+    if (!_bgView) {
+        _bgView = [[UIView alloc] init];
+        _bgView.layer.cornerRadius = 5;
+        _bgView.layer.masksToBounds = YES;
+        _bgView.exclusiveTouch = YES;
+        _bgView.backgroundColor = [UIColor whiteColor];
+        _bgView.userInteractionEnabled = YES;
+    }
+    return _bgView;
+}
 - (UIImageView *)leftImage{
     if (!_leftImage) {
         _leftImage = [[UIImageView alloc] init];
@@ -108,7 +136,7 @@ static const NSInteger margin = 10;
     if(_titleLabel == nil){
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = [UIColor colorWithRed:40/255.0 green:40/255.0 blue:40/255.0 alpha:1.0];
-        _titleLabel.font = UIFontMake(16);
+        _titleLabel.font = UIFontCNMake(16);
         _titleLabel.userInteractionEnabled = YES;
     }
@@ -119,23 +147,22 @@ static const NSInteger margin = 10;
     if(_timeLabel == nil){
         _timeLabel = [[UILabel alloc] init];
         _timeLabel.textColor = [UIColor colorWithRed:155/255.0 green:155/255.0 blue:155/255.0 alpha:1.0];
-        _timeLabel.font = UIFontMake(12);
+        _timeLabel.font = UIFontCNMake(13);
         _timeLabel.userInteractionEnabled = YES;
     }
     return _timeLabel;
 }
-- (UILabel *)contentLabel{
-    if(_contentLabel == nil){
-        _contentLabel = [[UILabel alloc] init];
-        _contentLabel.textColor = [UIColor colorWithRed:155/255.0 green:155/255.0 blue:155/255.0 alpha:1.0];
-        _contentLabel.font = UIFontMake(12);
-        _contentLabel.userInteractionEnabled = YES;
-        
+- (UIButton *)playerBtn {
+    if (!_playerBtn) {
+        _playerBtn= [UIButton buttonWithType:UIButtonTypeCustom];
+        _playerBtn.adjustsImageWhenHighlighted = NO;
+        UIImage *image = [self getImageWithImageName:@"collection_back_black_b" bundleName:@"CNLiveCollectionModule" targetClass:[self class]];
+        [_playerBtn setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+        [_playerBtn addTarget:self action:@selector(playerDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
-    return _contentLabel;
-    
+    return _playerBtn;
 }
 @end
@@ -351,6 +351,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCollectionModule/CNLiveCollectionModule.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
@@ -372,6 +373,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCollectionModule.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",