提交

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>
@@ -39,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)QXSendGiftView *sendGiftView;
 
 
-
+@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

@@ -29,6 +29,7 @@
 #import "QXMessageViewController.h"
 #import "QXRoomSubsidyViewController.h"
 #import "QXRoomViewController+Friend.h"
+#import "QXAllRoomHourRankView.h"
 
 @interface QXRoomViewController ()<
 QXRoomBottomViewDelegate,
@@ -71,6 +72,10 @@ QXRoomUserInfoViewDelegate
 @property (nonatomic,strong)QXCabinMovieView *movieView;
 /// 连送按钮
 @property (nonatomic,strong)QXContinuousGiftView *continuousView;
+
+
+@property (nonatomic,strong)QXAllRoomHourRankView *hourRankView;
+@property (nonatomic,strong)QXAllRoomHourRankTagView *hourRankIconView;
 @end
 
 @implementation QXRoomViewController
@@ -196,6 +201,7 @@ QXRoomUserInfoViewDelegate
         [self joinRoom];
     }
     
+    [self.view addSubview:self.hourRankIconView];
     [self setupEffectView];
     
 //    [self.view addSubview:self.headlineView];
@@ -410,6 +416,13 @@ QXRoomUserInfoViewDelegate
             [[QXAgoraEngineEx sharedEngine] quitEXChannelWithLastPkRoomId:self.roomModel.room_info.last_pk_room_id];
         }
     }
+    if (self.roomModel.gift_cycle.xlh_info.xlh_status.intValue == 1) {
+        self.acTagView.end_time = self.roomModel.gift_cycle.xlh_info.end_time;
+        [self.view addSubview:self.acTagView];
+    }else{
+        [self.acTagView stopTimer];
+        [self.acTagView removeFromSuperview];
+    }
 }
 
 
@@ -1867,6 +1880,19 @@ QXRoomUserInfoViewDelegate
     }
     return _timeView;
 }
+-(QXActivityTagView *)acTagView{
+    if (!_acTagView) {
+        _acTagView = [[QXActivityTagView alloc] init];
+        MJWeakSelf
+        _acTagView.startBlock = ^{
+            [weakSelf.skyView hide];
+            weakSelf.meetView.roomId = weakSelf.roomId;
+            [weakSelf.meetView showInView:weakSelf.view];
+        };
+        
+    }
+    return _acTagView;
+}
 -(QXMeetActivityView *)meetView{
     if (!_meetView) {
         _meetView = [[QXMeetActivityView alloc] init];
@@ -1894,5 +1920,22 @@ QXRoomUserInfoViewDelegate
         _timeView = nil;
     }
 }
+-(QXAllRoomHourRankTagView *)hourRankIconView{
+    if (!_hourRankIconView) {
+        _hourRankIconView = [[QXAllRoomHourRankTagView alloc] init];
+        MJWeakSelf
+        _hourRankIconView.startBlock = ^{
+            [weakSelf.hourRankView showInView:weakSelf.view];
+        };
+    }
+    return _hourRankIconView;
+}
+
+-(QXAllRoomHourRankView *)hourRankView{
+    if (!_hourRankView) {
+        _hourRankView = [[QXAllRoomHourRankView alloc] init];
+    }
+    return _hourRankView;
+}
 @end