feat: 优化首页 tab 加载逻辑 ｜ 补全 side menu 控制逻辑 | 基本完成 20 mic ｜ 部分小需求 ｜ 优化房间聊天气泡

YuMi/Modules/YMRoom/View/ActivityContainerView/RoomSideMenu.h

@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate;
 - (void)updateView;
+- (void)displayForMiniGame;
+- (void)displayExpandButton:(BOOL)displayButton;
 - (void)updateForBoomDetailArray:(NSArray <BoomDetailModel*>  *)models;
 
 @end

YuMi/Modules/YMRoom/View/ActivityContainerView/RoomSideMenu.m

@@ -15,9 +15,12 @@
 #import "Api+LittleGame.h"
 #import "Api+TreasureFairy.h"
 
+#import "AttachmentModel.h"
 #import "RoomBoomManager.h"
 #import "RoomBoomEntryView.h"
+#import "FirstRechargeModel.h"
 #import "LittleGameInfoModel.h"
+#import "PIRoomEnterRedPacketView.h"
 
 #import "MSRoomGameWebVC.h"
 #import "MSRoomMenuGameVC.h"
@@ -28,11 +31,14 @@
 #import "XPSailingViewController.h"
 #import "XCCurrentVCStackManager.h"
 #import "XPCandyTreeViewController.h"
+#import "XPFirstRechargeSuccessView.h"
 #import "XPArrangeMicViewController.h"
+#import "PIRoomActivityWebView.h"
+#import "XPTreasureFairyViewController.h"
 
 UIKIT_EXTERN NSString *kShowFirstRechargeView;
 
-@interface RoomSideMenu ()<UITableViewDelegate, UITableViewDataSource, SDCycleScrollViewDelegate>
+@interface RoomSideMenu ()<SDCycleScrollViewDelegate, PIRoomEnterRedPacketViewDelegate>
 
 @property(nonatomic, strong) NSMutableArray *menuItemViews;
 @property (nonatomic, strong) RACSubject *menuItemViewsSubject; // 数据源信号
@@ -43,8 +49,8 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 @property(nonatomic, strong) UIButton *configEntranceMenuButton;
 @property(nonatomic, strong) UIButton *pkMenuButton;
 @property (nonatomic,strong) UIImageView *joinView;
+@property(nonatomic,strong) PIRoomEnterRedPacketView *redPacketView;
 
-@property (nonatomic, strong) UITableView *tableView;
 @property(nonatomic, strong) UIScrollView *scrollView;
 @property (nonatomic,strong) SDCycleScrollView *cycleScrollView;
 @property (nonatomic, weak) id<RoomHostDelegate> hostDelegate;
@@ -57,9 +63,13 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 @property (nonatomic, strong) NetImageView *loader_url_1;
 @property (nonatomic, strong) NetImageView *loader_url_2;
 
+@property(nonatomic, strong) UIButton *expandButton;
+
+@property(nonatomic, assign) BOOL isExpand;
+
 @end
 
-// TODO: 补充红包视图 ｜ 调整顺序 ｜ 调整大小 ｜ 支持收起展开
+// TODO: 补充红包视图
 
 @implementation RoomSideMenu
 
@@ -71,9 +81,6 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate {
     self = [super init];
     if (self) {
-#if DEBUG
-        self.backgroundColor = [UIColor orangeColor];
-#endif
         self.menuItemViews = @[].mutableCopy;
         self.menuItemViewsSubject = [RACSubject subject];
         self.hostDelegate = delegate;
@@ -87,6 +94,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 - (void)setupViews {
     [self addSubview:self.cycleScrollView];
     [self addSubview:self.scrollView];
+    [self addSubview:self.expandButton];
 
     [self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.leading.trailing.equalTo(self);
@@ -98,6 +106,12 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         make.leading.trailing.bottom.equalTo(self);
     }];
     
+    [self.expandButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(self.scrollView.mas_top);
+        make.trailing.mas_equalTo(self.scrollView).offset(-4);
+        make.size.mas_equalTo(CGSizeMake(32, 32));
+    }];
+    
     @kWeakify(self);
     [self.menuItemViewsSubject subscribeNext:^(NSArray * _Nullable x) {
         @kStrongify(self);
@@ -127,6 +141,16 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         [self.menuItemViews addObject:itemView];
     }
     
+    [self.menuItemViews sortUsingComparator:^NSComparisonResult(UIView * _Nonnull obj1, UIView *  _Nonnull obj2) {
+        if (obj1.tag < obj2.tag) {
+            return NSOrderedAscending;
+        } else if (obj1.tag > obj2.tag) {
+            return NSOrderedDescending;
+        } else {
+            return NSOrderedSame;
+        }
+    }];
+    
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self.menuItemViewsSubject sendNext:self.menuItemViews];
     });
