修复云测bug

yanglingyu
1 parent 37481026
Showing 28 changed files with 120 additions and 131 deletions
CNLiveCServiceModule.podspec
CNLiveCServiceModule/Classes/Category/UIImage+CNBundleOrGredient.h
CNLiveCServiceModule/Classes/Category/UIImage+CNBundleOrGredient.m
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
CNLiveCServiceModule/Classes/View/CNLIveCategoryCell.m
CNLiveCServiceModule/Classes/View/CNLiveAlertTipView.m
CNLiveCServiceModule/Classes/View/CNLiveChineServiceCell.m
CNLiveCServiceModule/Classes/View/CNLiveCycleActiveCell.m
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
CNLiveCServiceModule/Classes/View/CNLiveCycleView.m
CNLiveCServiceModule/Classes/View/CNLiveGoodsOrVideoHeaderView.m
CNLiveCServiceModule/Classes/View/CNLiveHotSaleCell.h
CNLiveCServiceModule/Classes/View/CNLiveHotSaleCell.m
CNLiveCServiceModule/Classes/View/CNLiveRecommendCell.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHeaderView.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHistoryCell.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHotsCell.m
CNLiveCServiceModule/Classes/View/CNLiveSearchHotsFooterView.m
CNLiveCServiceModule/Classes/View/CNLiveSearchListCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceChinasCell.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCServiceModule'
-  s.version          = '0.0.4'
+  s.version          = '0.0.5'
   s.summary          = '我的服务内容'
 # This description is used to generate tags and improve search results.
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface UIImage (CNBundleOrGredient)
 // 创建一张渐变色图片
-+ (UIImage *)gradientImageWithColors:(NSArray *)colors rect:(CGRect)rect;
++ (UIImage *)gradientVerticalImageWithColors:(NSArray *)colors rect:(CGRect)rect;
 +(UIImage *)loadCServiceBundle:(NSString *)imageName;
 @end
@@ -17,7 +17,7 @@
     return image;
 }
 // 创建一张渐变色图片
-+ (UIImage *)gradientImageWithColors:(NSArray *)colors rect:(CGRect)rect{
++ (UIImage *)gradientVerticalImageWithColors:(NSArray *)colors rect:(CGRect)rect{
     if (!colors.count || CGRectEqualToRect(rect, CGRectZero)) {
         return nil;
     }
@@ -42,7 +42,7 @@ static const CGFloat margin = 15;
                 }
             }
         }else{
-            [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:3];
+            [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:2];
             !failure?:failure();
         }
     }];
@@ -174,7 +174,7 @@ static const CGFloat margin = 15;
         model = [CNLiveSearchModel mj_objectWithKeyValues:dic];
         }
         [categories addObject:model];
