no message

zhangxiaowen
1 parent a298cf08
Showing 5 changed files with 51 additions and 38 deletions
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/Module/CNLiveMineService.m
CNLiveMineModule/Classes/View/CNLiveMineCell.m
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
CNLiveMineModule/Classes/View/CNLiveMineNavigationBar.m
@@ -16,8 +16,6 @@
 #import "CNLiveMineCell.h"
 #import "CNLiveMineModel.h"
-#define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-
 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate>
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, weak) CNLiveMineHeaderView *headerView;
@@ -89,7 +87,7 @@ static const NSInteger kHEIGHT = 250;
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor = HexColor(0xf4f4f4);
+    self.view.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
     if (@available(iOS 11, *)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     }
@@ -305,7 +303,7 @@ static const NSInteger kHEIGHT = 250;
         _tableView.delegate = self;
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        _tableView.backgroundColor = HexColor(0xf4f4f4);
+        _tableView.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
         _tableView.estimatedRowHeight = 0;
         _tableView.estimatedSectionHeaderHeight = 0;
         _tableView.estimatedSectionFooterHeight = 0;
@@ -17,6 +17,7 @@
 @implementation CNLiveMineService
+// 我的
 - (UIViewController *)getMineViewController {
     return [CNLiveMineController new];
 }
@@ -26,4 +27,14 @@
     [CNLivePageJumpManager pushViewController:vc];
 }
+
+
+// 积分
+// 目击者
+// 订单
+// 余额
+// 我的收藏
+// 设置
+
+
 @end
@@ -10,8 +10,6 @@
 #import <Masonry/Masonry.h>
 #import "QMUIKit.h"
-#define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-
 @interface CNLiveMineCell()
 @property (nonatomic, strong) UIView *bgView;
 @property (nonatomic, strong) UIButton *titleButton;
@@ -25,7 +23,7 @@
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
-        self.contentView.backgroundColor = HexColor(0xf4f4f4);
+        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];
     }
     return self;
@@ -34,6 +32,7 @@
 - (void)xw_layoutSubviews{
     [self.contentView addSubview:self.bgView];
     [self.contentView addSubview:self.titleButton];
+    [self.contentView addSubview:self.allButton];
     [self.contentView addSubview:self.line];
 }
@@ -42,7 +41,8 @@
     [_titleButton setTitle:model.name forState:UIControlStateNormal];
     UIImage *xw_image = [self xw_getImageName:model.pic bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
     [_titleButton setImage:xw_image forState:UIControlStateNormal];
-    
+    _allButton.hidden = YES;
+
     switch (model.type) {
         case CNLiveMineCellTypeOrder:
         {
@@ -89,7 +89,7 @@
     }];
-    [self.contentView addSubview:self.allButton];
+    _allButton.hidden = NO;
     [_allButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.titleButton.mas_top);
         make.right.equalTo(self.bgView.mas_right).with.offset(-self.model.margin);
@@ -134,6 +134,8 @@
         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);
@@ -175,6 +177,8 @@
         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);
@@ -211,6 +215,8 @@
         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);
@@ -233,26 +239,6 @@
     }
 }
-- (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:14];
-    btn.titleLabel.textAlignment = NSTextAlignmentCenter;
-    btn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;//使图片和文字水平居中显示
-    
-    [btn setTitle:title forState:UIControlStateNormal];
-    [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-    UIImage *xw_image = [self xw_getImageName: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;
-    
-}
-
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
@@ -305,11 +291,11 @@
         [_allButton setImage:xw_image forState:UIControlStateNormal];
         [_allButton setImage:xw_image forState:UIControlStateHighlighted];
         _allButton.titleLabel.font = [UIFont boldSystemFontOfSize:12];
-        [_allButton setTitleColor:[UIColor colorWithRed:200.0/255.0 green:200.0/255.0 blue:200.0/255.0 alpha:1.0] forState:UIControlStateNormal];
+        [_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(allBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
-        _allButton.titleEdgeInsets = UIEdgeInsetsMake(0, -12, 0, 12);
+        _allButton.titleEdgeInsets = UIEdgeInsetsMake(0, -10, 0, 10);
         _allButton.imageEdgeInsets = UIEdgeInsetsMake(0, 50, 0, -50);
     }
@@ -319,10 +305,32 @@
 - (UIView *)line{
     if (!_line) {
         _line = [[UIView alloc] init];
-        _line.backgroundColor = HexColor(0xebebeb);
+        _line.backgroundColor = [UIColor colorWithRed:235/255.0 green:235/255.0 blue:235/255.0 alpha:1.0];
     }
     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:14];
+    btn.titleLabel.textAlignment = NSTextAlignmentCenter;
+    btn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;//使图片和文字水平居中显示
+    
+    [btn setTitle:title forState:UIControlStateNormal];
+    [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    UIImage *xw_image = [self xw_getImageName: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;
+    
+}
+
 /**
  *  创建图片
  *
@@ -11,8 +11,6 @@
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
-#define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-
 @interface CNLiveMineHeaderView ()
 @property (nonatomic, strong) UIImageView *bgView;
 @property (nonatomic, strong) UIButton *witness;
@@ -32,7 +30,7 @@ static const NSInteger margin = 20;
     self = [super initWithFrame:frame];
     if(self){
         self.userInteractionEnabled = YES;
-        self.backgroundColor = HexColor(0xf4f4f4);
+        self.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
 //        [XWUserInfoNotification addUserInfoUpdateObserver:self selector:@selector(userInfoUpdateNotification:)];
         [self createSubViews];
     }
@@ -268,7 +266,7 @@ static const NSInteger margin = 20;
         _address = [[UILabel alloc] init];
         _address.numberOfLines = 1;
         _address.textColor = [UIColor colorWithRed:140/255.0 green:140/255.0 blue:142/255.0 alpha:1.0];
-        _address.font = [UIFont systemFontOfSize:14];
+        _address.font = [UIFont systemFontOfSize:13];
         _address.attributedText = [self createAttributedImageName:@"mine_location" string:@"北京海淀区花园桥" isFront:YES];
     }
     return _address;
@@ -12,8 +12,6 @@
 #import "QMUIKit.h"
 #import "CNUserInfoManager.h"
-#define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-
 @interface CNLiveMineNavigationBar ()
 @property (nonatomic, strong) UIImageView *header;
 @property (nonatomic, strong) UILabel *name;