moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1419

Browse Source 
1. 入口优化完成基本调整
2. 优化礼物面板加载逻辑
This commit is contained in:
eggmanQQQ
2024-07-23 17:24:46 +08:00
parent 3f5f8344df
commit 0899930a3f
21 changed files with 165 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m
View File

@@ -55,7 +55,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
@property(nonatomic,strong) PIRoomEnterRedPacketView *redPacketView;
///游戏菜单按钮
@property(nonatomic, strong) UIButton *gameMenuButton;
@property(nonatomic, strong) UIButton *gambleMenuButton;
///游戏菜单按钮
@property(nonatomic, strong) UIButton *pkMenuButton;
@@ -101,7 +101,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
[self.stackView addArrangedSubview:self.redPacketView];
[self.stackView addArrangedSubview:self.joinDatingView];
[self.stackView addArrangedSubview:self.pkMenuButton];
[self.stackView addArrangedSubview:self.gameMenuButton];
[self.stackView addArrangedSubview:self.gambleMenuButton];
}
- (void)initSubViewConstraints {
@@ -123,7 +123,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
make.size.mas_equalTo(CGSizeMake(76, 76));
}];
[self.gameMenuButton mas_makeConstraints:^(MASConstraintMaker *make) {
[self.gambleMenuButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(0);
make.size.mas_equalTo(CGSizeMake(76, 76));
}];
@@ -227,10 +227,10 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
- (void)onRoomUpdate {
RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo;
if (roomInfo.type == RoomType_Anchor || roomInfo.roomModeType == RoomModeType_Open_Blind) {
self.gameMenuButton.hidden = YES;
self.gambleMenuButton.hidden = YES;
self.pkMenuButton.hidden = YES;
} else {
self.gameMenuButton.hidden = NO;
self.gambleMenuButton.hidden = NO;
self.pkMenuButton.hidden = NO;
}
@@ -243,21 +243,21 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
self.redPacketView.type = roomInfo.type;
if (roomInfo.type == RoomType_MiniGame) {
self.redPacketView.hidden = YES;
[self.gameMenuButton removeFromSuperview];
[self.gambleMenuButton removeFromSuperview];
[self.pi_cycleScrollView removeFromSuperview];
[self.stackView insertArrangedSubview:self.gameMenuButton atIndex:0];
[self.stackView insertArrangedSubview:self.gambleMenuButton atIndex:0];
[self.stackView addArrangedSubview:self.pi_cycleScrollView];
[self.gameMenuButton bringSubviewToFront:self.stackView];
[self.gambleMenuButton bringSubviewToFront:self.stackView];
if (self.isLoadActivity) {
[self configLittleGameActivity];
} else {
[self requestActivityList];
}
} else {
[self.gameMenuButton removeFromSuperview];
[self.gambleMenuButton removeFromSuperview];
[self.pi_cycleScrollView removeFromSuperview];
[self.stackView insertArrangedSubview:self.pi_cycleScrollView atIndex:0];
[self.stackView addArrangedSubview:self.gameMenuButton];
[self.stackView addArrangedSubview:self.gambleMenuButton];
self.redPacketView.redPacketList = self.redPacketList;
NSMutableArray *picArray = [NSMutableArray array];
for (ActivityInfoModel *model in self.activityList) {
@@ -546,7 +546,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
}
- (void)didTapGameMenuButton {
MSRoomMenuGameVC *vc = [[MSRoomMenuGameVC alloc] initWithDelegate:self.hostDelegate roomMenuType:MSRoomMenuTypeLittleGame];
MSRoomMenuGameVC *vc = [[MSRoomMenuGameVC alloc] initWithDelegate:self.hostDelegate roomMenuType:MSRoomMenuTypeGame];
vc.modalPresentationStyle = UIModalPresentationOverFullScreen;
[self.hostDelegate.getCurrentNav presentViewController:vc animated:YES completion:nil];
}
@@ -662,15 +662,15 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
return _redPacketView;
}
- (UIButton *)gameMenuButton {
if (!_gameMenuButton) {
- (UIButton *)gambleMenuButton {
if (!_gambleMenuButton) {
UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom];
[b setImage:[UIImage imageNamed:@"ms_room_game_button"] forState:UIControlStateNormal];
[b addTarget:self action:@selector(didTapGameMenuButton) forControlEvents:UIControlEventTouchUpInside];
b.hidden = YES;
_gameMenuButton = b;
_gambleMenuButton = b;
}
return _gameMenuButton;
return _gambleMenuButton;
}
- (UIButton *)pkMenuButton {