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

修正 UI 效果和奇怪的进房bug

Browse Source
This commit is contained in:
eggmanQQQ
2024-06-24 15:38:22 +08:00
parent 3bab779261
commit 67253ea1b2
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m
View File

@@ -186,7 +186,7 @@ static CGFloat MiniHeight = 130.5;
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(pkTimeContent);
make.leading.mas_equalTo(pkMarkIcon.mas_trailing).offset(4);
make.trailing.mas_equalTo(pkTimeContent);
make.trailing.mas_equalTo(pkTimeContent).offset(-4);
}];
[self addSubview:self.helpButton];
@@ -669,12 +669,12 @@ static CGFloat MiniHeight = 130.5;
CGFloat progress = 1 - _pkPanelInfo.aPercent;
CGFloat width = CGRectGetWidth(self.progressView.bounds);
CGFloat centerX = progress * width;
[UIView animateWithDuration:0.1 animations:^{
[self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.progressView).offset(centerX - width / 2);
}];
[self layoutIfNeeded];
[self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.progressView).offset(centerX - width / 2);
}];
[self layoutIfNeeded];
} else {
self.redTitleLabel.text = @"";
self.redAvatarImageView.image = nil;

9
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m
View File

@@ -1273,7 +1273,7 @@
[transparentRoundedCornersBackgroundView addSubview:self.countDownLabel];
[self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(transparentRoundedCornersBackgroundView).offset(-0.5);
make.right.mas_equalTo(transparentRoundedCornersBackgroundView.mas_right).offset(-6);
make.right.mas_equalTo(transparentRoundedCornersBackgroundView.mas_right).offset(-12);
make.width.mas_greaterThanOrEqualTo(40);
}];
@@ -1317,7 +1317,8 @@
UIImageView *redPinImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_pk_panel_red_mark"]];
[self.progressArea addSubview:redPinImageView];
[redPinImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.mas_equalTo(self.progressArea);
make.top.mas_equalTo(self.progressArea);
make.left.mas_equalTo(self.progressArea);
make.size.mas_equalTo(CGSizeMake(47.5, 56.5));
}];
@@ -1332,8 +1333,8 @@
[self.redCountImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.progressArea);
make.centerY.mas_equalTo(self.progressArea).mas_offset(4);
make.left.mas_equalTo(self.progressArea).offset(47.5);
make.right.mas_equalTo(self.progressArea).offset(-47.5);
make.left.mas_equalTo(self.progressArea).offset(46);
make.right.mas_equalTo(self.progressArea).offset(-46);
make.height.mas_equalTo(14);
}];

8
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -1134,7 +1134,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
[self changeStageViewOnRoomUpdate];
[self.roomHeaderView onRoomEntered];
[self.activityContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
[self.backContainerView onRoomEntered];
[self.littleGameView onRoomEntered];
@@ -1145,10 +1145,16 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
[self.messageContainerView onRoomEntered];
} else {
//虽然没退出房间 但是队列还是要拿的
[self.stageView onRoomMiniEntered];
[self.messageContainerView onRoomMiniEntered];
[self.functionView onRoomMiniEntered];
[self.functionView onRoomEntered];
// PK 状态下，从最小化进房需要模仿出事化房间，丢 2 次 roominfo 进去
if (roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ||
roomInfo.roomModeType == RoomModeType_Open_PK_Mode) {
[self.functionView onRoomEntered];
}
}
[[XPRoomMiniManager shareManager] configRoomInfo:nil];
[[XPRoomMiniManager shareManager] configUserInfo:nil];