no message

zhangxiaowen
1 parent 6adfd11c
Showing 9 changed files with 87 additions and 86 deletions
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageCell.h → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingCell.h
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageCell.m → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingCell.m
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageContentButton.h → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingContentButton.h
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageContentButton.m → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingContentButton.m
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingController.m
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageFrame.h → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingFrame.h
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageFrame.m → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingFrame.m
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageModel.h → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingModel.h
CNLiveSettingModule/Classes/FontSIze/CNLiveMessageModel.m → CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingModel.m
 //
-//  CNLiveMessageCell.h
+//  CNLiveFontSettingCell.h
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
@@ -8,11 +8,11 @@
 #import <UIKit/UIKit.h>
-@class CNLiveMessageFrame;
+@class CNLiveFontSettingFrame;
-@interface CNLiveMessageCell : UITableViewCell
+@interface CNLiveFontSettingCell : UITableViewCell
-@property (nonatomic, strong) CNLiveMessageFrame *messageFrame;
+@property (nonatomic, strong) CNLiveFontSettingFrame *fontSettingFrame;
 @end
 //
-//  CNLiveMessageCell.m
+//  CNLiveFontSettingCell.m
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
 //  Copyright © 2018年 cnlive. All rights reserved.
 //
-#import "CNLiveMessageCell.h"
-#import "CNLiveMessageModel.h"
-#import "CNLiveMessageFrame.h"
+#import "CNLiveFontSettingCell.h"
+#import "CNLiveFontSettingModel.h"
+#import "CNLiveFontSettingFrame.h"
 #import "CNLiveBaseKit.h"
-#import "CNLiveMessageContentButton.h"
+#import "CNLiveFontSettingContentButton.h"
-@interface CNLiveMessageCell()
+@interface CNLiveFontSettingCell()
 @property (nonatomic, strong) UIButton *btnHeadImage;//头像
-@property (nonatomic, strong) CNLiveMessageContentButton *btnContent;//显示内容
+@property (nonatomic, strong) CNLiveFontSettingContentButton *btnContent;//显示内容
 @end
-@implementation CNLiveMessageCell
+@implementation CNLiveFontSettingCell
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
@@ -33,7 +33,7 @@
         [_btnHeadImage setBackgroundImage:image forState:UIControlStateNormal];
         [self.contentView addSubview:self.btnHeadImage];
-        self.btnContent = [[CNLiveMessageContentButton alloc]init];
+        self.btnContent = [[CNLiveFontSettingContentButton alloc]init];
         [self.contentView addSubview:self.btnContent];
     }
@@ -41,12 +41,12 @@
 }
 #pragma mark - 内容及Frame设置
-- (void)setMessageFrame:(CNLiveMessageFrame *)messageFrame{
-    _messageFrame = messageFrame;
+- (void)setFontSettingFrame:(CNLiveFontSettingFrame *)fontSettingFrame{
+    _fontSettingFrame = fontSettingFrame;
     // 设置头像
-    self.btnHeadImage.frame = messageFrame.iconFrame;
+    self.btnHeadImage.frame = fontSettingFrame.iconFrame;
     // 4、设置内容
-    self.btnContent.messageFrame = messageFrame;//这里设置内容的frame等
+    self.btnContent.fontSettingFrame = fontSettingFrame;//这里设置内容的frame等
 }
 //
-//  CNLiveMessageContentButton.h
+//  CNLiveFontSettingContentButton.h
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
@@ -8,12 +8,10 @@
 #import <UIKit/UIKit.h>
-@class CNLiveMessageFrame;
+@class CNLiveFontSettingFrame;
-@interface CNLiveMessageContentButton : UIButton
+@interface CNLiveFontSettingContentButton : UIButton
-@property (nonatomic, strong) UILabel *content;
-
-@property (nonatomic, strong) CNLiveMessageFrame *messageFrame;
+@property (nonatomic, strong) CNLiveFontSettingFrame *fontSettingFrame;
 @end
 //
-//  CNMessageContentButton.m
+//  CNFontSettingContentButton.m
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
 //  Copyright © 2018年 cnlive. All rights reserved.
 //
-#import "CNLiveMessageContentButton.h"
+#import "CNLiveFontSettingContentButton.h"
 #import "CNLiveBaseKit.h"
-#import "CNLiveMessageFrame.h"
-#import "CNLiveMessageModel.h"
+#import "CNLiveFontSettingFrame.h"
+#import "CNLiveFontSettingModel.h"
-@interface CNLiveMessageContentButton()
+@interface CNLiveFontSettingContentButton()
+@property (nonatomic, strong) UILabel *content;
 @end
-@implementation CNLiveMessageContentButton
+@implementation CNLiveFontSettingContentButton
 - (id)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
@@ -25,15 +26,15 @@
     return self;
 }
