no message

zhangxiaowen
1 parent 7d9b3873
Showing 8 changed files with 267 additions and 189 deletions
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/Model/CNLiveMineModel.h
CNLiveMineModule/Classes/Model/CNLiveMineModel.m
CNLiveMineModule/Classes/View/CNLiveMineButtonCell.h
CNLiveMineModule/Classes/View/CNLiveMineButtonCell.m
CNLiveMineModule/Classes/View/CNLiveMineCell.h
CNLiveMineModule/Classes/View/CNLiveMineCell.m
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
@@ -44,6 +44,8 @@ static const CGFloat timeValue = 1.5;
                           @"name":@"我的订单",
                           @"style":@"1",
                           @"margin":@"10",
+                          @"titleHeight":@"50",
+                          @"itemHeight":@"60",
                           @"buttons":@[@{
                                            @"title":@"订单",
                                            @"image":@"mine_order"
@@ -67,6 +69,8 @@ static const CGFloat timeValue = 1.5;
                           @"name":@"常用工具",
                           @"style":@"2",
                           @"margin":@"10",
+                          @"titleHeight":@"50",
+                          @"itemHeight":@"60",
                           @"buttons":@[@{
                                            @"title":@"收货地址",
                                            @"image":@"mine_address"
@@ -103,6 +107,8 @@ static const CGFloat timeValue = 1.5;
                           @"pic":@"mine_buy_commodity",
                           @"style":@"3",
                           @"margin":@"10",
+                          @"titleHeight":@"50",
+                          @"itemHeight":@"80",
                           @"buttons":@[@{
                                            @"title":@"电子票",
                                            @"image":@"mine_e-ticket"
@@ -115,6 +121,8 @@ static const CGFloat timeValue = 1.5;
                           @"pic":@"mine_china_sport",
                           @"style":@"4",
                           @"margin":@"10",
+                          @"titleHeight":@"50",
+                          @"itemHeight":@"60",
                           @"buttons":@[@{
                                            @"title":@"我的活动",
                                            @"image":@"mine_activity"
@@ -146,6 +154,7 @@ static const CGFloat timeValue = 1.5;
     if(self.soccerBtn){
         self.soccerBtn.frame = CGRectMake(SCREEN_WIDTH-67-10, SCREEN_HEIGHT-71-10-TabBarHeight, 67, 71);
     }
+    [self.tableView reloadData];
 }
 - (void)viewDidLoad {
@@ -161,11 +170,6 @@ static const CGFloat timeValue = 1.5;
     [self loadData];
 }
-- (void)dealloc {
-    
-    
-}
-
 - (void)createSubViews {
     [self.view addSubview:self.tableView];
     CNLiveMineHeaderView *headerView = [[CNLiveMineHeaderView alloc]initWithFrame:CGRectMake(0, -kHEIGHT, SCREEN_WIDTH, kHEIGHT)];
@@ -199,6 +203,7 @@ static const CGFloat timeValue = 1.5;
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
 }
+
 #pragma mark - CNLiveMineHeaderViewDelegate
 - (void)headerView:(CNLiveMineHeaderView *)headerView pushToController:(CNLiveMineHeaderViewType)type{
     switch (type) {
@@ -253,66 +258,65 @@ static const CGFloat timeValue = 1.5;
 }
 #pragma mark - CNLiveMineCellDelegate
-- (void)cell:(CNLiveMineCell *)cell clickedButtonWithType:(CNLiveMineCellType)type tag:(NSInteger)tag{
-    switch (type) {
+- (void)cell:(CNLiveMineCell *)cell didSelectItemAtItem:(NSInteger)item{
+    switch (cell.model.type) {
         case CNLiveMineCellTypeOrder:
         {
-            if(tag-10000 == 4){
+            if(item == 4){
                 //售后
                 id<CNLiveOrderServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveOrderServiceProtocol)];
                 [service pushToRefundViewController:0];
             }else{
                 id<CNLiveOrderServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveOrderServiceProtocol)];
-                [service pushToOrderViewController:tag-10000];
+                [service pushToOrderViewController:item];
             }
         }
             break;
         case CNLiveMineCellTypeTool:
         {
-            if(tag == 10000){
+            if(item == 0){
                 // 收货地址
                 id<CNLiveOrderServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveOrderServiceProtocol)];
                 [service pushToAddressViewController];
             }
-            else if(tag == 10001){
+            else if(item == 1){
                 // 余额
 //                XWBalanceController *vc = [[XWBalanceController alloc]init];
 //                [self.navigationController pushViewController:vc animated:YES];
             }
-            else if(tag == 10002){
+            else if(item == 2){
                 // 收藏
                 id<CNLiveCollectionServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveCollectionServiceProtocol)];
                 [service pushToCollectionViewController];
             }
-            else if(tag == 10003){
+            else if(item == 3){
                 // 发布记录
 //                XWOrdersController *vc = [[XWOrdersController alloc]init];
 //                [self.navigationController pushViewController:vc animated:YES];
             }
-            else if(tag == 10004){
+            else if(item == 4){
                 // 邀请好友
 //                XWOrdersController *vc = [[XWOrdersController alloc]init];
 //                [self.navigationController pushViewController:vc animated:YES];
             }
-            else if(tag == 10005){
+            else if(item == 5){
                 // 设置
                 id<CNLiveSettingServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveSettingServiceProtocol)];
                 [service pushToSettingViewController];
             }
-            else if(tag == 10006){
+            else if(item == 6){
                 // 小家音响
             }
-            else if(tag == 10007){
+            else if(item == 7){
                 // 我的礼盒
                 id<CNLiveOrderServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveOrderServiceProtocol)];
                 [service pushToGiftBoxViewController];
             }
-            else if(tag == 10008){
+            else if(item == 8){
                 // 路径工具
-//                XWOrdersController *vc = [[XWOrdersController alloc]init];
-//                [self.navigationController pushViewController:vc animated:YES];
+
             }
         }
@@ -324,11 +328,11 @@ static const CGFloat timeValue = 1.5;
             break;
         case CNLiveMineCellTypeSports:
         {
-            if(tag == 10000){
+            if(item == 0){
                 // 我的活动
             }
-            else if(tag == 10001){
+            else if(item == 1){
                 // 我的记录
             }
@@ -34,6 +34,10 @@ typedef NS_ENUM(NSInteger, CNLiveMineCellType) {
 @property (nonatomic, assign) CNLiveMineCellType type;
 @property (nonatomic, assign) CGFloat height;
+// title的高度
+@property (nonatomic, assign) CGFloat titleHeight;
+// UICollectionView一个item的高度
+@property (nonatomic, assign) CGFloat itemHeight;
 @property (nonatomic, assign) CGFloat margin;
 // 是否显示路径工具
@@ -46,27 +46,24 @@ static const NSInteger margin = 10;
 }
 - (CGFloat)height{
-    CGFloat titleHeight = 50;
-    CGFloat btnHeight = 60;
-
     //订单
     if(self.type == CNLiveMineCellTypeOrder){
-        return 2*margin+titleHeight+btnHeight+margin;
+        return 2*margin+self.titleHeight+self.itemHeight+margin;
     }
     //工具
     else if(self.type == CNLiveMineCellTypeTool){
-        return 2*margin+titleHeight+ceilf(self.buttons.count/4.0)*(btnHeight+margin);
+        return 2*margin+self.titleHeight+ceilf(self.buttons.count/4.0)*(self.itemHeight+margin);
     }
     //商品
     else if(self.type == CNLiveMineCellTypeGoods){
         // 电票的高度  80
-        return 2*margin+titleHeight+80+margin;
+        return 2*margin+self.titleHeight+self.itemHeight+margin;
     }
     //大众体育
     else if(self.type == CNLiveMineCellTypeSports){
-        return 2*margin+titleHeight+ceilf(self.buttons.count/4.0)*(btnHeight+margin);
+        return 2*margin+self.titleHeight+ceilf(self.buttons.count/4.0)*(self.itemHeight+margin);
     }
     return 0.0000001f;
+//
+//  CNLiveMineButtonCell.h
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@class CNLiveMineButtonModel;
+
+static NSString * const kCNLiveMineButtonCell = @"CNLiveMineButtonCell";
+
+@interface CNLiveMineButtonCell : UICollectionViewCell
+@property (nonatomic, strong) CNLiveMineButtonModel *model;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveMineButtonCell.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveMineButtonCell.h"
+#import <Masonry/Masonry.h>
+#import "QMUIKit.h"
+#import "CNLiveCategory.h"
+#import "CNLiveBaseKit.h"
+#import "CNLiveMineModel.h"
+
+@interface CNLiveMineButtonCell()
+@property (nonatomic, strong) UIImageView *image;
+@property (nonatomic, strong) UILabel *title;
+
+@end
+
+@implementation CNLiveMineButtonCell
+#pragma mark - 生命周期
+- (id)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.contentView.backgroundColor = [UIColor whiteColor];
+        [self.contentView addSubview:self.image];
+        [self.contentView addSubview:self.title];
+    }
+    return self;
+}
+
+- (void)layoutSubviews{
+    [super layoutSubviews];
+    [_image mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.contentView.mas_left);
+        make.right.equalTo(self.contentView.mas_right);
+        make.top.equalTo(self.contentView.mas_top);
+        make.height.offset(self.frame.size.height*2/3.0);
+        
+    }];
+    [_title mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.image.mas_bottom);
+        make.left.equalTo(self.image.mas_left);
+        make.right.equalTo(self.image.mas_right);
+        make.bottom.equalTo(self.contentView.mas_bottom);
+
+    }];
+    
+}
+
+#pragma mark - 数据
+- (void)setModel:(CNLiveMineButtonModel *)model{
+    UIImage *xw_image = [self getImageWithImageName:model.image bundleName:@"CNLiveMineModule" targetClass:[self class]];
+    _image.image = xw_image;
+    _title.text = model.title;
+    _title.font = UIFontCNMake(12.0);
+}
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+#pragma mark - 懒加载
+- (UIImageView *)image{
+    if (!_image) {
+        _image = [[UIImageView alloc] init];
+        _image.contentMode = UIViewContentModeCenter;
+    }
+    return _image;
+}
+
+- (UILabel *)title {
+    if (!_title) {
+        _title = [[UILabel alloc] init];
+        _title.userInteractionEnabled = YES;
+        _title.numberOfLines = 1;
+        _title.lineBreakMode = NSLineBreakByTruncatingTail;
+        _title.textColor = [UIColor blackColor];
+        _title.textAlignment = NSTextAlignmentCenter;
+        _title.font = UIFontCNMake(12.0);
+    }
+    return _title;
+}
+
+@end
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 static NSString * const kCNLiveMineCell = @"CNLiveMineCell";
 @protocol CNLiveMineCellDelegate <NSObject>
 @optional
-- (void)cell:(CNLiveMineCell *)cell clickedButtonWithType:(CNLiveMineCellType)type tag:(NSInteger)tag;
+- (void)cell:(CNLiveMineCell *)cell didSelectItemAtItem:(NSInteger)item;
 @end
@@ -11,87 +11,110 @@
 #import "QMUIKit.h"
 #import "CNLiveCategory.h"
 #import "CNLiveBaseKit.h"
+#import "CNLiveMineButtonCell.h"
-@interface CNLiveMineCell()
+@interface CNLiveMineCell()<UICollectionViewDelegate, UICollectionViewDataSource>
 @property (nonatomic, strong) UIView *bgView;
 @property (nonatomic, strong) UIButton *titleButton;
 @property (nonatomic, strong) UIButton *allButton;
 @property (nonatomic, strong) UIView *line;
+@property (nonatomic, strong) NSMutableArray *buttons;
+
+@property (nonatomic, strong) UICollectionView *collectionView;
 @end
 @implementation CNLiveMineCell
+
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         self.contentView.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
-        [self xw_layoutSubviews];
+        [self createSubviews];
     }
     return self;
 }
-- (void)xw_layoutSubviews{
+- (void)createSubviews{
     [self.contentView addSubview:self.bgView];
     [self.contentView addSubview:self.titleButton];
     [self.contentView addSubview:self.allButton];
     [self.contentView addSubview:self.line];
-    
+    [self.contentView addSubview:self.collectionView];
+
 }
 - (void)setModel:(CNLiveMineModel *)model{
-    if(_model == model){
-        return;
-    }
     _model = model;
+
     [_titleButton setTitle:model.name forState:UIControlStateNormal];
+    _titleButton.titleLabel.font = UIFontBoldCNMake(15.0);
+
     UIImage *xw_image = [self getImageWithImageName:model.pic bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
     [_titleButton setImage:xw_image forState:UIControlStateNormal];
+    
     _allButton.hidden = YES;
-
+    _allButton.titleLabel.font = UIFontCNMake(12.0);
+    
+    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.contentView.mas_left).with.offset(self.model.margin);
+        make.right.equalTo(self.contentView.mas_right).with.offset(-self.model.margin);
+        make.top.equalTo(self.contentView.mas_top).with.offset(0);
+        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-self.model.margin);
+        
+    }];
     switch (model.type) {
         case CNLiveMineCellTypeOrder:
         {
             [self order_layoutSubviews];
         }
             break;
-            
+
         case CNLiveMineCellTypeTool:
         {
             [self tool_layoutSubviews];
         }
             break;
-            
+
         case CNLiveMineCellTypeGoods:
         {
             [self goods_layoutSubviews];
         }
             break;
-            
+
         case CNLiveMineCellTypeSports:
         {
             [self sports_layoutSubviews];
         }
             break;
     }
+    [_line mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.titleButton.mas_bottom).with.offset(0);
+        make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
+        make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
+        make.height.with.offset(0.5);
+        
+    }];
+    [_collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.line.mas_bottom);
+        make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
+        make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
+        make.bottom.equalTo(self.bgView.mas_bottom);
+    }];
+    [_collectionView reloadData];
+
 }
 - (void)order_layoutSubviews{
-    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.contentView.mas_right).with.offset(-self.model.margin);
-        make.top.equalTo(self.contentView.mas_top).with.offset(0);
-        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-self.model.margin);
-        
-    }];
     [_titleButton setImage:nil forState:UIControlStateNormal];
     _titleButton.titleLabel.textAlignment = NSTextAlignmentLeft;
     _titleButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;//使图片和文字水平居中显示
     [_titleButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.bgView.mas_top).with.offset(0);