-        if (num != 0 && (i != 0 ||  array.count == 1) &&(i%(num-1) == 0 || i == array.count - 1)) {
+        if (num != 0 && (i != 0 ||  array.count == 1) &&((i + 1)%num == 0 || i == array.count - 1)) {
             NSDictionary *category = @{
                 @"title":title,
                 @"lists":categories.copy,
@@ -323,7 +323,8 @@ static const CGFloat margin = 15;
 + (void)loadAllServiceWithServiceId:(NSString *)serviceId page:(nonnull NSString *)page result:(nonnull void (^)(NSArray * _Nonnull, BOOL))succeed error:(void (^)(void))failure
 {
     NSDictionary * params = @{@"sid": CNUserShareModelUid ? CNUserShareModelUid : @"",
-                              @"categoryId":serviceId?serviceId:@""
+                              @"categoryId":serviceId?serviceId:@"",
+                              @"page":page?page:@""
     };
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
@@ -23,12 +23,12 @@
         [self.contentView addSubview:self.titleLabel];
         [self.contentView addSubview:self.subTitle];
         [self.contentView addSubview:self.rightImage];
+        [self makeSubViewsLayout];
     }
     return self;
 }
--(void)layoutSubviews
+-(void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView).offset(15);
         make.centerY.equalTo(self.contentView);
@@ -59,7 +59,6 @@
     [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
     self.titleLabel.text = model.title;
     self.subTitle.text = model.desc;
-    [self layoutSubviews];
 }
 - (UIImageView *)logoView{
     if (!_logoView) {
@@ -123,7 +123,7 @@
         [_sureBtn setTitleColor:kWhiteColor forState:UIControlStateNormal];
         _sureBtn.layer.cornerRadius = 21;
         _sureBtn.titleLabel.font = UIFontMake(16);
-        _sureBtn.backgroundColor = [UIColor colorWithPatternImage:[UIImage gradientImageWithColors:@[CNLiveColorWithHexString(@"#FFAA4A"),CNLiveColorWithHexString(@"#EC5645")] rect:CGRectMake(0, 0, 120, 39)]];
+        _sureBtn.backgroundColor = [UIColor colorWithPatternImage:[UIImage gradientVerticalImageWithColors:@[CNLiveColorWithHexString(@"#FFAA4A"),CNLiveColorWithHexString(@"#EC5645")] rect:CGRectMake(0, 0, 120, 39)]];
     }
     return _sureBtn;
 }
@@ -21,12 +21,12 @@
         [self.contentView addSubview:self.logoView];
         [self.contentView addSubview:self.titleLabel];
         [self.contentView addSubview:self.subTitle];
+        [self makeSubViewsLayout];
     }
     return self;
 }
--(void)layoutSubviews
+-(void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView).offset(15);
         make.centerY.equalTo(self.contentView);
@@ -51,7 +51,6 @@
     [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
     self.titleLabel.text = model.title;
     self.subTitle.text = model.desc;
-    [self layoutSubviews];
 }
 - (UIImageView *)logoView{
     if (!_logoView) {
@@ -19,10 +19,11 @@
     if (self) {
         [self.contentView addSubview:self.cycleView];
         self.collectionView.layer.cornerRadius = 9;
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+-(void)makeSubViewsLayout
 {
     [super layoutSubviews];
     [self.cycleView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -60,6 +61,7 @@
         _cycleView.infiniteLoop = YES;
         _cycleView.pageControlStyle = SDCycleScrollViewPageContolStyleAnimated;
         _cycleView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
+        _cycleView.contentMode = UIViewContentModeScaleAspectFit;
         _cycleView.hidesForSinglePage = YES;
         _cycleView.pageControlDotSize = CGSizeMake(4, 4);
     }
@@ -28,10 +28,11 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
     self = [super initWithFrame:frame];
     if (self) {
         [self.contentView addSubview:self.listCollectionView];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+-(void)makeSubViewsLayout
 {
     [super layoutSubviews];
     [self.listCollectionView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -20,17 +20,13 @@ static NSString *CNCycleCellID   =  @&quot;CNCycleCellID&quot;;
     if (self) {
         self.backgroundColor = kClearColor;
         self.collectionView.dataSource = self;
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+-(void)makeSubViewsLayout
 {
-    [super layoutSubviews];
-    if ([_model.title isEqualToString:@""]) {
-        return;
-    }
-    
     self.collectionView.frame = CGRectMake(0, 0, self.width, self.height - 20);
 }
 #pragma mark - UICollectionViewDataSource
@@ -24,12 +24,12 @@
         [self addSubview:self.titlelabel];
         [self addSubview:self.subTitle];
         [self addSubview:self.moreBtn];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+-(void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.LogoImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self).offset(15);
@@ -37,11 +37,7 @@
         make.width.height.offset(16.5);
     }];
     [self.titlelabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        if (!self.LogoImage.isHidden) {
-            make.left.equalTo(_LogoImage.mas_right).offset(5);
-        }else{
-            make.left.equalTo(self).offset(15);
-        }
+        make.left.equalTo(self).offset(15);
         make.centerY.equalTo(self);
     }];
     [self.subTitle mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -73,8 +69,12 @@
         self.LogoImage.hidden = NO;
         self.subTitle.hidden = NO;
         UIColor *begin = CNLiveColorWithHexString(@"#FFF4F1");
-        self.backgroundColor = [UIColor colorWithPatternImage:[UIImage gradientImageWithColors:@[begin,kWhiteColor] rect:self.bounds]];
+        self.backgroundColor = [UIColor colorWithPatternImage:[UIImage gradientVerticalImageWithColors:@[begin,kWhiteColor] rect:self.bounds]];
         self.titlelabel.textColor = CNLiveColorWithHexString(@"#FA7256");
+        [self.titlelabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self.LogoImage.mas_right).offset(5);
+            make.centerY.equalTo(self);
+        }];
     }else{
         if ([pageModel.blockName isEqualToString:@"精品音频"]) {
             self.moreBtn.hidden = YES;
@@ -85,8 +85,11 @@
         self.subTitle.hidden = YES;
         self.backgroundColor = kWhiteColor;
         _titlelabel.textColor = CNLiveColorWithHexString(@"#333333");
+        [self.titlelabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self).offset(15);
+            make.centerY.equalTo(self);
+        }];
     }
-    [self setNeedsLayout];
 }
 - (UIImageView *)LogoImage
 {
-//
-//  CNLiveHotSaleCell.h
-//  CNLiveCServiceModule
-//
-//  Created by CNLive on 2021/11/27.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNLiveHotSaleCell : UITableViewCell
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNLiveHotSaleCell.m
-//  CNLiveCServiceModule
-//
-//  Created by CNLive on 2021/11/27.
-//
-
-#import "CNLiveHotSaleCell.h"
-
-@implementation CNLiveHotSaleCell
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    // Initialization code
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
-}
-
-@end
@@ -17,12 +17,12 @@ static NSString *CNVideoRecommendCellID =   @&quot;CNLiveVideoRecommendCell&quot;;
     self = [super initWithFrame:frame];
     if (self) {
         [self.contentView addSubview:self.listCollectionView];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.listCollectionView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.equalTo(self);
     }];
