最后提交

QXLive/Room(房间)/Controller/QXRoomViewController.m

@@ -37,6 +37,8 @@
 #import "QXRedBagRecordViewController.h"
 #import "QXRoomEmojiView.h"
 #import "QXGiftDisplayManager.h"
+#import "QXRoomDayTaskTagView.h"
+#import "QXTaskViewController.h"
 
 @interface QXRoomViewController ()<
 QXRoomBottomViewDelegate,
@@ -85,6 +87,7 @@ QXRoomUserInfoViewDelegate
 @property (nonatomic,strong)QXAllRoomHourRankTagView *hourRankIconView;
 
 @property (nonatomic,strong)QXRoomEmojiView *emojiView;
+@property (nonatomic,strong)QXRoomDayTaskTagView *dayTaskTagView;
 @end
 
 @implementation QXRoomViewController
@@ -177,14 +180,14 @@ QXRoomUserInfoViewDelegate
     [self.upSeatBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-16);
         make.size.mas_equalTo(CGSizeMake(ScaleWidth(56), ScaleWidth(27)));
-        make.bottom.equalTo(self.bottomView.mas_top).offset(-34);
+        make.bottom.equalTo(self.bottomView.mas_top).offset(-18);
     }];
     
     self.soundBtn.hidden = YES;
     [self.view addSubview:self.soundBtn];
     [self.soundBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self.upSeatBtn);
-        make.size.mas_equalTo(CGSizeMake(ScaleWidth(52), ScaleWidth(52)));
+        make.size.mas_equalTo(CGSizeMake(ScaleWidth(52), ScaleWidth(25)));
         make.bottom.equalTo(self.upSeatBtn.mas_top).offset(-12);
     }];
     
@@ -217,6 +220,7 @@ QXRoomUserInfoViewDelegate
     
     [self.view addSubview:self.hourRankIconView];
     [self.view addSubview:self.redBagTagView];
+    [self.view addSubview:self.dayTaskTagView];
     [self setupEffectView];
     
 //    [self.view addSubview:self.headlineView];
@@ -812,6 +816,7 @@ QXRoomUserInfoViewDelegate
         if (toPitNumber == 9) {
             self.soundBtn.hidden = NO;
             self.titleView.isCompere = YES;
+            self.seatContentView.myPitNumber = toPitNumber;
         }else{
             self.soundBtn.hidden = YES;
             self.titleView.isCompere = NO;
@@ -2004,5 +2009,16 @@ QXRoomUserInfoViewDelegate
     }
     return _emojiView;
 }
+-(QXRoomDayTaskTagView *)dayTaskTagView{
+    if (!_dayTaskTagView) {
+        _dayTaskTagView = [[QXRoomDayTaskTagView alloc] init];
+        MJWeakSelf
+        _dayTaskTagView.startBlock = ^{
+            QXTaskViewController *vc = [[QXTaskViewController alloc] init];
+            [weakSelf.navigationController pushViewController:vc animated:YES];
+        };
+    }
+    return _dayTaskTagView;
+}
 @end