+        make.top.equalTo(self.bgView.mas_top);
         make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
         make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(50);
+        make.height.with.offset(self.model.titleHeight);
     }];
@@ -99,38 +122,12 @@
     [_allButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.titleButton.mas_top);
         make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(50);
+        make.height.with.offset(self.model.titleHeight);
     }];
-    [_line mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.titleButton.mas_bottom).with.offset(0);
-        make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(0.5);
-        
-    }];
-
-    CGFloat width = SCREEN_WIDTH-2*self.model.margin;
-    CGFloat btnWidth = width/self.model.buttons.count*1.0;
-    CGFloat btnHeight = 60;
-    
-    for(int i = 0; i < self.model.buttons.count; i++){
-        CNLiveMineButtonModel *buttonModel = self.model.buttons[i];
-        UIButton *btn = [self createButtonWithFrame:CGRectMake(self.model.margin+btnWidth*i, 50+self.model.margin, btnWidth, btnHeight) title:buttonModel.title image:buttonModel.image tag:10000+i];
-        [self addSubview:btn];
-        
-    }
-    
 }
 - (void)tool_layoutSubviews{
-    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.contentView.mas_right).with.offset(-self.model.margin);
-        make.top.equalTo(self.contentView.mas_top).with.offset(0);
-        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-self.model.margin);
-        
-    }];
     [_titleButton setImage:nil forState:UIControlStateNormal];
     _titleButton.titleLabel.textAlignment = NSTextAlignmentLeft;
     _titleButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;//使图片和文字水平居中显示