@@ -20,13 +20,12 @@
         self.backgroundColor = kWhiteColor;
         [self addSubview:self.lineView];
         [self addSubview:self.titlelabel];
-        
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self);
         make.centerY.equalTo(self);
@@ -55,7 +54,7 @@
     _model = model;
     if (_type == CNServiceHeaderTypeCategoryId) {
         self.lineView.hidden = NO;
-        self.backgroundColor = [UIColor colorWithPatternImage:[UIImage gradientImageWithColors:@[CNLiveColorWithHexString(@"#FEF2E0"),kWhiteColor] rect:self.bounds]];
+        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:UIFontMake(17) range:NSMakeRange(0, model.title.length)];
@@ -67,7 +66,6 @@
         self.titlelabel.text = model.title;
     }
     [self.titlelabel sizeToFit];
-    [self setNeedsLayout];
 }
 - (UIView *)lineView
 {
@@ -18,15 +18,16 @@
     if (self) {
         self.contentView.backgroundColor = CNLiveColorWithHexString(@"#F9F9F9");
         [self.contentView addSubview:self.history];
+        [self makeSubViewsLayout];
     }
     return self;
 }
--(void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.history mas_makeConstraints:^(MASConstraintMaker *make) {
         make.center.equalTo(self.contentView);
+        make.left.right.equalTo(self);
     }];
 }
@@ -34,8 +35,6 @@
 - (void)setModel:(CNLiveHistoryModel *)model
 {
     self.history.text = model.title;
-    [self.history sizeToFit];
-    [self setNeedsLayout];
 }
 - (UILabel *)history
 {
@@ -43,6 +42,7 @@
         _history = [[UILabel alloc] init];
         _history.font = UIFontMake(12);
         _history.textColor = CNLiveColorWithHexString(@"#4A4A4A");
+        _history.textAlignment = NSTextAlignmentCenter;
     }
     return _history;
 }
@@ -18,12 +18,12 @@
     if (self) {
         [self.contentView addSubview:self.logoView];
         [self.contentView addSubview:self.titleLabel];
+        [self makeSubViewsLayout];
     }
     return self;
 }
