适配大字体

yanglingyu
1 parent 18922fb0
Showing 20 changed files with 94 additions and 73 deletions
CNLiveCServiceModule.podspec
CNLiveCServiceModule/Classes/Manager/CNLiveCServicePCH.h
CNLiveCServiceModule/Classes/View/CNLIveCategoryCell.m
CNLiveCServiceModule/Classes/View/CNLiveAlertTipView.m
CNLiveCServiceModule/Classes/View/CNLiveChineServiceCell.m
CNLiveCServiceModule/Classes/View/CNLiveGoodsOrVideoHeaderView.m
CNLiveCServiceModule/Classes/View/CNLiveMainSearch.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHeaderView.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHistoryCell.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHotsCell.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHotsFooterView.h
CNLiveCServiceModule/Classes/View/CNLiveSearchHotsFooterView.m
CNLiveCServiceModule/Classes/View/CNLiveSearchListCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceChinasCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceLookCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceOrLookCell.m
CNLiveCServiceModule/Classes/View/CNLiveVideoRecommendCell.m
CNLiveCServiceModule/Classes/ViewController/CNLiveServiceSearchVC.m
CNLiveCServiceModule/Classes/ViewController/CNLiveServiceVC.m
Example/CNLiveCServiceModule.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCServiceModule'
-  s.version          = '0.0.19'
+  s.version          = '0.0.20'
   s.summary          = '我的服务内容'
 # This description is used to generate tags and improve search results.
@@ -53,5 +53,6 @@ TODO: Add long description of the pod here.
   s.dependency 'CNLiveUserManagement'
   s.dependency 'CNLiveEnvironment'
   s.dependency 'CNLiveCustomControl'
+  s.dependency 'CNLiveCustomUI'
 end
@@ -24,5 +24,6 @@
 #import <QMUIKit/QMUIKit.h>
 #import "CNLiveCServiceManagerBridge.h"
 #import <YYCategories/YYCategories.h>
+#import <CNLiveCustomUI/CNLiveRefreshHeader.h>
 #endif /* CNLiveCServicePCH_h */
@@ -58,7 +58,9 @@
     _model = model;
     [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
     self.titleLabel.text = model.title;
+    _titleLabel.font = UIFontCNMake(15);
     self.subTitle.text = model.desc;
+    _subTitle.font = UIFontCNMake(12);
 }
 - (UIImageView *)logoView{
     if (!_logoView) {
@@ -73,7 +75,7 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.font = UIFontMake(15);
+        _titleLabel.font = UIFontCNMake(15);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#666666");
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -85,7 +87,7 @@
     if (!_subTitle) {
         _subTitle = [[UILabel alloc] init];
         _subTitle.textColor = CNLiveColorWithHexString(@"#A9A9A9");
-        _subTitle.font = UIFontMake(12);
+        _subTitle.font = UIFontCNMake(12);
     }
     return _subTitle;
 }
@@ -50,8 +50,6 @@
     }];
     [tipView.notShowBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.equalTo(tipView.cancelBtn.mas_top).offset(-10);
-        make.width.offset(125);
-        make.height.offset(20);
         make.left.equalTo(tipView).offset(15);
     }];
@@ -99,7 +97,7 @@
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textAlignment = NSTextAlignmentCenter;
         _titleLabel.textColor = CNLiveColorWithHexString(@"#333333");
-        _titleLabel.font = UIFontMake(17);
+        _titleLabel.font = UIFontCNMake(17);
     }
     return _titleLabel;
 }
@@ -108,7 +106,7 @@
     if (!_messageLabel) {
         _messageLabel = [[UITextView alloc] init];
         _messageLabel.textColor = CNLiveColorWithHexString(@"#333333");
-        _messageLabel.font = UIFontMake(13);
+        _messageLabel.font = UIFontCNMake(13);
         _messageLabel.editable = NO;
     }
     return _messageLabel;
@@ -120,7 +118,7 @@
         _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_cancelBtn setTitleColor:CNLiveColorWithHexString(@"#999999") forState:UIControlStateNormal];
         _cancelBtn.layer.cornerRadius = 21;