@@ -138,115 +135,41 @@
         make.top.equalTo(self.bgView.mas_top).with.offset(0);
         make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
         make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(50);
-        
-    }];
-    _allButton.hidden = YES;
-
-    [_line mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.titleButton.mas_bottom).with.offset(0);
-        make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(0.5);
+        make.height.with.offset(self.model.titleHeight);
     }];
-
-    CGFloat width = SCREEN_WIDTH-2*self.model.margin;
-    
-    CGFloat btnWidth = width/4.0;
-    CGFloat btnHeight = 60;
-    for(int i = 0; i < self.model.buttons.count; i++){
-        CNLiveMineButtonModel *buttonModel = self.model.buttons[i];
-        NSInteger row = i % 4;
-        NSInteger col = floorf(i / 4.0);
-        UIButton *btn = [self createButtonWithFrame:CGRectMake(self.model.margin+btnWidth*row, (col*(btnHeight+self.model.margin))+50+self.model.margin, btnWidth, btnHeight) title:buttonModel.title image:buttonModel.image tag:10000+i];
-        [self addSubview:btn];
-
-    }
 }
 - (void)goods_layoutSubviews{
     [_titleButton setImageEdgeInsets:UIEdgeInsetsMake(0, -self.model.margin, 0, 0)];
     [_titleButton setTitleEdgeInsets:UIEdgeInsetsMake(0, self.model.margin, 0, 0)];
-    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.contentView.mas_right).with.offset(-self.model.margin);
-        make.top.equalTo(self.contentView.mas_top).with.offset(0);
-        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-self.model.margin);
-        
-    }];
     _titleButton.titleLabel.textAlignment = NSTextAlignmentCenter;
     _titleButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;//使图片和文字水平居中显示
     [_titleButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.bgView.mas_top).with.offset(0);
         make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
         make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(50);
