历史流量记录改版

Ifish/controllers/HotBar/Views/IfishHistoryView.m

@@ -14,7 +14,7 @@
 
 @interface IfishHistoryView()
 Strong UIButton *bgButton;
-Strong UIView *bgView;
+//Strong UIView *bgView;
 Strong IfishChatView *chartView;
 Strong IfishChatView *chartHolder;
 Strong UILabel *titleLabel;
@@ -30,12 +30,11 @@ Strong UIImageView *bgImage;
     self = [super init];
     if (self) {
         [self addSubview:self.bgButton];
-        [self addSubview:self.bgView];
-        [self.bgView addSubview:self.titleLabel];
-        [self.bgView addSubview:self.bgImage];
-        [self.bgView addSubview:self.chartHolder];
-        [self.bgView addSubview:self.predayButton];
-        [self.bgView addSubview:self.nextdayButton];
+        [self addSubview:self.bgImage];
+        [self.bgImage addSubview:self.titleLabel];
+        [self.bgImage addSubview:self.chartHolder];
+        [self addSubview:self.predayButton];
+        [self addSubview:self.nextdayButton];
         [self loadLayout];
     }
     return self;
@@ -48,20 +47,12 @@ Strong UIImageView *bgImage;
     }
     return _bgButton;
 }
-- (UIView *)bgView{
-    if (!_bgView) {
-        _bgView = InitObject(UIView);
-        _bgView.backgroundColor = XWhite;
-        _bgView.layer.masksToBounds = YES;
-        _bgView.layer.cornerRadius = 15;
-    }
-    return _bgView;
-}
 - (UIImageView *)bgImage{
     if (!_bgImage) {
         _bgImage = InitObject(UIImageView);
-        [_bgImage setImage:IMAGEBYENAME(@"history_bg")];
-
+        [_bgImage setImage:IMAGEBYENAME(@"history_bg_new")];
+        _bgImage.layer.masksToBounds = YES;
+        _bgImage.layer.cornerRadius = kSizeFrom750(32);
     }
     return _bgImage;
 }
@@ -77,7 +68,7 @@ Strong UIImageView *bgImage;
         _titleLabel = InitObject(UILabel);
         _titleLabel.textAlignment = NSTextAlignmentCenter;
         _titleLabel.textColor = RGB(51, 51, 51);
-        _titleLabel.font = [UIFont systemFontOfSize:13];
+        _titleLabel.font = [UIFont systemFontOfSize:14];
     }
     return _titleLabel;
 }
@@ -85,10 +76,7 @@ Strong UIImageView *bgImage;
 - (UIButton *)predayButton{
     if (!_predayButton) {
         _predayButton  = InitObject(UIButton);
-//        [_predayButton setTitle:@"前一天" forState:UIControlStateNormal];
         [_predayButton addTarget:self action:@selector(dayChangeClick:) forControlEvents:UIControlEventTouchUpInside];
-        [_predayButton.titleLabel setFont:[UIFont systemFontOfSize:13]];
-//        [_predayButton setTitleColor:RGB(51, 51, 51) forState:UIControlStateNormal];
         _predayButton.tag = 10;
     }
     return _predayButton;
@@ -96,10 +84,7 @@ Strong UIImageView *bgImage;
 - (UIButton *)nextdayButton{
     if (!_nextdayButton) {
         _nextdayButton  = InitObject(UIButton);
-//        [_nextdayButton setTitle:@"后一天" forState:UIControlStateNormal];
         [_nextdayButton addTarget:self action:@selector(dayChangeClick:) forControlEvents:UIControlEventTouchUpInside];
-        [_nextdayButton.titleLabel setFont:[UIFont systemFontOfSize:13]];
-//        [_nextdayButton setTitleColor:RGB(51, 51, 51) forState:UIControlStateNormal];
         _nextdayButton.tag = 11;
     }
     return _nextdayButton;
@@ -109,39 +94,33 @@ Strong UIImageView *bgImage;
         make.edges.mas_equalTo(self);
     }];
     
-    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.bgImage);
+        make.top.mas_equalTo(kSizeFrom750(20));
+        make.height.mas_equalTo(kSizeFrom750(40));
+    }];
+
+    [self.bgImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(kSizeFrom750(720));
         make.center.mas_equalTo(self);
-    }];
-    
-    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.mas_equalTo(self.bgView);
-        make.top.mas_equalTo(4);
-        make.height.mas_equalTo(20);
-    }];
-    
-    [self.bgImage mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(8);
-        make.centerX.width.mas_equalTo(self.bgView);
-        make.height.mas_equalTo(kSizeFrom750(335));
-        make.bottom.mas_equalTo(self.bgView.mas_bottom).offset(-10);
+        make.height.mas_equalTo(kSizeFrom750(678));
     }];
     
     [self.chartHolder mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.width.mas_equalTo(self.bgImage);
-        make.height.mas_equalTo(kSizeFrom750(260));
+        make.height.mas_equalTo(kSizeFrom750(580));
     }];
     
     [self.predayButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(kSizeFrom750(20));
-        make.height.mas_equalTo(kSizeFrom750(60));
-        make.width.mas_equalTo(kSizeFrom750(120));
-        make.bottom.mas_equalTo(self.bgView.mas_bottom);
+        make.height.mas_equalTo(kSizeFrom750(80));
+        make.width.mas_equalTo(kSizeFrom750(140));
+        make.bottom.mas_equalTo(self.bgImage.mas_bottom);
     }];
     
     [self.nextdayButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.height.centerY.mas_equalTo(self.predayButton);
-        make.right.mas_equalTo(-kSizeFrom750(40));
+        make.right.mas_equalTo(-kSizeFrom750(20));
     }];
     
     [self.bgImage layoutIfNeeded];
@@ -177,8 +156,8 @@ Strong UIImageView *bgImage;
         [self.chartView removeFromSuperview];
         _chartView=nil;
     }
-    self.chartView.datas=datas;
-    [self.chartView reloadHeater];
+    [self.chartView loadDatasWithArray:datas];
+//    [self.chartView reloadHeater];
     self.titleLabel.text=self.curdateStr;
    // [self initLineChart];
 }