-        _cancelBtn.titleLabel.font = UIFontMake(16);
+        _cancelBtn.titleLabel.font = UIFontCNMake(16);
         _cancelBtn.backgroundColor = CNLiveColorWithHexString(@"#EEEEEE");
     }
     return _cancelBtn;
@@ -131,7 +129,7 @@
         _sureBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_sureBtn setTitleColor:kWhiteColor forState:UIControlStateNormal];
         _sureBtn.layer.cornerRadius = 21;
-        _sureBtn.titleLabel.font = UIFontMake(16);
+        _sureBtn.titleLabel.font = UIFontCNMake(16);
         [_sureBtn setBackgroundImage:[UIImage gradientVerticalImageWithColors:@[CNLiveColorWithHexString(@"#FFAA4A"),CNLiveColorWithHexString(@"#EC5645")] rect:CGRectMake(0, 0, 120, 39)] forState:UIControlStateNormal];
         _sureBtn.clipsToBounds = YES;
     }
@@ -149,8 +147,9 @@
         [_notShowBtn setTitleColor:CNLiveColorWithHexString(@"#F5A623") forState:UIControlStateNormal];
         [_notShowBtn setTitle:@"我已阅读并同意" forState:UIControlStateSelected];
         [_notShowBtn setTitleColor:CNLiveColorWithHexString(@"#F5A623") forState:UIControlStateSelected];
-        _notShowBtn.titleLabel.font = UIFontMake(14);
+        _notShowBtn.titleLabel.font = UIFontCNMake(14);
         [_notShowBtn addTarget:self action:@selector(notShowBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+        [_notShowBtn sizeToFit];
     }
     return _notShowBtn;
 }
@@ -40,7 +40,7 @@
     [self.subTitle mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.titleLabel);
         make.top.equalTo(self.logoView.mas_centerY).offset(2);
-        make.right.equalTo(self.contentView).offset(-17);
+        make.right.equalTo(self.contentView);
     }];
 }