+        make.height.with.offset(self.model.titleHeight);
     }];
-    _allButton.hidden = YES;
-
-    [_line mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.titleButton.mas_bottom).with.offset(0);
-        make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(0.5);
-        
-    }];
-    CGFloat width = SCREEN_WIDTH-2*self.model.margin;
-    CGFloat btnWidth = width/4.0;
-    CGFloat btnHeight = 80;
-    
-    // 电子票
-    CNLiveMineButtonModel *buttonModel = self.model.buttons[0];
-    UIButton *btn = [self createButtonWithFrame:CGRectMake((width-btnWidth)/2.0, self.model.margin+50, btnWidth, btnHeight) title:buttonModel.title image:buttonModel.image tag:10000];
-    [self addSubview:btn];
 }
+
 - (void)sports_layoutSubviews{
     [_titleButton setImageEdgeInsets:UIEdgeInsetsMake(0, -self.model.margin, 0, 0)];
     [_titleButton setTitleEdgeInsets:UIEdgeInsetsMake(0, self.model.margin, 0, 0)];
-    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.contentView.mas_right).with.offset(-self.model.margin);
-        make.top.equalTo(self.contentView.mas_top).with.offset(0);
-        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-self.model.margin);
-    
-    }];
     _titleButton.titleLabel.textAlignment = NSTextAlignmentCenter;
     _titleButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;//使图片和文字水平居中显示
     [_titleButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.bgView.mas_top).with.offset(0);
         make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
         make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(50);