@@ -141,6 +165,16 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     }
 }
 
+- (void)displayForMiniGame {
+    self.cycleScrollView.hidden = NO;
+    self.expandButton.hidden = YES;
+    self.scrollView.hidden = YES;
+}
+
+- (void)displayExpandButton:(BOOL)displayButton {    
+    self.expandButton.hidden = !displayButton;
+}
+
 - (void)updateForBoomDetailArray:(NSArray <BoomDetailModel*>  *)models {
     _boomModels = models;
     if (!models || models.count == 0) {
@@ -160,8 +194,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         // 处理到顶级后可能找不到数据的异常
         self.boomView.boomModel = [models lastObject];
     }
-    
-    [self updateMenuItem:self.boomView isRemove:NO];
+    if ((self.isExpand && self.expandButton.hidden == NO) || self.expandButton.hidden) {
+        [self updateMenuItem:self.boomView isRemove:NO];
+    }
 }
 
 - (void)updateScrollView:(NSArray *)data {
@@ -169,7 +204,8 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     [self.scrollView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
     
     // 设置 contentSize
-    CGFloat width = self.scrollView.bounds.size.width;
+    CGFloat inset = 15;
+    CGFloat width = self.scrollView.bounds.size.width - 30;
     self.scrollView.contentSize = CGSizeMake(self.scrollView.bounds.size.width,
                                              MAX(self.scrollView.bounds.size.height, width * data.count));
     
@@ -178,7 +214,8 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     for (UIView *view in data) {
         [self.scrollView addSubview:view];
         yOffset -= width;
-        view.frame = CGRectMake(0, yOffset, width, width);
+        view.frame = CGRectMake(inset, yOffset, width, width);
+        [view layoutIfNeeded];
     }
     
     // 滚动到底部
@@ -208,8 +245,6 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         self.playList = [NSMutableArray arrayWithArray:playModels];
         self.activityList = [NSMutableArray arrayWithArray:activityModels];
         self.littleGameList = [NSMutableArray arrayWithArray:littleGameModels];
-
-        [self dealWithData];
         
         [self onRoomUpdate];
         return nil;
@@ -360,6 +395,14 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     }
 }
 
+- (void)setRedPacketList:(NSMutableArray *)redPacketList{
+    _redPacketList = redPacketList;
+    self.redPacketView.redPacketList = redPacketList;
+    if(self.openRedPacketHandle){
+        self.openRedPacketHandle(nil,self.hostDelegate.getRoomInfo.type,YES);
+    }
+}
+
 #pragma mark - User Response
 - (void)displayBoomInfoProgress {
     BoomInfoViewController *vc = [[BoomInfoViewController alloc] init];
@@ -435,7 +478,28 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         XPArrangeMicViewController * arrangeMicVC = [[XPArrangeMicViewController alloc] initWithInfo:info];
         [self.hostDelegate.getCurrentNav presentViewController:arrangeMicVC animated:YES completion:nil];
     }];
+}
 
+- (void)didTapExpand {
+    self.isExpand = !self.isExpand;
+    
+    [self.menuItemViews removeAllObjects];
+    [self.menuItemViewsSubject sendNext:self.menuItemViews];
+    
+    if (self.isExpand) {
+        [self.expandButton setImage:kImage(@"side_menu_close") forState:UIControlStateNormal];
+        [self mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(kGetScaleWidth(260));
+        }];
+        
+    } else {
+        [self.expandButton setImage:kImage(@"side_menu_open") forState:UIControlStateNormal];
+        [self mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(kGetScaleWidth(160));
+        }];
+    }
+    [self layoutIfNeeded];
+    [self onRoomUpdate];
 }
 
 #pragma mark - Room Delegate
