no message

zhangxiaowen
1 parent f9503bf1
Showing 6 changed files with 37 additions and 20 deletions
CNLiveCollectionModule/Assets/CNLiveCollectionModule.xcassets/collection_white_play.imageset/Contents.json
CNLiveCollectionModule/Assets/CNLiveCollectionModule.xcassets/collection_white_play.imageset/collection_white_play@2x.png
CNLiveCollectionModule/Assets/CNLiveCollectionModule.xcassets/collection_white_play.imageset/collection_white_play@3x.png
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.h
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.m
CNLiveCollectionModule/Classes/View/CNLiveCollectionCell.m
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "collection_white_play@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "collection_white_play@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -48,13 +48,9 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) {
 @property (nonatomic, copy) NSString *channelName;
 @property (nonatomic, copy) NSString *contentId;
-@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;
@@ -18,19 +18,6 @@
              };
 }
-- (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;
@@ -39,7 +26,13 @@
 }
 - (NSMutableAttributedString *)title{
-    return nil;
+    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 : @""]];
+    NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:self.text?self.text:@"" attributes:attributes];
+    return str;
 }
 - (NSString *)nameTime{
@@ -91,6 +91,8 @@ static const NSInteger margin = 10;
     _model = model;
     [_leftImage sd_setImageWithURL:model.imageUrl placeholderImage:nil];
+    _titleLabel.attributedText = model.title;
+
     _timeLabel.text = model.nameTime;
     _playerBtn.hidden = [model.videoId isEqualToString:@""];
@@ -128,7 +130,8 @@ static const NSInteger margin = 10;
     if (!_leftImage) {
         _leftImage = [[UIImageView alloc] init];
         _leftImage.userInteractionEnabled = YES;
-
+        _leftImage.contentMode = UIViewContentModeScaleAspectFill;
+        _leftImage.layer.masksToBounds = YES;
     }
     return _leftImage;
 }
@@ -138,6 +141,9 @@ static const NSInteger margin = 10;
         _titleLabel.textColor = [UIColor colorWithRed:40/255.0 green:40/255.0 blue:40/255.0 alpha:1.0];
         _titleLabel.font = UIFontCNMake(16);
         _titleLabel.userInteractionEnabled = YES;
+        _titleLabel.textAlignment = NSTextAlignmentLeft;
+        _titleLabel.numberOfLines = 0;
+        _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
     }
     return _titleLabel;
@@ -158,7 +164,7 @@ static const NSInteger margin = 10;
     if (!_playerBtn) {
         _playerBtn= [UIButton buttonWithType:UIButtonTypeCustom];
         _playerBtn.adjustsImageWhenHighlighted = NO;
-        UIImage *image = [self getImageWithImageName:@"collection_back_black_b" bundleName:@"CNLiveCollectionModule" targetClass:[self class]];
+        UIImage *image = [self getImageWithImageName:@"collection_white_play" bundleName:@"CNLiveCollectionModule" targetClass:[self class]];
         [_playerBtn setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
         [_playerBtn addTarget:self action:@selector(playerDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     }