--(void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.contentView).offset(0);
         make.centerX.equalTo(self.contentView);
@@ -42,7 +42,6 @@
     [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
     self.titleLabel.text = model.title;
     [self.titleLabel sizeToFit];
-    [self layoutSubviews];
 }
 - (UIImageView *)logoView{
     if (!_logoView) {
@@ -20,12 +20,12 @@
         self.backgroundColor = kWhiteColor;
         [self addSubview:self.line];
         [self addSubview:self.clearBtn];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.line mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self);
         make.left.equalTo(self).offset(15);
@@ -23,10 +23,11 @@
         [self.contentView addSubview:self.logoView];
         [self.contentView addSubview:self.titleLabel];
         [self.contentView addSubview:self.line];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+- (void)makeSubViewsLayout
 {
     [self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.equalTo(self.contentView).offset(15);
@@ -56,7 +57,6 @@
     [attrString addAttribute:NSForegroundColorAttributeName value:color range:range];
     self.titleLabel.attributedText = attrString;
     [self.titleLabel sizeToFit];
-    [self setNeedsLayout];
 }
 - (UIImageView *)logoView{
     if (!_logoView) {
@@ -18,12 +18,12 @@
     self = [super initWithFrame:frame];
     if (self) {
         [self.contentView addSubview:self.cycleView];
+        [self makeSubViewsLayout];
     }
     return self;
 }
--(void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.cycleView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.bottom.equalTo(self.contentView);
         make.left.equalTo(self.contentView).offset(15);
@@ -29,13 +29,13 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
         [self.contentView addSubview:self.travelBtn];
         [self.leftImageView addSubview:self.titleLabel];
         [self.leftImageView addSubview:self.listCollectionView];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.leftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.contentView);
         make.left.equalTo(self.contentView).offset(10);
@@ -89,7 +89,7 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
 }
 #pragma mark - UICollectionViewDelegateFlowLayout
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
-    return CGSizeMake(collectionView.width, (collectionView.height -10)/3);
+    return CGSizeMake(collectionView.width, (collectionView.height -20)/3);
 }
 - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
     return UIEdgeInsetsMake(0, 0, 0, 0);
@@ -105,7 +105,6 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
     [self.travelBtn sd_setImageWithURL:[NSURL URLWithString:pageModel1.poster] forState:UIControlStateNormal];
     self.titleLabel.text = model.blockName;
     [_titleLabel sizeToFit];
-    [self setNeedsLayout];
     [self.listCollectionView reloadData];
 }
 - (UIImageView *)leftImageView
@@ -24,13 +24,13 @@
         [self.backImage addSubview:self.titleLabel];
         [self.backImage addSubview:self.subTitlelabel];
         [self.backImage addSubview:self.cycleView];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews
