修复数据布局bug

yanglingyu
1 parent 968eeddb
Showing 5 changed files with 46 additions and 26 deletions
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
CNLiveCServiceModule/Classes/View/CNLiveCycleActiveCell.m
CNLiveCServiceModule/Classes/View/CNLiveGoodsOrVideoHeaderView.m
CNLiveCServiceModule/Classes/View/CNLiveSearchListCell.m
CNLiveCServiceModule/Classes/View/CNLiveVideoRecommendCell.m
@@ -25,8 +25,8 @@ static const CGFloat margin = 15;
     [CNLiveNetworking setupShowResult:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/servingApi/search") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (responseObject&&[responseObject isKindOfClass:[NSDictionary class]]) {
-            NSString *lastPageStr = responseObject[@"data"][@"isLastPage"];
-            BOOL isLastPage = lastPageStr.boolValue;
+            NSString *lastPageStr = responseObject[@"data"][@"hasNextPage"];
+            BOOL isLastPage = !lastPageStr.boolValue;
             NSArray *listArr = responseObject[@"data"][@"list"];
             if (listArr&&[listArr isKindOfClass:[NSArray class]]) {
                 if (listArr.count == 0) {
@@ -260,7 +260,7 @@ static const CGFloat margin = 15;
 + (void)loadMyServicepage:(NSString *)page result:(nonnull void (^)(NSArray * _Nonnull, BOOL))succeed error:(nonnull void (^)(void))failure{
     NSDictionary * params = @{@"sid": CNUserShareModelUid ? CNUserShareModelUid : @"",
-                              @"pageSize":@"10",
+                              @"pageSize":@"100",
                               @"type":@"2",
                               @"page":page?page:@""
@@ -281,8 +281,8 @@ static const CGFloat margin = 15;
             }
         }
             if (dic) {
-                NSString *lastPage = dic[@"isLastPage"];
-                !succeed?:succeed(array.copy,lastPage);
+                NSString *lastPage = dic[@"hasNextPage"];
+                !succeed?:succeed(array.copy,!lastPage.boolValue);
             }else{
                 [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:3];
                 !failure?:failure();
@@ -352,8 +352,8 @@ static const CGFloat margin = 15;
         }
             if (dic) {
-                NSString *lastPage = dic[@"isLastPage"];
-                !succeed?:succeed(array.copy,lastPage.boolValue);
+                NSString *lastPage = dic[@"hasNextPage"];
+                !succeed?:succeed(array.copy,!lastPage.boolValue);
             }else{
                 [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:3];
                 !failure?:failure();
@@ -61,7 +61,7 @@
         _cycleView.infiniteLoop = YES;
         _cycleView.pageControlStyle = SDCycleScrollViewPageContolStyleAnimated;
         _cycleView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
-        _cycleView.contentMode = UIViewContentModeScaleAspectFit;
+        _cycleView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
         _cycleView.hidesForSinglePage = YES;
         _cycleView.pageControlDotSize = CGSizeMake(4, 4);
     }
@@ -68,6 +68,7 @@
     if ([pageModel.blockName isEqualToString:@"热销排行"]) {
         self.LogoImage.hidden = NO;
         self.subTitle.hidden = NO;
+        self.moreBtn.hidden = NO;
         UIColor *begin = CNLiveColorWithHexString(@"#FFF4F1");
         self.backgroundColor = [UIColor colorWithPatternImage:[UIImage gradientVerticalImageWithColors:@[begin,kWhiteColor] rect:self.bounds]];
         self.titlelabel.textColor = CNLiveColorWithHexString(@"#FA7256");
@@ -49,13 +49,10 @@
 {
     _model = model;
     [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
-    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:model.title];
-    NSRange range = [model.title rangeOfString:model.searchStr];
-    UIColor *color = CNLiveColorWithHexString(@"#00CD1E");
-    [attrString addAttribute:NSFontAttributeName value:UIFontMake(14) range:NSMakeRange(0, model.title.length)];
-    [attrString addAttribute:NSForegroundColorAttributeName value:CNLiveColorWithHexString(@"#333333") range:NSMakeRange(0, model.title.length)];
-    [attrString addAttribute:NSForegroundColorAttributeName value:color range:range];
-    self.titleLabel.attributedText = attrString;
+    NSMutableAttributedString * titleString = [[NSMutableAttributedString alloc] initWithString: model.title];
+    [titleString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#00CD1E) range:[model.title rangeOfString:model.searchStr]];
+        
+    self.titleLabel.attributedText = titleString;
     [self.titleLabel sizeToFit];
 }
 - (UIImageView *)logoView{
@@ -70,6 +67,8 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
+        _titleLabel.font = UIFontMake(14);
+        _titleLabel.textColor = CNLiveColorWithHexString(@"#333333");
     }
     return _titleLabel;
 }
@@ -57,26 +57,28 @@
 #pragma mark - Setting&&getting
 - (void)setModel:(CnLivePageContentModel *)model
 {
-    self.titleLabel.hidden = YES;
-    self.price.hidden = YES;
-    self.titleLabel.numberOfLines = 1;
-    self.oldPrice.hidden = YES;
-    self.lookNum.hidden = YES;
     [_logoImage sd_setImageWithURL:[NSURL URLWithString:model.poster]];
     if (_type == CNLiveCellShowTypeHot) {
+        self.titleLabel.hidden = YES;
         self.price.hidden = NO;
+        self.oldPrice.hidden = YES;
+        self.lookNum.hidden = YES;
         NSError *error;
         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) {
+        [self.logoImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.contentView);
+            make.centerX.equalTo(self.contentView);
             make.height.width.offset(65);
         }];
-        [self.price mas_updateConstraints:^(MASConstraintMaker *make) {
+        [self.price mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.logoImage.mas_bottom).offset(5);
             make.centerX.equalTo(self);
         }];
     }else if (_type == CNLiveCellShowTypeVideo){
+        self.price.hidden = YES;
+        self.oldPrice.hidden = YES;
         self.titleLabel.hidden = NO;
         self.titleLabel.numberOfLines = 2;
         self.lookNum.hidden = NO;
@@ -86,13 +88,21 @@
             num = [NSString stringWithFormat:@"%.1f万",num.floatValue/10000];
         }
         [self.lookNum setTitle:[NSString stringWithFormat:@"%@浏览",num] forState:UIControlStateNormal];
-        [self.logoImage mas_updateConstraints:^(MASConstraintMaker *make) {
+        [self.logoImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.contentView);
+            make.centerX.equalTo(self.contentView);
             make.height.width.offset(96);
         }];
+        [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.equalTo(self.logoImage);
+            make.top.equalTo(self.logoImage.mas_bottom).offset(10);
+        }];
     }else{
+        self.titleLabel.numberOfLines = 1;
         self.titleLabel.hidden = NO;
         self.price.hidden = NO;
         self.titleLabel.text = model.title;
+        self.lookNum.hidden = YES;
         NSError *error;
         NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:[model.desc dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:&error];
         NSString *nowStr = dic[@"price"];
@@ -100,7 +110,6 @@
         [price addAttribute:NSFontAttributeName value:UIFontMake(15) range:NSMakeRange(0, price.length)];
         [price addAttribute:NSFontAttributeName value:UIFontMake(10) range:NSMakeRange(0, 1)];
         self.price.attributedText = price;
-        
         [self.price sizeToFit];
         NSString *oldStr = dic[@"prices"];
@@ -110,13 +119,24 @@
             [string addAttribute:NSStrikethroughStyleAttributeName value:@(NSUnderlinePatternSolid | NSUnderlineStyleSingle) range:NSMakeRange(0, string.length)];
             self.oldPrice.attributedText = string;
             [self.oldPrice sizeToFit];
+        }else{
+            self.oldPrice.hidden = YES;
         }
-        [self.logoImage mas_updateConstraints:^(MASConstraintMaker *make) {
+        [self.logoImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.contentView);
+            make.centerX.equalTo(self.contentView);
             make.height.width.offset(96);
         }];
-        [self.price mas_updateConstraints:^(MASConstraintMaker *make) {
+        [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.equalTo(self.logoImage);
+            make.top.equalTo(self.logoImage.mas_bottom).offset(10);
+        }];
+        [self.price mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.titleLabel.mas_bottom).offset(5);
             make.left.equalTo(self.logoImage);
+            if (self.price.width > self.contentView.width) {
+                make.right.equalTo(self.logoImage);
+            }
         }];
     }
 }