-- (void)setMessageFrame:(CNLiveMessageFrame *)messageFrame {
-    _messageFrame = messageFrame;
-    self.frame = messageFrame.contentFrame;
+- (void)setFontSettingFrame:(CNLiveFontSettingFrame *)fontSettingFrame {
+    _fontSettingFrame = fontSettingFrame;
+    self.frame = fontSettingFrame.contentFrame;
     //背景气泡图
     UIImage *normal;
-    CNLiveMessageModel *message = messageFrame.message;
+    CNLiveFontSettingModel *FontSetting = fontSettingFrame.model;
-    if ([message.fromMe isEqualToString:@"1"]) {
+    if ([FontSetting.fromMe isEqualToString:@"1"]) {
         normal = [self xw_getImageName:@"font_size_message_me" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
         normal = [normal stretchableImageWithLeftCapWidth:normal.size.width * 0.5 topCapHeight:normal.size.height * 0.9];
     }
@@ -45,7 +46,7 @@
     [self setBackgroundImage:normal forState:UIControlStateNormal];
      // 我发出的消息
-     if ([message.fromMe isEqualToString:@"1"]){
+     if ([FontSetting.fromMe isEqualToString:@"1"]){
          // 是我的消息
          self.content.textColor = [UIColor whiteColor];
          self.content.frame = CGRectMake(ChatContentRight, 0, self.frame.size.width-ChatContentLeft-ChatContentRight, self.frame.size.height);
@@ -56,11 +57,11 @@
      }
-    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:message.content];
-    [attributedString addAttribute:NSFontAttributeName value:UIFontCNMake(15) range:NSMakeRange(0, message.content.length)];
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:FontSetting.content];
+    [attributedString addAttribute:NSFontAttributeName value:UIFontCNMake(15) range:NSMakeRange(0, FontSetting.content.length)];
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc]init];
-    [paragraphStyle setLineSpacing:ChatLineSpacing];
-    [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, message.content.length)];
+    [paragraphStyle setLineSpacing:ChatContentLineSpacing];
+    [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, FontSetting.content.length)];
     self.content.attributedText = attributedString;
 }
@@ -12,9 +12,9 @@
 #import "CNLiveBaseKit.h"
 #import "CNLiveSettingNavigationBar.h"
-#import "CNLiveMessageFrame.h"
-#import "CNLiveMessageModel.h"
-#import "CNLiveMessageCell.h"
+#import "CNLiveFontSettingFrame.h"
+#import "CNLiveFontSettingModel.h"
+#import "CNLiveFontSettingCell.h"
 @interface CNLiveFontSettingController ()<UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate>
 @property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