+- (void)makeSubViewsLayout
 {
-    [super layoutSubviews];
     [self.backImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.bottom.equalTo(self.contentView);
         make.left.equalTo(self.contentView).offset(10);
@@ -59,7 +59,7 @@
         NSDictionary *dic = array[i];
         CnLivePageContentModel *model = [CnLivePageContentModel mj_objectWithKeyValues:dic];
         [sqArr addObject:model];
-        if ((i != 0 || array.count == 1) && (i%2 == 0 || i == array.count - 1)) {
+        if ((i != 0 || array.count == 1) && ((i + 1)%3 == 0 || i == array.count - 1)) {
             NSDictionary *category = @{
                 @"title":@"大家都在用",
                 @"lists":sqArr.copy,
@@ -87,7 +87,6 @@
     [self.titleLabel sizeToFit];
     self.subTitlelabel.text = model.blockSubTitle;
     [self.subTitlelabel sizeToFit];
-    [self setNeedsLayout];
 }
 - (UIImageView *)backImage
 {
@@ -21,11 +21,11 @@
         [self.contentView addSubview:self.titleLabel];
         [self.contentView addSubview:self.describe];
         [self.contentView addSubview:self.rightBtn];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews{
-    [super layoutSubviews];
+- (void)makeSubViewsLayout{
     [self.logoImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView).offset(10);
         make.centerY.equalTo(self.contentView);
@@ -56,7 +56,6 @@
     [self.titleLabel sizeToFit];
     self.describe.text = model.subTitle;
     [self.describe sizeToFit];
-    [self setNeedsLayout];
 }
 - (void)setType:(CNLiveCellShowType)type
 {
@@ -25,15 +25,15 @@
         [self.contentView addSubview:self.price];
         [self.contentView addSubview:self.oldPrice];
         [self.contentView addSubview:self.lookNum];
+        [self makeSubViewsLayout];
     }
     return self;
 }
-- (void)layoutSubviews{
-    [super layoutSubviews];
+- (void)makeSubViewsLayout{
     [self.logoImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.contentView);
         make.centerX.equalTo(self.contentView);
-        make.height.width.offset(_type == CNLiveCellShowTypeHot?65:96);
+        make.height.width.offset(65);
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -41,14 +41,8 @@
         make.left.right.equalTo(self.logoImage);
     }];
     [self.price mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(_type == CNLiveCellShowTypeHot?self.logoImage.mas_bottom:self.titleLabel.mas_bottom).offset(5);
-        if (_type == CNLiveCellShowTypeHot) {
-            make.centerX.equalTo(self.contentView);
-        }else{
+        make.top.equalTo(self.titleLabel.mas_bottom).offset(5);
             make.left.equalTo(self.logoImage);
-        }
-        
-        
     }];
     [self.oldPrice mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.price.mas_right).offset(7);
@@ -75,6 +69,13 @@
         NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:[model.desc dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:&error];
         self.price.text = [NSString stringWithFormat:@"¥%@",dic[@"price"]];
         [self.price sizeToFit];
+        [self.logoImage mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.width.offset(65);
+        }];
+        [self.price mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.logoImage.mas_bottom).offset(5);
+            make.centerX.equalTo(self);
+        }];
     }else if (_type == CNLiveCellShowTypeVideo){
         self.titleLabel.hidden = NO;
         self.titleLabel.numberOfLines = 2;
@@ -82,9 +83,12 @@
         self.titleLabel.text = model.title;
         NSString *num = model.spectators;
         if (num.floatValue > 10000) {
-            num = [NSString stringWithFormat:@"%.1f",num.floatValue/10000];
+            num = [NSString stringWithFormat:@"%.1f万",num.floatValue/10000];
         }
         [self.lookNum setTitle:[NSString stringWithFormat:@"%@浏览",num] forState:UIControlStateNormal];
+        [self.logoImage mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.width.offset(96);
+        }];
     }else{
         self.titleLabel.hidden = NO;
         self.price.hidden = NO;
@@ -107,9 +111,14 @@
             self.oldPrice.attributedText = string;
             [self.oldPrice sizeToFit];
         }
-        
+        [self.logoImage mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.width.offset(96);
+        }];
+        [self.price mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.titleLabel.mas_bottom).offset(5);
+            make.left.equalTo(self.logoImage);
+        }];
     }
-    [self setNeedsLayout];
 }
 - (UIImageView *)logoImage{
     if (!_logoImage) {
@@ -174,6 +174,9 @@ static NSString *HistoryFootID       =   @&quot;UICollectionFooterView&quot;;
 #pragma mark - UICollectionViewDelegateFlowLayout
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
     CNLiveSearchHotsModel *model = self.dataSource[indexPath.section];
+    if (_serviceId &&![_serviceId isEqualToString:@""]&&indexPath.section != 0){
+        return CGSizeMake(collectionView.width, model.layout.height);
+    }
     return CGSizeMake(model.layout.width, model.layout.height);
 }
 - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
@@ -169,14 +169,20 @@ static NSString *HotListCellID = @&quot;HotListCellID&quot;;
             strongself
             [self.navigationController popViewControllerAnimated:YES];
         };
