根据UI做页面调整，根据需求做弹窗调整

yanglingyu
1 parent 9376a509
Showing 7 changed files with 44 additions and 27 deletions
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
CNLiveCServiceModule/Classes/View/CNLiveAlertTipView.m
CNLiveCServiceModule/Classes/View/CNLiveChineServiceCell.m
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceEpiCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceLookCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceOrLookCell.m
@@ -135,7 +135,7 @@ static const CGFloat margin = 15;
                             showNum = 8;
                             itemSize = CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70);
                     }else{
-                        cellheight = 105;
+                        cellheight = 125;
                         showNum = 4;
                         itemSize = CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70);
                         subTitle = dic[@"category"][@"subTitle"];
@@ -275,13 +275,16 @@ static const CGFloat margin = 15;
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/servingApi/servingList") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         NSDictionary * dic = responseObject[@"data"];
         NSMutableArray *array = [NSMutableArray array];
-        if (dic[@"list"]&&[dic[@"list"] isKindOfClass:[NSArray class]]) {
-            NSArray *list = dic[@"list"];
-            for (NSDictionary *dict in list) {
-                CNLiveSearchModel *searchModel = [CNLiveSearchModel mj_objectWithKeyValues:dict];
-                [array addObject:searchModel];
+        if (dic) {
+            if (dic[@"list"]&&[dic[@"list"] isKindOfClass:[NSArray class]]) {
+                NSArray *list = dic[@"list"];
+                for (NSDictionary *dict in list) {
+                    CNLiveSearchModel *searchModel = [CNLiveSearchModel mj_objectWithKeyValues:dict];
+                    [array addObject:searchModel];
+                }
             }
         }
+        
             if (dic) {
                 NSString *lastPage = dic[@"hasNextPage"];
                 !succeed?:succeed(array.copy,!lastPage.boolValue);
@@ -336,23 +339,26 @@ static const CGFloat margin = 15;
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/servingApi/allCategory") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         NSDictionary * dic = responseObject[@"data"];
         NSMutableArray *array = [NSMutableArray array];
-        if (dic[@"list"]&&[dic[@"list"] isKindOfClass:[NSArray class]]) {
-            NSArray *list = dic[@"list"];
-            
-            for (NSDictionary *dict in list) {
-                NSDictionary *dictionary = @{
-                    @"title":dict[@"title"],
-                    @"lists":dict[@"list"],
-                    @"layout":@{
-                        @"width":@((SCREEN_WIDTH-4*margin-3*margin)/4.0),
-                        @"height":@(70)
-                    }
-                };
-                CNLiveSearchHotsModel *searchModel = [CNLiveSearchHotsModel mj_objectWithKeyValues:dictionary];
-                [array addObject:searchModel];
+        if (dic) {
+            if (dic[@"list"]&&[dic[@"list"] isKindOfClass:[NSArray class]]) {
+                NSArray *list = dic[@"list"];
+                
+                for (NSDictionary *dict in list) {
+                    NSDictionary *dictionary = @{
+                        @"title":dict[@"title"],
+                        @"lists":dict[@"list"],
+                        @"layout":@{
+                            @"width":@((SCREEN_WIDTH-4*margin-3*margin)/4.0),
+                            @"height":@(70)
+                        }
+                    };
+                    CNLiveSearchHotsModel *searchModel = [CNLiveSearchHotsModel mj_objectWithKeyValues:dictionary];
+                    [array addObject:searchModel];
+                }
             }
         }
+        
             if (dic) {
                 NSString *lastPage = dic[@"hasNextPage"];
                 !succeed?:succeed(array.copy,!lastPage.boolValue);
@@ -50,7 +50,7 @@
     }];
     [tipView.notShowBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.equalTo(tipView.cancelBtn.mas_top).offset(-10);
-        make.width.offset(105);
+        make.width.offset(125);
         make.height.offset(20);
         make.left.equalTo(tipView).offset(15);
     }];
@@ -125,7 +125,7 @@
         _sureBtn.layer.cornerRadius = 21;
         _sureBtn.titleLabel.font = UIFontMake(16);
         [_sureBtn setBackgroundImage:[UIImage gradientVerticalImageWithColors:@[CNLiveColorWithHexString(@"#FFAA4A"),CNLiveColorWithHexString(@"#EC5645")] rect:CGRectMake(0, 0, 120, 39)] forState:UIControlStateNormal];
-        [_sureBtn setBackgroundImage:[UIImage imageWithColor:CNLiveColorWithHexString(@"#EEEEEE")] forState:UIControlStateDisabled];
+        _sureBtn.clipsToBounds = YES;
         _sureBtn.enabled = NO;
     }
     return _sureBtn;
@@ -28,7 +28,7 @@
 -(void)makeSubViewsLayout
 {
     [self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView).offset(15);
+        make.left.equalTo(self.contentView).offset(10*kScreenWidth/375);
         make.centerY.equalTo(self.contentView);
         make.height.width.offset(45);
     }];
@@ -110,7 +110,7 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
     if ([_model.title isEqual:@"中国服务号"]) {
         return UIEdgeInsetsMake(10, 5, 10, 5);
     }
-    if ([_model.title isEqual:@""] || ![_model.subTitle isEqualToString:@""]) {
+    if ([_model.title isEqual:@""] && [_model.subTitle isEqualToString:@""]) {
         return UIEdgeInsetsMake(5, 0, 5, 0);
     }
     if ([_model.title isEqual:@"大家都在用"]) {
@@ -137,7 +137,7 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.font = UIFontMake(17);
+        _titleLabel.font = UIFontBoldMake(17);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#EB5039");
     }
     return _titleLabel;
@@ -100,7 +100,7 @@
 {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.font = UIFontMake(17);
+        _titleLabel.font = UIFontBoldMake(17);
         _titleLabel.textColor = CNLiveColorWithHexString(@"#1F74E9");
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -63,14 +63,25 @@
     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);
+            make.centerY.equalTo(self.logoImage);
+            make.width.offset(18);
+            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];
         self.rightBtn.backgroundColor = CNLiveColorWithHexString(@"#2C7EEE");
+        [self.rightBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.right.equalTo(self.contentView).offset(-10);
+            make.centerY.equalTo(self.logoImage);
+            make.width.offset(45);
+            make.height.offset(18);
+        }];
     }
-    [self setNeedsLayout];
 }
 - (UIImageView *)logoImage{
     if (!_logoImage) {