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

修复bug

Browse Source
This commit is contained in:
liyuhua
2023-09-27 16:06:18 +08:00
parent a51b4778e3
commit 954196efa5
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
View File

@@ -352,8 +352,8 @@
} else if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen){///星级厨房飘屏
if(attachment.second == Custom_Message_Sub_Star_Kitchen_Room)return;
NSInteger uid = 0;
if(attachment.data[@"uid"] != nil){
uid = [attachment.data[@"uid"] integerValue];
if(attachment.data[@"roomUid"] != nil){
uid = [attachment.data[@"roomUid"] integerValue];
}
if(attachment.second == Custom_Message_Sub_Star_Kitchen_Server && self.delegate.getRoomInfo.uid != uid){
return;
@@ -363,7 +363,7 @@
[self receiveTreasureFairyGiftHighLevel:attachment];
}else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){
PIBaseAnimationViewModel *giftNotifyInfo = [PIBaseAnimationViewModel modelWithJSON:attachment.data];
if(attachment.second == Custom_Message_Sub_Tarot_Intermediate && self.delegate.getRoomInfo.uid != giftNotifyInfo.uid){
if(attachment.second == Custom_Message_Sub_Tarot_Intermediate && self.delegate.getRoomInfo.uid != giftNotifyInfo.roomUid.integerValue){
return;
}
[self receiveTarotBanner:attachment];

2
YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m
View File

@@ -354,7 +354,7 @@
if (iPhoneXSeries) {
bottom = (47+kSafeAreaBottomHeight+30 + 70) * scale;
} else {
bottom = (47+10+70) * scale;
bottom = (47+10+70 + 30) * scale;
}
CGFloat width = rect.size.width * scale;
CGFloat height = rect.size.height * scale;

4
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m
View File

@@ -88,8 +88,8 @@
self.duraTime = 30;
self.voteType = RoomPKVoteModeType_GiftValue;
NSArray * array = self.hostDelegate.getRoomPKGroupTeamList;
self.redUserArray = [array safeObjectAtIndex1:0];
self.blueUserArray = [array safeObjectAtIndex1:1];
self.redUserArray = [NSMutableArray arrayWithArray:[array safeObjectAtIndex1:0]];
self.blueUserArray = [NSMutableArray arrayWithArray:[array safeObjectAtIndex1:1]];
for (RoomPKChooseUserModel * userInfo in self.redUserArray) {
userInfo.groupType = GroupType_default;
}

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

@@ -507,9 +507,14 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
make.top.mas_equalTo(self.roomHeaderView.mas_bottom).offset(26 + 4);
make.height.mas_equalTo(self.stageView.hightForStageView);
}];
CGFloat height = 70;
if (iPhoneXSeries) {
height = 70;
} else {
height = 50;
}
[self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(70);
make.height.mas_equalTo(height);
make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5);
make.left.mas_equalTo(self.view);
make.right.mas_equalTo(self.activityContainerView.mas_left).offset(-10);