@@ -50,7 +50,9 @@
     _model = model;
     [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
     self.titleLabel.text = model.title;
+    _titleLabel.font = UIFontCNMake(13);
     self.subTitle.text = model.desc;
+    _subTitle.font = UIFontCNMake(10);
 }
 - (UIImageView *)logoView{
     if (!_logoView) {
@@ -65,8 +67,7 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
-        _titleLabel.font = UIFontMake(13);
+        _titleLabel.font = UIFontCNMake(11);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#4A4A4A");
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -78,7 +79,7 @@
     if (!_subTitle) {
         _subTitle = [[UILabel alloc] init];
         _subTitle.textColor = CNLiveColorWithHexString(@"#A9A9A9");
-        _subTitle.font = UIFontMake(10);
+        _subTitle.font = UIFontCNMake(10);
     }
     return _subTitle;
 }
@@ -58,6 +58,9 @@
 #pragma mark - Setting&&Getting
 - (void)setPageModel:(CNliveServicePageModel *)pageModel
 {
+    _titlelabel.font = UIFontBoldCNMake(17);
+    _subTitle.font = UIFontCNMake(12);
+    _moreBtn.titleLabel.font = UIFontCNMake(12);
     _pageModel = pageModel;
     self.titlelabel.text = pageModel.blockName;
     [self.titlelabel sizeToFit];
@@ -105,7 +108,7 @@
 {
     if (!_titlelabel) {
         _titlelabel = [[UILabel alloc] init];
-        _titlelabel.font = UIFontBoldMake(17);
+        _titlelabel.font = UIFontBoldCNMake(17);
         _titlelabel.textColor = CNLiveColorWithHexString(@"#999999");
     }
     return _titlelabel;
@@ -114,7 +117,7 @@
 {
     if (!_subTitle) {
         _subTitle = [[UILabel alloc] init];
-        _subTitle.font = UIFontMake(12);
+        _subTitle.font = UIFontCNMake(12);
         _subTitle.textColor = CNLiveColorWithHexString(@"#333333");
     }
     return _subTitle;
@@ -126,7 +129,7 @@
         [_moreBtn setImage:[UIImage loadCServiceBundle:@"object_more"] forState:UIControlStateNormal];
         [_moreBtn setTitle:@"更多" forState:UIControlStateNormal];
         [_moreBtn setTitleColor:CNLiveColorWithHexString(@"#999695") forState:UIControlStateNormal];
-        _moreBtn.titleLabel.font = UIFontMake(12);
+        _moreBtn.titleLabel.font = UIFontCNMake(12);
         _moreBtn.imagePosition = QMUIButtonImagePositionRight;
         [_moreBtn addTarget:self action:@selector(moreButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -107,7 +107,7 @@
         _searchField.returnKeyType = UIReturnKeySearch;
         _searchField.clearButtonMode = UITextFieldViewModeAlways;
         _searchField.textColor = CNLiveColorWithHexString(@"#333333");
-        _searchField.font = UIFontMake(14);
+        _searchField.font = UIFontCNMake(14);
     }
     return _searchField;
 }
@@ -56,8 +56,8 @@
         self.lineView.hidden = NO;
         self.backgroundColor = [UIColor colorWithPatternImage:[UIImage gradientVerticalImageWithColors:@[CNLiveColorWithHexString(@"#FEF2E0"),kWhiteColor] rect:self.bounds]];
         NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@/正在使用",model.title]];
-        [string addAttribute:NSFontAttributeName value:UIFontMake(12) range:NSMakeRange(0, string.length)];
-        [string addAttribute:NSFontAttributeName value:UIFontBoldMake(17) range:NSMakeRange(0, model.title.length)];
+        [string addAttribute:NSFontAttributeName value:UIFontCNMake(12) range:NSMakeRange(0, string.length)];
+        [string addAttribute:NSFontAttributeName value:UIFontBoldCNMake(17) range:NSMakeRange(0, model.title.length)];
         [string addAttribute:NSStrokeColorAttributeName value:CNLiveColorWithHexString(@"#999999") range:NSMakeRange(0, string.length)];
         [string addAttribute:NSStrokeColorAttributeName value:CNLiveColorWithHexString(@"#4A4A4A") range:NSMakeRange(0, model.title.length)];
         self.titlelabel.attributedText = string;
@@ -34,13 +34,14 @@
 #pragma mark - Setting&&Getting
 - (void)setModel:(CNLiveHistoryModel *)model
 {
+    _history.font = UIFontCNMake(12);
     self.history.text = model.title;
 }
 - (UILabel *)history
 {
     if (!_history) {
         _history = [[UILabel alloc] init];
-        _history.font = UIFontMake(12);
+        _history.font = UIFontCNMake(11);
         _history.textColor = CNLiveColorWithHexString(@"#4A4A4A");
         _history.textAlignment = NSTextAlignmentCenter;
     }
@@ -38,6 +38,7 @@
 #pragma mark - Setting&&Getting
 - (void)setModel:(CNLiveSearchModel *)model
 {
+    _titleLabel.font = UIFontCNMake(11);
     _model = model;
     [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
     self.titleLabel.text = model.title;
@@ -57,7 +58,7 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
-        _titleLabel.font = UIFontMake(13);
+        _titleLabel.font = UIFontCNMake(11);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#4A4A4A");
         _titleLabel.textAlignment = NSTextAlignmentCenter;
     }
@@ -10,7 +10,6 @@
 NS_ASSUME_NONNULL_BEGIN
 typedef void(^ClearBlock)(void);
 @interface CNLiveSearchHotsFooterView : UICollectionReusableView
-
 @property (nonatomic, copy) ClearBlock clearBlock;
 @end
@@ -55,7 +55,7 @@
         _clearBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_clearBtn setTitle:@"清空记录" forState:UIControlStateNormal];
         [_clearBtn setTitleColor:CNLiveColorWithHexString(@"#00CD1E") forState:UIControlStateNormal];
-        _clearBtn.titleLabel.font = UIFontMake(13);
+        _clearBtn.titleLabel.font = UIFontCNMake(13);
         [_clearBtn sizeToFit];
         [_clearBtn addTarget:self action:@selector(clearAction) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -67,7 +67,7 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.font = UIFontMake(14);
+        _titleLabel.font = UIFontCNMake(14);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#333333");
     }
     return _titleLabel;
@@ -44,6 +44,7 @@
     _model = model;
     if (model.subTitle && ![model.subTitle isEqualToString:@""]) {
         self.subTitle.hidden = NO;
+        _subTitle.font = UIFontCNMake(14);
         self.subTitle.text = [NSString stringWithFormat:@"  %@",model.subTitle];;
         [self.cycleView mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.subTitle.mas_bottom).offset(-1);
@@ -67,7 +68,7 @@
 {
     if (!_subTitle) {
         _subTitle = [[UILabel alloc] init];
-        _subTitle.font = UIFontMake(14);
+        _subTitle.font = UIFontCNMake(14);
         _subTitle.textColor = UIColorHex(#333333);
         _subTitle.backgroundColor = UIColorHex(#F9FAFB);
     }
@@ -79,6 +79,8 @@
 #pragma mark - Setting&&Getting
 - (void)setModel:(CNliveServicePageModel *)model
 {
+    _titleLabel.font = UIFontBoldCNMake(17);
+    _subTitlelabel.font = UIFontCNMake(12);
     _model = model;
     [self.backImage sd_setImageWithURL:[NSURL URLWithString:model.background]];
     NSArray *dataArr = [self sqereList:model.contents];
@@ -101,7 +103,7 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.font = UIFontBoldMake(17);
+        _titleLabel.font = UIFontBoldCNMake(17);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#1F74E9");
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -111,7 +113,7 @@
 {
     if (!_subTitlelabel) {
         _subTitlelabel = [[UILabel alloc] init];
-        _subTitlelabel.font = UIFontMake(12);
+        _subTitlelabel.font = UIFontCNMake(12);
         _subTitlelabel.textColor = CNLiveColorWithHexString(@"#1F74E9");
         _subTitlelabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -9,7 +9,6 @@
 @interface CNLiveServiceOrLookCell()
 @property (nonatomic, strong) UIImageView *logoImage;
 @property (nonatomic, strong) UILabel *titleLabel;
-@property (nonatomic, strong) UILabel *describe;
 @property (nonatomic, strong) QMUIButton *rightBtn;
 @end
@@ -19,7 +18,6 @@
     if (self) {
         [self.contentView addSubview:self.logoImage];
         [self.contentView addSubview:self.titleLabel];
-        [self.contentView addSubview:self.describe];
         [self.contentView addSubview:self.rightBtn];
         [self makeSubViewsLayout];
     }
@@ -40,28 +38,31 @@
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.logoImage.mas_right).offset(10);
         make.centerY.equalTo(self.logoImage);
-    }];
-    [self.describe mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.titleLabel.mas_right).offset(7);
-        make.centerY.equalTo(self.logoImage);
-        make.right.equalTo(self.rightBtn.mas_left).offset(-5);
+        make.right.equalTo(self.rightBtn.mas_left).offset(-10);
     }];
 }
 #pragma mark - Setting&&getting
 - (void)setModel:(CnLivePageContentModel *)model
 {
+    _titleLabel.font = UIFontCNMake(10);
     _model = model;
     [self.logoImage sd_setImageWithURL:[NSURL URLWithString:model.poster]];
-    self.titleLabel.text = model.title;
+    NSMutableAttributedString *string = nil;
+    if (model.subTitle && [model.subTitle isKindOfClass:[NSString class]]) {
+        string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@  %@",model.title,model.subTitle]];
+    }else{
+        string = [[NSMutableAttributedString alloc] initWithString:model.title];
+    }
+    
+    [string addAttribute:NSFontAttributeName value:UIFontCNMake(13) range:NSMakeRange(0, model.title.length)];
+    [string addAttribute:NSForegroundColorAttributeName value:CNLiveColorWithHexString(@"#333333") range:NSMakeRange(0, model.title.length)];
+    self.titleLabel.attributedText =string;
     [self.titleLabel sizeToFit];
-    self.describe.text = model.subTitle;
-    [self.describe sizeToFit];
 }
 - (void)setType:(CNLiveCellShowType)type
 {
     _type = type;
     if (type == CNLiveCellShowTypeService) {
-        self.describe.hidden = YES;
         [self.rightBtn setImage:[UIImage loadCServiceBundle:@"service_right"] forState:UIControlStateNormal];
         [self.rightBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.right.equalTo(self.contentView).offset(-10);
@@ -70,7 +71,6 @@
             make.height.offset(18);
         }];
     }else{
-        self.describe.hidden = NO;
         self.rightBtn.layer.cornerRadius = 9;
         [self.rightBtn setTitle:@"进入 " forState:UIControlStateNormal];
         [self.rightBtn setImage:[UIImage loadCServiceBundle:@"service_enter"] forState:UIControlStateNormal];
@@ -95,30 +95,18 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
-        _titleLabel.font = UIFontMake(13);
-        _titleLabel.textColor = CNLiveColorWithHexString(@"#333333");
+        _titleLabel.font = UIFontCNMake(10);
+        _titleLabel.textColor = CNLiveColorWithHexString(@"#A9A9A9");
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
     return _titleLabel;
 }
-- (UILabel *)describe
-{
-    if (!_describe) {
-        _describe = [[UILabel alloc] init];
-        _describe.lineBreakMode = NSLineBreakByTruncatingMiddle;
-        _describe.font = UIFontMake(10);
-        _describe.textColor = CNLiveColorWithHexString(@"#A9A9A9");
-        _describe.textAlignment = NSTextAlignmentLeft;
-    }
-    return _describe;
-}
 - (QMUIButton *)rightBtn
 {
     if (!_rightBtn) {
         _rightBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
         _rightBtn.userInteractionEnabled = NO;
-        _rightBtn.titleLabel.font = UIFontMake(10);
+        _rightBtn.titleLabel.font = UIFontCNMake(10);
         _rightBtn.imagePosition = QMUIButtonImagePositionRight;
         [_rightBtn setTitleColor:kWhiteColor forState:UIControlStateNormal];
     }
@@ -57,6 +57,10 @@
 #pragma mark - Setting&&getting
 - (void)setModel:(CnLivePageContentModel *)model
 {
+    _titleLabel.font = UIFontCNMake(11);
+    _price.font = UIFontCNMake(11);
+    _oldPrice.font = UIFontCNMake(9);
+    _lookNum.titleLabel.font = UIFontCNMake(11);
     [_logoImage sd_setImageWithURL:[NSURL URLWithString:model.poster]];
     if (_type == CNLiveCellShowTypeHot) {
         self.titleLabel.hidden = YES;
@@ -108,8 +112,8 @@
             NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:[model.desc dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:&error];
             NSString *nowStr = dic[@"price"];
             NSMutableAttributedString *price = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"¥ %@",nowStr]];
-            [price addAttribute:NSFontAttributeName value:UIFontMake(15) range:NSMakeRange(0, price.length)];
-            [price addAttribute:NSFontAttributeName value:UIFontMake(10) range:NSMakeRange(0, 1)];
+            [price addAttribute:NSFontAttributeName value:UIFontCNMake(15) range:NSMakeRange(0, price.length)];
+            [price addAttribute:NSFontAttributeName value:UIFontCNMake(10) range:NSMakeRange(0, 1)];
             self.price.attributedText = price;
             [self.price sizeToFit];
             NSString *oldStr = dic[@"prices"];
@@ -156,7 +160,7 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.font = UIFontMake(13);
+        _titleLabel.font = UIFontCNMake(11);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#333333");
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -166,8 +170,7 @@
 {
     if (!_price) {
         _price = [[UILabel alloc] init];
-        _price.lineBreakMode = NSLineBreakByTruncatingMiddle;
-        _price.font = UIFontMake(12);
+        _price.font = UIFontCNMake(12);
         _price.textColor = CNLiveColorWithHexString(@"#FC1541");
         _price.textAlignment = NSTextAlignmentLeft;
     }
@@ -177,8 +180,7 @@
 {
     if (!_oldPrice) {
         _oldPrice = [[UILabel alloc] init];
-        _oldPrice.lineBreakMode = NSLineBreakByTruncatingMiddle;
-        _oldPrice.font = UIFontMake(9);
+        _oldPrice.font = UIFontCNMake(9);
         _oldPrice.textColor = CNLiveColorWithHexString(@"#B4B4B4");
         _oldPrice.textAlignment = NSTextAlignmentLeft;
     }
@@ -191,7 +193,7 @@
         _lookNum = [UIButton buttonWithType:UIButtonTypeCustom];
         [_lookNum setImage:[UIImage loadCServiceBundle:@"listen"] forState:UIControlStateNormal];
         [_lookNum setTitleColor:CNLiveColorWithHexString(@"#9F9F9F") forState:UIControlStateNormal];
-        _lookNum.titleLabel.font = UIFontMake(11);
+        _lookNum.titleLabel.font = UIFontCNMake(11);
     }
     return _lookNum;
 }
@@ -317,7 +317,7 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
         _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
         [_cancelBtn setTitleColor:CNLiveColorWithHexString(@"#00CD1E") forState:UIControlStateNormal];
-        _cancelBtn.titleLabel.font = UIFontMake(14);
+        _cancelBtn.titleLabel.font = UIFontCNMake(14);
         _cancelBtn.backgroundColor = kClearColor;
         [_cancelBtn sizeToFit];
         [ _cancelBtn addTarget:self action:@selector(cancelBtnClick) forControlEvents:UIControlEventTouchUpInside];
@@ -43,6 +43,7 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
 - (void)requestService{
     self.isError = NO;
     if (![CNLiveNetworking isNetworking]) {
+        [_listCollectionView.mj_header endRefreshing];
         if (self.dataSource.count>0 && self.pageListSource.count>0) {
             return;
         }
@@ -61,11 +62,7 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
         self.hots = hots;
         dispatch_group_leave(requestGroup);
     } error:^{
-        
         strongself
-        if (self.dataSource.count>0 && self.pageListSource.count>0) {
-            return;
-        }
         self.isError = YES;
         dispatch_group_leave(requestGroup);
     }];
@@ -74,21 +71,21 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
         weakSelf.pageListSource = dataArray;
         dispatch_group_leave(requestGroup);
     } error:^{
-        
         strongself
-        if (self.dataSource.count>0 && self.pageListSource.count>0) {
-            return;
-        }
         self.isError = YES;
         dispatch_group_leave(requestGroup);
     }];
     dispatch_group_notify(requestGroup, dispatch_get_main_queue(), ^{
         strongself
+        [self.listCollectionView.mj_header endRefreshing];
         if (!self.isError) {
             if (self.dataSource.count>0||self.pageListSource.count>0) {
                 [self.listCollectionView reloadData];
             }
         }else{
+            if (self.dataSource.count>0||self.pageListSource.count>0) {
+                return;
+            }
             [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_failure"] text:@"加载失败，请点击重试" detailText:nil buttonTitle:@"     重试     " buttonAction:@selector(requestService)];
             self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
             [self setCNAPIErrorEmptyView];
@@ -102,6 +99,7 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
+    [self requestService];
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.topBackView];
     [self.view sendSubviewToBack:self.topBackView];
@@ -113,7 +111,6 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
 {
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = YES;
-    [self requestService];
 }
 - (void)viewWillDisappear:(BOOL)animated
@@ -273,6 +270,9 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
         [_listCollectionView registerClass:[CNLiveRecommendCell class] forCellWithReuseIdentifier:CNRecommendCellID];
         [_listCollectionView registerClass:[CNLiveSearchHeaderView class] forSupplementaryViewOfKind:@"UICollectionElementKindSectionHeader" withReuseIdentifier:CNServiceheaderID];
         [_listCollectionView registerClass:[CNLiveGoodsOrVideoHeaderView class] forSupplementaryViewOfKind:@"UICollectionElementKindSectionHeader" withReuseIdentifier:CNGoodsOrVideoheaderID];
+        _listCollectionView.mj_header = [CNLiveRefreshHeader headerWithRefreshingBlock:^{
+            [self requestService];
+        }];
     }
     return _listCollectionView;
 }
@@ -345,10 +345,12 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCServiceModule/CNLiveCServiceModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
@@ -359,7 +361,15 @@
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
+				"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
 				"${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
+				"${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
+				"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
+				"${BUILT_PRODUCTS_DIR}/YYKeyboardManager/YYKeyboardManager.framework",
+				"${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
+				"${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
+				"${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -367,10 +377,12 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCServiceModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
@@ -381,7 +393,15 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;