提交

QXLive/HomePage(声播)/Controlller/QXHomeViewController.m

@@ -63,7 +63,7 @@
 
 - (void)initSubViews{
 //    UILabel *tLabel = [[UILabel alloc] init];
-//    tLabel.text = QXText(@"秘地");
+//    tLabel.text = QXText(@"MY语聊");
 //    tLabel.font = [UIFont boldSystemFontOfSize:20];
 //    [self.view addSubview:tLabel];
 //    [tLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -407,8 +407,8 @@
         _categoryView = [[JXCategoryTitleView alloc] init];
         _categoryView.frame = CGRectMake(15, 0, SCREEN_WIDTH-30, 44);
         _categoryView.delegate = self;
-        _categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#FFFFFF"];
-        _categoryView.titleColor = RGB16A(0xF1ECFF, 0.45);
+        _categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"];
+        _categoryView.titleColor = RGB16A(0x666666, 0.45);
         _categoryView.cellWidth = JXCategoryViewAutomaticDimension;
         _categoryView.contentEdgeInsetLeft = 3;
         _categoryView.cellSpacing = 16;

QXLive/HomePage(声播)/Controlller/QXRankHomeVC.m

@@ -30,7 +30,8 @@
 -(void)initSubViews{
     self.view.backgroundColor = [UIColor whiteColor];
 //    self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"公会榜",@"真爱榜"];
-    self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"真爱榜"];
+//    self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"真爱榜"];
+    self.titles = @[@"房间榜", @"财富榜", @"魅力榜"];
     self.listVCArray = [NSMutableArray array];
     self.categoryView = [[JXCategoryTitleView alloc] init];
     self.categoryView.frame = CGRectMake(0, 0, SCREEN_WIDTH-100, 44);

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

@@ -105,9 +105,17 @@
     [self.skyView updateProgress:model];
     [self.ageView updateProgress:model];
     [self.timeView updateProgress:model];
+    if (model.status.intValue == 1) {
+        self.acTagView.end_time = model.end_time;
+        [self.view addSubview:self.acTagView];
+    }else{
+        [self.acTagView stopTimer];
+        [self.acTagView removeFromSuperview];
+    }
 }
 
 -(void)meetActivityGiftInfoIsUpdate:(QXRoomChatListModel *)giftInfo{
     [self.meetView updateUserAndGiftInfoWithModel:giftInfo];
+    self.acTagView.end_time = giftInfo.end_time.longLongValue;
 }
 @end

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

@@ -19,6 +19,7 @@
 #import "QXAgePraizeView.h"/// 岁月之城
 #import "QXTimePraizeView.h"/// 时空之巅
 #import "QXMeetActivityView.h"
+#import "QXActivityTagView.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QXRoomViewController : QXBaseViewController<QXRoomMessageManagerDelegate,QXRoomSeatDelegate>
@@ -40,6 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 
+@property (nonatomic,strong)QXActivityTagView *acTagView;
 @property (nonatomic,strong)QXSkyPraizeView *skyView;
 @property (nonatomic,strong)QXAgePraizeView *ageView;
 @property (nonatomic,strong)QXTimePraizeView *timeView;

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

@@ -1867,6 +1867,12 @@ QXRoomUserInfoViewDelegate
     }
     return _timeView;
 }
+-(QXActivityTagView *)acTagView{
+    if (!_acTagView) {
+        _acTagView = [[QXActivityTagView alloc] init];
+    }
+    return _acTagView;
+}
 -(QXMeetActivityView *)meetView{
     if (!_meetView) {
         _meetView = [[QXMeetActivityView alloc] init];