@@ -30,26 +30,26 @@
     NSInteger tempCoefficient;
 }
 - (void)setupDataSource{
-    CNLiveMessageFrame * frame1 = [[CNLiveMessageFrame alloc]init];
-    CNLiveMessageModel * message1 = [[CNLiveMessageModel alloc]init];
-    message1.content = @"预览字体大小";
-    message1.fromMe = @"1";
-    frame1.message = message1;
+    CNLiveFontSettingFrame * frame1 = [[CNLiveFontSettingFrame alloc]init];
+    CNLiveFontSettingModel * FontSetting1 = [[CNLiveFontSettingModel alloc]init];
+    FontSetting1.content = @"预览字体大小";
+    FontSetting1.fromMe = @"1";
+    frame1.model = FontSetting1;
     [self.data addObject:frame1];
-    CNLiveMessageFrame * frame2 = [[CNLiveMessageFrame alloc]init];
-    CNLiveMessageModel * message2 = [[CNLiveMessageModel alloc]init];
-    message2.content = @"拖拽下面的滑块，可设置字体大小";
-    message2.fromMe = @"0";
-    frame2.message = message2;
+    CNLiveFontSettingFrame * frame2 = [[CNLiveFontSettingFrame alloc]init];
+    CNLiveFontSettingModel * FontSetting2 = [[CNLiveFontSettingModel alloc]init];
+    FontSetting2.content = @"拖拽下面的滑块，可设置字体大小";
+    FontSetting2.fromMe = @"0";
+    frame2.model = FontSetting2;
     [self.data addObject:frame2];
-    CNLiveMessageFrame * frame3 = [[CNLiveMessageFrame alloc]init];
-    CNLiveMessageModel * message3 = [[CNLiveMessageModel alloc]init];
-    message3.content = [NSString stringWithFormat:@"设置后，可改变聊天、菜单中的字体大小。如果在使用过程中存在问题或意见，可反馈给%@",@"网家家"];
-    message3.fromMe = @"0";
-    frame3.message = message3;
+    CNLiveFontSettingFrame * frame3 = [[CNLiveFontSettingFrame alloc]init];
+    CNLiveFontSettingModel * FontSetting3 = [[CNLiveFontSettingModel alloc]init];
+    FontSetting3.content = [NSString stringWithFormat:@"设置后，可改变聊天、菜单中的字体大小。如果在使用过程中存在问题或意见，可反馈给%@",@"网家家"];
+    FontSetting3.fromMe = @"0";
+    frame3.model = FontSetting3;
     [self.data addObject:frame3];
 }