-//        [_navigationBar.right setTitleColor:CNLiveColorWithHexString(@"#F5A623") forState:UIControlStateNormal];
+        [_navigationBar.right setTitleColor:CNLiveColorWithHexString(@"#F5A623") forState:UIControlStateNormal];
         _navigationBar.rightTitle = @"清空";
         _navigationBar.onClickRightButton = ^{
-            
-            [CNLiveServicePresent removeMyServiceResult:^{
-                strongself
-                [self myServiceData];
+            UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"确认清空所有服务吗？" message:nil preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:NULL];
+            UIAlertAction *sure = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                [CNLiveServicePresent removeMyServiceResult:^{
+                    strongself
+                    [self myServiceData];
+                }];
             }];
+            [alertVC addAction:cancel];
+            [alertVC addAction:sure];
+            [weakSelf presentViewController:alertVC animated:YES completion:NULL];
         };
     }
@@ -50,13 +50,7 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
         [self.listTableView reloadData];
     }
     if (![CNLiveNetworking isNetworking]) {
-        if (self.dataListArr.count > 0) {
-            return;
-        }
-        self.listCollectionView.mj_footer.hidden = YES;
-        [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_noNet"] text:@"网络开小差了，刷新试试" detailText:nil buttonTitle:@"     刷新     " buttonAction:@selector(searchRequese)];
-        self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
-        [self setCNAPIErrorEmptyView];
+        [QMUITips showError:@"网络未连接" inView:self.view hideAfterDelay:2];
         return;
     }
     [QMUITips showLoadingInView:self.view];
@@ -90,11 +84,7 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
             [self.listTableView reloadData];
         }
     } error:^{
-        weakSelf.listCollectionView.hidden = YES;
-        strongself
-        [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_failure"] text:@"加载失败，请点击重试" detailText:nil buttonTitle:@"     重试     " buttonAction:@selector(searchRequese)];
-        self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
-        [self setCNAPIErrorEmptyView];
+        [QMUITips hideAllTipsInView:self.view];
     }];
 }
@@ -160,11 +150,17 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
 {
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = YES;
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resignActive) name:UIApplicationDidEnterBackgroundNotification object:nil];
 }
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
     self.navigationController.navigationBarHidden = NO;
+    [[NSNotificationCenter defaultCenter]  removeObserver:self];
+    [CNLiveServiceHistorySearch saveHistorySearch:self.histories.mutableCopy];
+}
+#pragma mark - Notification
+- (void)resignActive{
     [CNLiveServiceHistorySearch saveHistorySearch:self.histories.mutableCopy];
 }
 #pragma mark - Action
@@ -208,6 +204,14 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
     {
         CNLiveHistoryModel *model1 = model.lists[indexPath.row];
         self.searchStr = model1.title;
+        NSMutableArray *array = [[NSMutableArray alloc] initWithArray:self.histories];
+        [array removeObjectAtIndex:indexPath.row];
+        NSDictionary *dic = @{
+            @"title":_searchStr,
+        };
+        [array insertObject:dic atIndex:0];
+        self.histories = array.copy;
+        [self dealHotsAndHistories];
         self.searchView.searchField.text = self.searchStr;
         [self searchRequese];
     }
@@ -263,7 +267,8 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
     return CGSizeMake(collectionView.width, 40);
 }
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section{
-    if (section == 0) {
+    CNLiveSearchHotsModel *model = self.hDataSources[section];
+    if ([model.title isEqualToString:@"热度推荐"]) {
         return CGSizeMake(0, 0);
     }
     return CGSizeMake(self.view.width, 40);
@@ -41,6 +41,9 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
 @implementation CNLiveServiceVC
 - (void)requestService{
     if (![CNLiveNetworking isNetworking]) {
+        if (self.dataSource.count>0 && self.pageListSource.count>0) {
+            return;
+        }
         [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_noNet"] text:@"网络开小差了，刷新试试" detailText:nil buttonTitle:@"     刷新     " buttonAction:@selector(requestService)];
         self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
         [self setCNAPIErrorEmptyView];
@@ -56,7 +59,11 @@ 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 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];
@@ -69,6 +76,9 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
     } error:^{
         strongself
+        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];