@@ -444,54 +508,105 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 }
 
 - (void)onRoomUpdate {
-    RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo;
-    
-    [self updateConfigEntranceButtons:roomInfo];
-    
-    if (roomInfo.roomModeType != RoomModeType_Open_PK_Mode) {
-        [self updateMenuItem:self.pkMenuButton isRemove:YES];
-    } else {
-        [self updateMenuItem:self.pkMenuButton isRemove:NO];
-    }
-    
+    RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo;
+
     switch (roomInfo.type) {
         case RoomType_MiniGame:
+            [self displayForMiniGame];
+            [self updateCycleView];
+            break;
+        case RoomType_19Mic:
+        case RoomType_20Mic: {
+            [self.menuItemViews removeAllObjects];
+            [self.menuItemViewsSubject sendNext:self.menuItemViews];
+            
+            [self displayExpandButton:YES];
+            
+            [self dealWithData];
+            if (self.isExpand) {
+                [self loadPKView:roomInfo];
+                [self loadJoinView:roomInfo];
+                [self updateConfigEntranceButtons:roomInfo];
+                [self updateMenuItem:self.boomView isRemove:NO];
+            }
+            self.scrollView.hidden = NO;
+            self.cycleScrollView.hidden = YES;
+        }
             break;
         default: {
-            [self updateCycleView];
+            [self displayExpandButton:NO];
             
-            if (roomInfo.roomModeType == RoomModeType_Open_Blind || roomInfo.roomModeType == RoomModeType_Open_PK_Mode || roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) {
-                if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode ) {
-                    self.joinView.image = [UIImage getLanguageImage:@"room_pk_normal_member_enter"];
-                } else {
-                    self.joinView.image = [UIImage getLanguageImage:@"room_mode_dating_enter"];
-                }
-                NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init];
-                request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId];
-                request.userIds = @[[AccountInfoStorage instance].getUid];
-                @kWeakify(self);
-                [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray<NIMChatroomMember *> * _Nullable members) {
-                    @kStrongify(self);
-                    if (error == nil) {
-                        NIMChatroomMember * member = members.firstObject;
-                        if (member.type == NIMTeamMemberTypeOwner || member.type == NIMTeamMemberTypeManager) {
-                            [self updateMenuItem:self.joinView isRemove:YES];
-                            return;
-                        }
-                    }
-                    [self updateMenuItem:self.joinView isRemove:NO];
-                }];
-            } else {
-                [self updateMenuItem:self.joinView isRemove:YES];
-            }
+            [self dealWithData];
+            [self loadPKView:roomInfo];
+            [self loadJoinView:roomInfo];
+            [self loadRedPacket:roomInfo];
+            [self updateConfigEntranceButtons:roomInfo];
+            [self updateMenuItem:self.boomView isRemove:NO];
+            
+            self.scrollView.hidden = NO;
+            self.cycleScrollView.hidden = NO;
         }
             break;
     }
     