-        
-    }];
-    _allButton.hidden = YES;
-
-    [_line mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.titleButton.mas_bottom).with.offset(0);
-        make.left.equalTo(self.bgView.mas_left).with.offset(self.model.margin);
-        make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
-        make.height.with.offset(0.5);
+        make.height.with.offset(self.model.titleHeight);
     }];
-    CGFloat width = SCREEN_WIDTH-2*self.model.margin;
-    
-    CGFloat btnWidth = width/4.0;
-    CGFloat btnHeight = 60;
-    
-    for(int i = 0; i < self.model.buttons.count; i++){
-        CNLiveMineButtonModel *buttonModel = self.model.buttons[i];
-        NSInteger row = i % 4;
-        NSInteger col = floorf(i / 4.0);
-        UIButton *btn = [self createButtonWithFrame:CGRectMake(self.model.margin+btnWidth*row, (col*(btnHeight+self.model.margin))+50+self.model.margin, btnWidth, btnHeight) title:buttonModel.title image:buttonModel.image tag:10000+i];
-        [self addSubview:btn];
-        
-    }
 }
 - (void)awakeFromNib {
@@ -261,20 +184,20 @@
 }
 #pragma mark - 响应方法
-- (void)btnDidClicked:(UIButton *)btn{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(cell:clickedButtonWithType:tag:)]) {
-        [self.delegate cell:self clickedButtonWithType:self.model.type tag:btn.tag];
+- (void)allDidClicked:(UIButton *)btn{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(cell:didSelectItemAtItem:)]) {
+        [self.delegate cell:self didSelectItemAtItem:0];
     }
 }
