no message

zhangxiaowen
1 parent 5171e35a
Showing 5 changed files with 24 additions and 22 deletions
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingController.m
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageContentButton.h
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageContentButton.m
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageFrame.h
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageFrame.m
@@ -16,7 +16,7 @@
 #import "CNLiveMessageModel.h"
 #import "CNLiveMessageCell.h"
-@interface CNLiveFontSettingController ()<UIGestureRecognizerDelegate, UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate>
+@interface CNLiveFontSettingController ()<UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate>
 @property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -107,7 +107,7 @@
     [_slider addTarget:self action:@selector(sliderTouchUp:) forControlEvents:UIControlEventTouchUpInside];
     self.tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAction:)];
-    _tapGesture.delegate = self;
+//    _tapGesture.delegate = self;
     [self.slider addGestureRecognizer:self.tapGesture];
     UIView *line = [[UIView alloc]initWithFrame:CGRectMake(0, 0, self.view.frame.size.width-70-30, 1)];
     line.center = _slider.center;
@@ -144,6 +144,8 @@
     // Dispose of any resources that can be recreated.
 }
+#pragma mark - UITableViewDelegate & UITableViewDataSource
+
 - (NSInteger )tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     return self.data.count;
 }
@@ -12,7 +12,7 @@
 @interface CNLiveMessageContentButton : UIButton
-@property (nonatomic, weak) UILabel *content;
+@property (nonatomic, strong) UILabel *content;
 @property (nonatomic, strong) CNLiveMessageFrame *messageFrame;
@@ -18,27 +18,28 @@
 - (id)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        [self createTextView];
+        [self addSubview:self.content];
     }
     return self;
 }
 #pragma mark -文本视图
-- (void)createTextView{
-   UILabel *content = [[UILabel alloc] init];
-    content.userInteractionEnabled = NO;
-    content.backgroundColor = [UIColor clearColor];
-    content.numberOfLines = 0;
-    content.lineBreakMode = NSLineBreakByWordWrapping;
-    content.font = UIFontCNMake(15);
-    [self addSubview:content];
-    self.content = content;
+- (UILabel *)content{
+    if(!_content){
+        _content = [[UILabel alloc] init];
+        _content.userInteractionEnabled = NO;
+        _content.backgroundColor = [UIColor clearColor];
+        _content.numberOfLines = 0;
+        _content.lineBreakMode = NSLineBreakByWordWrapping;
+        _content.font = UIFontCNMake(15);
+    }
+    return _content;
 }
 - (void)setMessageFrame:(CNLiveMessageFrame *)messageFrame {
     _messageFrame = messageFrame;
     self.frame = messageFrame.contentFrame;
-    [self layoutSubviews];
+
     //背景气泡图
     UIImage *normal;
     CNLiveMessageModel *message = messageFrame.message;
@@ -58,11 +59,11 @@
      if ([message.fromMe isEqualToString:@"1"]){
          // 是我的消息
          self.content.textColor = [UIColor whiteColor];
-         self.content.frame = CGRectMake(10, 15, self.frame.size.width-20, self.frame.size.height-30);
+         self.content.frame = CGRectMake(ChatContentRight, ChatContentTop, self.frame.size.width-ChatContentLeft-ChatContentRight, self.frame.size.height-2*ChatContentTop);
      }
      else {
          // 不是我的消息
-           self.content.frame = CGRectMake(15, 15, self.frame.size.width-15, self.frame.size.height-30);
+           self.content.frame = CGRectMake(ChatContentLeft, ChatContentTop, self.frame.size.width-ChatContentLeft-ChatContentRight, self.frame.size.height-2*ChatContentTop);
      }
@@ -70,9 +71,6 @@
     self.content.text = message.content;
     self.content.font = UIFontCNMake(15);
-//    self.backgroundColor = [UIColor redColor];
-//    self.textView.backgroundColor = [UIColor yellowColor];
-    
 }
 - (BOOL)canBecomeFirstResponder{
@@ -9,7 +9,7 @@
 #define ChatIconWH 45           //头像宽高height、width
 #define ChatContentTop 15       //文本内容与按钮上边缘间隔
-#define ChatContentLeft 10      //文本内容与按钮左边缘间隔
+#define ChatContentLeft 20      //文本内容与按钮左边缘间隔
 #define ChatContentBottom 15    //文本内容与按钮下边缘间隔
 #define ChatContentRight 10     //文本内容与按钮右边缘间隔
@@ -23,6 +23,7 @@
     CGFloat iconY = ChatContentTop;//头像坐标Y
     _iconFrame = CGRectMake(iconX, iconY, ChatIconWH, ChatIconWH);
+    
     // 2.计算内容位置
     CGFloat contentX = ChatIconWH+ChatMargin*2;
     CGFloat contentY = iconY;
@@ -31,7 +32,7 @@
     CGSize contentSize = [_message.content boundingRectWithSize:maxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:UIFontCNMake(15)} context:nil].size;
     if ([_message.fromMe isEqualToString:@"1"]){
-        contentX = iconX - contentSize.width - ChatContentLeft - ChatContentRight-ChatMargin;
+        contentX = iconX - contentSize.width - ChatContentLeft - ChatContentRight - ChatMargin;
     }
     CGFloat h = 0;
     if (contentSize.height + ChatContentTop + ChatContentBottom < ChatIconWH*RATIO) {
@@ -39,7 +40,8 @@
     }else{
         h = contentSize.height + ChatContentTop + ChatContentBottom;
     }
-    _contentFrame = CGRectMake(contentX, contentY, contentSize.width + 5 + ChatContentLeft + ChatContentRight, h);
+        
+    _contentFrame = CGRectMake(contentX, contentY, contentSize.width + ChatContentLeft + ChatContentRight, h);
     _cellHeight = MAX(CGRectGetMaxY(self.contentFrame), CGRectGetMaxY(self.iconFrame));