-#if DEBUG
-    [self updateMenuItem:self.pkMenuButton isRemove:NO];
-    [self updateMenuItem:self.joinView isRemove:NO];
-#endif
+    if(self.openRedPacketHandle){
+        self.openRedPacketHandle(nil,self.hostDelegate.getRoomInfo.type,YES);
+    }
+}
+
+- (void)loadRedPacket:(RoomInfoModel *)roomInfo {
+    self.redPacketView.type = roomInfo.type;
+    self.redPacketView.redPacketList = self.redPacketList;
+    [self updateMenuItem:self.redPacketView isRemove:NO];
+}
+
+- (void)loadPKView:(RoomInfoModel *)roomInfo {
+    if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode &&
+        (roomInfo.type == RoomType_Anchor || roomInfo.roomModeType == RoomModeType_Open_Blind)) {
+        [self updateMenuItem:self.pkMenuButton isRemove:NO];
+    }
+}
+
+- (void)loadJoinView:(RoomInfoModel *)roomInfo {
+    if (roomInfo.roomModeType == RoomModeType_Open_Blind ||
+        roomInfo.roomModeType == RoomModeType_Open_PK_Mode ||
+        roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) {
+        if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode ) {
+            self.joinView.image = [UIImage getLanguageImage:@"room_pk_normal_member_enter"];
+        } else {
+            self.joinView.image = [UIImage getLanguageImage:@"room_mode_dating_enter"];
+        }
+        NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init];
+        request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId];
+        request.userIds = @[[AccountInfoStorage instance].getUid];
+        @kWeakify(self);
+        [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray<NIMChatroomMember *> * _Nullable members) {
+            @kStrongify(self);
+            if (error == nil) {
+                NIMChatroomMember * member = members.firstObject;
+                if (member.type == NIMTeamMemberTypeOwner || member.type == NIMTeamMemberTypeManager) {
+                    [self updateMenuItem:self.joinView isRemove:YES];
+                    return;
+                }
+            }
+            [self updateMenuItem:self.joinView isRemove:NO];
+        }];
+    } else {
+        [self updateMenuItem:self.joinView isRemove:YES];
+    }
+}
+
+- (void)handleNIMCustomMessage:(NIMMessage *)message {
+    NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
+    if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) {
+        AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
+        if (attachment.first == CustomMessageType_First_Recharge_Reward && attachment.second == Custom_Message_Sub_Room_First_Recharge_Reward) {
+            FirstRechargeModel *model = [FirstRechargeModel modelWithJSON:attachment.data];
+            XPFirstRechargeSuccessView * firstRechargeView= [[XPFirstRechargeSuccessView alloc] init];
+            firstRechargeView.rechargeInfo = model;
+            [TTPopup popupView:firstRechargeView style:TTPopupStyleAlert];
+        }
+    }
 }
 
 - (void)handleNIMTextMessage:(NIMMessage *)message {
@@ -499,23 +614,43 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 }
 
 - (void)handleNIMNotificationMessage:(NIMMessage *)message {
-    
+    NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject;
+    NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content;
+    switch (content.eventType) {
+        case NIMChatroomEventTypeAddManager:
+        {
+            if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) {
+                for (NIMChatroomNotificationMember * member in content.targets) {
+                    if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) {
+                        [self updateMenuItem:self.joinView isRemove:YES];
+                        break;
+                    }
+                }
+            }
+        }
+            break;
+        case NIMChatroomEventTypeRemoveManager:
+        {
+            if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) {
+                for (NIMChatroomNotificationMember * member in content.targets) {
+                    if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) {
+                        [self updateMenuItem:self.joinView isRemove:NO];
+                        break;
+                    }
+                }
+            }
+        }
+            break;
+        default:
+            break;
+    }
 }
 
-#pragma mark - UITableViewDataSource
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    // Return number of menu items
-    return 5; // Adjust based on your needs
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MenuCell"];
-    
-    // Configure cell based on index
-    // Add your menu items here
-    
-    return cell;
+#pragma mark- PIRoomEnterRedPacketViewDelegate
+-(void)openRedPacketWithModel:(XPRedPacketModel *)redModel{
+    if(self.openRedPacketHandle){
+        self.openRedPacketHandle(redModel,self.hostDelegate.getRoomInfo.type,NO);
+    }
 }
 
 #pragma mark - SDCycleScrollViewDelegate
