提交

QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m

@@ -423,6 +423,11 @@ QXRoomUserInfoViewDelegate
         [self.acTagView stopTimer];
         [self.acTagView removeFromSuperview];
     }
+    if (self.roomModel.hour_ranking_open == 1) {
+        self.hourRankIconView.hidden = NO;
+    }else{
+        self.hourRankIconView.hidden = YES;
+    }
 }
 
 
@@ -1927,6 +1932,7 @@ QXRoomUserInfoViewDelegate
         _hourRankIconView.startBlock = ^{
             [weakSelf.hourRankView showInView:weakSelf.view];
         };
+        _hourRankIconView.hidden = YES;
     }
     return _hourRankIconView;
 }

QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.m

@@ -90,12 +90,13 @@
     
     self.helpBtn = [[UIButton alloc] init];
     [self.helpBtn setImage:[UIImage imageNamed:@"room_hour_rank_help"] forState:(UIControlStateNormal)];
+    [self.helpBtn addTarget:self action:@selector(helpAction) forControlEvents:(UIControlEventTouchUpInside)];
     [self.bgView addSubview:self.helpBtn];
     [self.helpBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(self.bgView);
-        make.top.mas_equalTo(ScaleWidth(40));
-        make.height.mas_equalTo(ScaleWidth(24));
-        make.width.mas_equalTo(ScaleWidth(24));
+        make.top.mas_equalTo(ScaleWidth(50));
+        make.height.mas_equalTo(ScaleWidth(40));
+        make.width.mas_equalTo(ScaleWidth(40));
     }];
     
     UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
@@ -130,7 +131,7 @@
 -(void)getRankList{
     MJWeakSelf
     [QXMineNetwork roomHourRankWithPage:self.page successBlock:^(QXRoomHourRankModel * _Nonnull model) {
-        if (weakSelf.page == 0) {
+        if (weakSelf.page == 1) {
             [weakSelf.dataArray removeAllObjects];
         }
         weakSelf.timeLabel.text =  [NSString stringWithFormat:@"榜单时间  %@",model.time_range];
@@ -163,6 +164,7 @@
 }
 
 -(void)showInView:(UIView *)view{
+    self.page = 1;
     [self getRankList];
     self.bgView.x = SCREEN_WIDTH;
     [view addSubview:self];
@@ -177,6 +179,13 @@
         [self removeFromSuperview];
     }];
 }
+
+-(void)helpAction{
+    QXBaseWebViewController *vc = [[QXBaseWebViewController alloc] init];
+    NSString *urlString = [NSString stringWithFormat:@"%@api/Page/page_show?id=%@",ServerUrl,@"24"];
+    vc.urlStr = urlString;
+    [self.viewController.navigationController pushViewController:vc animated:YES];
+}
 -(NSMutableArray *)dataArray{
     if (!_dataArray) {
         _dataArray = [NSMutableArray array];
@@ -198,6 +207,7 @@
 }
 
 -(void)initSubviews{
+    self.contentView.backgroundColor = RGB16(0x420B93);
     self.rankNumberImageView = [[UIImageView alloc] init];
     [self.contentView addSubview:self.rankNumberImageView];
     [self.rankNumberImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -240,9 +250,11 @@
     [self.contentView addSubview:self.activityBgView];
     [self.activityBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.right.mas_equalTo(-5);
-        make.top.mas_equalTo(8);
-        make.width.mas_equalTo(44);
-        make.height.mas_equalTo(48);
+        make.centerY.equalTo(self.contentView);
+        
+//        make.top.mas_equalTo(8);
+        make.width.mas_equalTo(63);
+        make.height.mas_equalTo(67);
     }];
     
     self.activityStatusBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"activity_status_ing"]];
@@ -254,7 +266,7 @@
     }];
     
     self.statusLabel = [[UILabel alloc] init];
-    self.statusLabel.font = [UIFont systemFontOfSize:10];
+    self.statusLabel.font = [UIFont systemFontOfSize:12];
     self.statusLabel.textColor = RGB16(0xffffff);
     self.statusLabel.textAlignment = NSTextAlignmentCenter;
     [self.activityBgView addSubview:self.statusLabel];
@@ -268,7 +280,7 @@
     [self.activityImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.activityBgView);
         make.centerX.equalTo(self.activityBgView);
-        make.width.height.mas_equalTo(36);
+        make.width.height.mas_equalTo(55);
     }];
     
     self.nameLabel = [[UILabel alloc] init];

QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.m

@@ -16,6 +16,7 @@
 #import "QXAlertView.h"
 #import "QXGiftDriftView.h"
 #import "QXMeetActivityDriftView.h"
+#import "QXDrifRoomHourRankView.h"
 
 @interface QXRoomSettingView()<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource,QXRoomSettingViewDelegate>
 @property (nonatomic,strong)UIView *bgView;
@@ -673,6 +674,7 @@
         [[NSUserDefaults standardUserDefaults] setBool:model.isSelected forKey:kIsCloseDrifPop];
         [[QXGiftDriftView shareView] drifPopIsClose:model.isSelected];
         [[QXMeetActivityDriftView shareView] drifPopIsClose:model.isSelected];
+        [[QXDrifRoomHourRankView shareView] drifPopIsClose:model.isSelected];
         return;
     }
     if (model.type == QXRoomSettingTypeRoomOrderMic) {