-- (void)allDidClicked:(UIButton *)btn{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(cell:clickedButtonWithType:tag:)]) {
-        [self.delegate cell:self clickedButtonWithType:CNLiveMineCellTypeOrder tag:10000];
+#pragma mark - 懒加载
+- (NSMutableArray *)buttons {
+    if (!_buttons) {
+        _buttons = [NSMutableArray array];
     }
-    
+    return _buttons;
 }
-#pragma mark - 懒加载
 - (UIView *)bgView{
     if (!_bgView) {
         _bgView = [[UIView alloc] init];
@@ -284,10 +207,11 @@
     }
     return _bgView;
 }
+
 - (UIButton *)titleButton{
     if (!_titleButton) {
         _titleButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        _titleButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
+        _titleButton.titleLabel.font = UIFontBoldCNMake(15.0);
         [_titleButton setTitleColor:[UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0] forState:UIControlStateNormal];
         _titleButton.adjustsImageWhenHighlighted = NO;
     }
@@ -302,7 +226,7 @@
         UIImage *xw_image = [self getImageWithImageName:@"mine_all_front" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
         [_allButton setImage:xw_image forState:UIControlStateNormal];
         [_allButton setImage:xw_image forState:UIControlStateHighlighted];
-        _allButton.titleLabel.font = [UIFont systemFontOfSize:12];
+        _allButton.titleLabel.font = UIFontCNMake(12.0);
         [_allButton setTitleColor:[UIColor colorWithRed:190.0/255.0 green:190.0/255.0 blue:190.0/255.0 alpha:1.0] forState:UIControlStateNormal];
         _allButton.adjustsImageWhenHighlighted = NO;
         [_allButton addTarget:self action:@selector(allDidClicked:) forControlEvents:UIControlEventTouchUpInside];
@@ -322,25 +246,69 @@
     return _line;
 }
-#pragma mark - 私有方法
-- (UIButton *)createButtonWithFrame:(CGRect)frame title:(NSString *)title image:(NSString *)image tag:(NSInteger)tag{
-    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
-    btn.tag = tag;
-    btn.frame = frame;
-    btn.titleLabel.font = [UIFont systemFontOfSize:13];
-    btn.titleLabel.textAlignment = NSTextAlignmentCenter;
-    btn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;//使图片和文字水平居中显示
-    
-    [btn setTitle:title forState:UIControlStateNormal];
-    [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-    UIImage *xw_image = [self getImageWithImageName:image bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
-    [btn setImage:xw_image forState:UIControlStateNormal];
-    btn.adjustsImageWhenHighlighted = NO;
-    [btn addTarget:self action:@selector(btnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
-    btn.titleEdgeInsets = UIEdgeInsetsMake(btn.imageView.frame.size.height+self.model.margin, -btn.imageView.frame.size.width, 0, 0);
-    btn.imageEdgeInsets = UIEdgeInsetsMake(-btn.titleLabel.bounds.size.height, 0, self.model.margin, -btn.titleLabel.bounds.size.width);
-    return btn;
-    
+- (UICollectionView *)collectionView{
+    if(!_collectionView){
+        UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc] init];
+        //设置CollectionView的属性
+        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-2*self.model.margin, self.model.height-(50+self.model.margin)) collectionViewLayout:flowLayout];
+        _collectionView.delegate = self;
+        _collectionView.dataSource = self;
+        _collectionView.scrollEnabled = NO;
+        _collectionView.backgroundColor = [UIColor clearColor];
+        _collectionView.showsVerticalScrollIndicator = NO;
+        _collectionView.showsHorizontalScrollIndicator = NO;
+        [_collectionView registerClass:[CNLiveMineButtonCell class] forCellWithReuseIdentifier:kCNLiveMineButtonCell];
+    }
+    return _collectionView;
+}
+
+#pragma mark - 代理
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
+    switch (self.model.type) {
+        case CNLiveMineCellTypeOrder:
+        {
+            return CGSizeMake((SCREEN_WIDTH-4*self.model.margin-4*self.model.margin)/5.0, self.model.itemHeight);
+        }
+            break;
+
+        case CNLiveMineCellTypeTool:
+        {
+            return CGSizeMake((SCREEN_WIDTH-4*self.model.margin-3*self.model.margin)/4.0, self.model.itemHeight);
+        }
+            break;
+
+        case CNLiveMineCellTypeGoods:
+        {
+            return CGSizeMake(SCREEN_WIDTH-4*self.model.margin, self.model.itemHeight);
+        }
+            break;
+
+        case CNLiveMineCellTypeSports:
+        {
+            return CGSizeMake((SCREEN_WIDTH-4*self.model.margin-3*self.model.margin)/4.0, self.model.itemHeight);
+        }
+            break;
+    }
+}
+
+- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section {
+    return UIEdgeInsetsMake(self.model.margin, 0, self.model.margin, 0);
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    return self.model.buttons.count;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    CNLiveMineButtonCell *cell = (CNLiveMineButtonCell *)[collectionView dequeueReusableCellWithReuseIdentifier:kCNLiveMineButtonCell forIndexPath:indexPath];
+    cell.model = self.model.buttons[indexPath.row];
+    return cell;
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(cell:didSelectItemAtItem:)]) {
+        [self.delegate cell:self didSelectItemAtItem:indexPath.item];
+    }
 }
 @end
@@ -287,23 +287,19 @@ static const NSInteger margin = 20;
 - (void)headerTapDidClicked:(UITapGestureRecognizer *)tap{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
         [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeUerInfo];
-             
     }
-    
 }
+
 - (void)nameTapDidClicked:(UITapGestureRecognizer *)tap{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
         [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeCode];
-             
     }
-    
 }
 - (void)setInteractionEnabled:(BOOL)interactionEnabled{
     _interactionEnabled = interactionEnabled;
     _sign.userInteractionEnabled = interactionEnabled;
     _witness.userInteractionEnabled = interactionEnabled;
-
 }
 - (void)signDidClicked:(UIButton *)btn{