@@ -551,11 +686,31 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     } else if ([info.code isEqualToString:@"FIND_LOVE"]) {
         [self lookLoveTapRecognizer];
     } else if ([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) {
-        
+        [self sailTapRecognizer];
     } else if ([info.code isEqualToString:@"SEIZE_TREASURE"]) {
-        
+        XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
+        fairyVC.roomUid =[NSString stringWithFormat:@"%ld",  self.hostDelegate.getRoomInfo.uid];
+        fairyVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight);
+        [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:fairyVC];
+        [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:fairyVC.view];
+        [UIView animateWithDuration:0.2 animations:^{
+            fairyVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
+        }completion:^(BOOL finished) {
+        }];
     } else {
-        
+        if (info.skipType == ActivitySkipType_Room) {
+            [self.hostDelegate exitRoom];
+            [XPRoomViewController openRoom:info.skipContent viewController:kWindow.rootViewController];
+        } else if(info.skipType == ActivitySkipType_Web) {
+            PIRoomActivityWebView * webView = [[PIRoomActivityWebView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
+            webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
+            webView.url = info.skipContent;
+            webView.infoList = infoList;
+            [kWindow addSubview:webView];
+            [UIView animateWithDuration:0.2 animations:^{
+                webView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
+            }];
+        }
     }
 }
 
@@ -588,23 +743,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 
 
 #pragma mark - Getters
-- (UITableView *)tableView {
-    if (!_tableView) {
-        _tableView = [[UITableView alloc] init];
-        _tableView.delegate = self;
-        _tableView.dataSource = self;
-        _tableView.transform = CGAffineTransformMakeScale(1, -1);
-        _tableView.backgroundColor = [UIColor clearColor];
-        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"MenuCell"];
-    }
-    return _tableView;
-}
-
 - (UIScrollView *)scrollView {
     if (!_scrollView) {
         _scrollView = [[UIScrollView alloc] init];
-        _scrollView.backgroundColor = [UIColor greenColor];
     }
     return _scrollView;
 }
@@ -617,6 +758,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         b.imageView.contentMode = UIViewContentModeScaleAspectFit;
         b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill;
         b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill;
+        b.tag = 101;
         _gambleMenuButton = b;
     }
     return _gambleMenuButton;
@@ -630,6 +772,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         b.imageView.contentMode = UIViewContentModeScaleAspectFit;
         b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill;
         b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill;
+        b.tag = 102;
         _configEntranceMenuButton = b;
     }
     return _configEntranceMenuButton;
@@ -638,9 +781,10 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 - (UIButton *)pkMenuButton {
     if (!_pkMenuButton) {
         UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom];
-        [b setImage:[UIImage imageNamed:@"room_pk_panel_mini_icon"] forState:UIControlStateNormal];
+        [b setBackgroundImage:[UIImage imageNamed:@"room_pk_panel_mini_icon"] forState:UIControlStateNormal];
         [b addTarget:self action:@selector(didTapPKMenuButton) forControlEvents:UIControlEventTouchUpInside];
-        b.imageView.contentMode = UIViewContentModeScaleAspectFill;
+        b.imageEdgeInsets = UIEdgeInsetsMake(4, 4, 4, 4);
+        b.tag = 105;
         _pkMenuButton = b;
     }
     return _pkMenuButton;
@@ -671,6 +815,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         _boomView.userInteractionEnabled = YES;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(displayBoomInfoProgress)];
         [_boomView addGestureRecognizer:tap];
+        _boomView.tag = 103;
     }
     return _boomView;
 }
@@ -683,6 +828,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         _joinView.contentMode = UIViewContentModeScaleAspectFit;
         UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapJoinDatingRecognizer)];
         [_joinView addGestureRecognizer:tap];
+        _joinView.tag = 104;
     }
     return _joinView;
 }
@@ -701,4 +847,23 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     return _loader_url_2;
 }
 
+- (UIButton *)expandButton {
+    if (!_expandButton) {
+        _expandButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_expandButton setImage:kImage(@"side_menu_open") forState:UIControlStateNormal];
+        [_expandButton addTarget:self action:@selector(didTapExpand) forControlEvents:UIControlEventTouchUpInside];
+        _expandButton.hidden = YES;
+    }
+    return _expandButton;
+}
+
+- (PIRoomEnterRedPacketView *)redPacketView{
+    if(!_redPacketView){
+        _redPacketView = [[PIRoomEnterRedPacketView alloc]initWithFrame:CGRectZero];
+        _redPacketView.hidden = YES;
+        _redPacketView.delegate = self;
+    }
+    return _redPacketView;
+}
+
 @end