@@ -151,18 +151,18 @@
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-    CNLiveMessageCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CNLiveMessageCell"];
+    CNLiveFontSettingCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CNLiveFontSettingCell"];
     if (cell == nil) {
-        cell = [[CNLiveMessageCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CNLiveMessageCell"];
+        cell = [[CNLiveFontSettingCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CNLiveFontSettingCell"];
     }
-    CNLiveMessageFrame *messageFrame = self.data[indexPath.row];
-    cell.messageFrame = messageFrame;
+    CNLiveFontSettingFrame *fontSettingFrame = self.data[indexPath.row];
+    cell.fontSettingFrame = fontSettingFrame;
     return cell;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    CNLiveMessageFrame *messageFrame = self.data[indexPath.row];
-    return messageFrame.cellHeight;
+    CNLiveFontSettingFrame *FontSettingFrame = self.data[indexPath.row];
+    return FontSettingFrame.cellHeight;
 }
 #pragma mark - CNLiveSettingNavigationBarDelegate
@@ -252,9 +252,10 @@
 - (void)setFontCoefficient:(NSInteger)coefficient{
     [CNFontAndRatioTool setFontSizeCoefficient:coefficient];
-    for (CNLiveMessageFrame * frame in self.data) {
-        frame.message.content = frame.message.content;
-        [frame setMessage:frame.message];
+    for (CNLiveFontSettingFrame * frame in self.data) {
+        frame.model.content = frame.model.content;
+//        [frame setFontSetting:frame.FontSetting];
+        [frame setModel:frame.model];
     }
     [self.tableView reloadData];
 //
-//  CNLiveMessageFrame.h
+//  CNLiveFontSettingFrame.h
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
@@ -8,7 +8,7 @@
 #define ChatMargin 10           //间隔
 #define ChatIconWH 45           //头像宽高height、width
-#define ChatLineSpacing 3
+#define ChatContentLineSpacing 3
 #define ChatContentTop 18
 #define ChatContentBottom 8
@@ -18,14 +18,14 @@
 #import <Foundation/Foundation.h>
-@class CNLiveMessageModel;
+@class CNLiveFontSettingModel;
-@interface CNLiveMessageFrame : NSObject
+@interface CNLiveFontSettingFrame : NSObject
 @property (nonatomic, assign) CGRect iconFrame;                  // 头像frame
 @property (nonatomic, assign) CGRect contentFrame;               // 内容frame
 @property (nonatomic, assign) CGFloat cellHeight;                //cell 的高度
-@property (nonatomic, strong) CNLiveMessageModel *message;
+@property (nonatomic, strong) CNLiveFontSettingModel *model;
 @end
 //
-//  CNLiveMessageFrame.m
+//  CNLiveFontSettingFrame.m
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
 //  Copyright © 2018年 cnlive. All rights reserved.
 //
-#import "CNLiveMessageFrame.h"
-#import "CNLiveMessageModel.h"
+#import "CNLiveFontSettingFrame.h"
 #import "QMUIKit.h"
 #import "CNLiveBaseKit.h"
-@implementation CNLiveMessageFrame
+#import "CNLiveFontSettingModel.h"
-- (void)setMessage:(CNLiveMessageModel *)message{
-    _message = message;
+@implementation CNLiveFontSettingFrame
+
+- (void)setModel:(CNLiveFontSettingModel *)model{
+    _model = model;
     // 1.计算头像位置
     CGFloat iconX = ChatMargin;//头像边距
-    if ([_message.fromMe isEqualToString:@"1"]) {
+    if ([_model.fromMe isEqualToString:@"1"]) {
         iconX = SCREEN_WIDTH - ChatMargin - ChatIconWH;//头像坐标X
     }
     CGFloat iconY = ChatContentTop;//头像坐标Y
@@ -30,10 +31,10 @@
     CGSize maxSize = CGSizeMake(SCREEN_WIDTH-ChatIconWH*2-ChatMargin*2-(ChatContentLeft + ChatContentRight), CGFLOAT_MAX);
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc]init];
-    [paragraphStyle setLineSpacing:ChatLineSpacing];
-    CGSize contentSize = [_message.content boundingRectWithSize:maxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:UIFontCNMake(15),NSParagraphStyleAttributeName:paragraphStyle} context:nil].size;
+    [paragraphStyle setLineSpacing:ChatContentLineSpacing];
+    CGSize contentSize = [_model.content boundingRectWithSize:maxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:UIFontCNMake(15),NSParagraphStyleAttributeName:paragraphStyle} context:nil].size;
-    if ([_message.fromMe isEqualToString:@"1"]){
+    if ([_model.fromMe isEqualToString:@"1"]){
         contentX = iconX - contentSize.width - ChatContentLeft - ChatContentRight - ChatMargin;
     }
     CGFloat h = 0;
 //
-//  CNLiveMessageModel.h
+//  CNLiveFontSettingModel.h
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
-@interface CNLiveMessageModel :NSObject
+@interface CNLiveFontSettingModel :NSObject
 @property (nonatomic, copy) NSString *fromMe;      //是否自己发的
 @property (nonatomic, copy) NSString *content;     //消息内容
 //
-//  CNLiveMessageModel.m
+//  CNLiveFontSettingModel.m
 //  CNLiveSettingModule
 //
 //  Created by open on 2018/9/1.
 //  Copyright © 2018年 cnlive. All rights reserved.
 //
-#import "CNLiveMessageModel.h"
+#import "CNLiveFontSettingModel.h"
-@implementation CNLiveMessageModel
+@implementation CNLiveFontSettingModel
 @end