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

fix: 修正玩百顺游戏时，礼物动画会在最上层的问题

Browse Source
This commit is contained in:
eggmanQQQ
2024-08-13 14:18:08 +08:00
parent 218d312b73
commit 39f928be02
4 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
///是否加载了活动
@property (nonatomic,assign) BOOL isLoadActivity;
@property (nonatomic, strong) NetImageView *loader_url_1;
@property (nonatomic, strong) NetImageView *loader_url_2;
@end
@implementation XPRoomActivityContainerView
@@ -246,8 +249,10 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
if (model) {
@kWeakify(self);
if (model.icon2Url.length > 0) {
NetImageView *loader = [[NetImageView alloc] init];
[loader loadImageWithUrl:model.icon2Url
if (!_loader_url_2) {
_loader_url_2 = [[NetImageView alloc] init];
}
[self.loader_url_2 loadImageWithUrl:model.icon2Url
completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
@kStrongify(self);
[self.gambleMenuButton setImage:image forState:UIControlStateNormal];
@@ -255,8 +260,11 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
}
if (model.icon1Url.length > 0) {
NetImageView *loader = [[NetImageView alloc] init];
[loader loadImageWithUrl:model.icon1Url
if (!_loader_url_1) {
_loader_url_1 = [[NetImageView alloc] init];
}
self.loader_url_1 = [[NetImageView alloc] init];
[self.loader_url_1 loadImageWithUrl:model.icon1Url
completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
@kStrongify(self);
[self.configEntranceMenuButton setImage:image forState:UIControlStateNormal];
@@ -626,6 +634,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
}
[self.hostDelegate.getSuperView addSubview:vc.view];
[self.hostDelegate.getSuperView bringSubviewToFront:animationView];
vc.view.tag = 913;
}
}
}

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

@@ -194,7 +194,6 @@
[self addSubview:self.lowLevelView];
[self addSubview:self.middleLevelView];
[self addSubview:self.highLevleView];
}
- (void)initSubViewConstraints {
@@ -1981,13 +1980,11 @@
}
}
if (giftInfo.hasVggPic && giftInfo.vggUrl.length > 0 && [self.delegate getRoomInfo].hasAnimationEffect) {
[self largeGiftStopCarEffect:giftInfo.goldPrice];
[self playGiftEffect:giftInfo.vggUrl];
}
[[NSNotificationCenter defaultCenter] postNotificationName:@"kExchangeRoomAnimationViewAndGameViewIndex"
object:nil];
}
- (void)createGiftBannerViewAnimation:(GiftReceiveInfoModel *)receiveInfo {
@@ -2006,8 +2003,6 @@
}
}
- (NSArray<XPGiftBannerUserInfoModel *> *)makeBannerUsers {
NSArray<MicroQueueModel *> * microArray = [self.delegate getMicroQueue].allValues;
NSMutableArray * array = [NSMutableArray array];

1
YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m
View File

@@ -319,6 +319,7 @@
}
[self.hostDelegate.getSuperView addSubview:vc.view];
[self.hostDelegate.getSuperView bringSubviewToFront:animationView];
vc.view.tag = 913;
}
}

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

@@ -329,6 +329,23 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showRoomFirstChargeWindowFormNot:) name:kShowFirstRechargeView object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openRedPacketNotification:) name:@"kOpenRedPacketNotification" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showSendheadlineView:) name:@"kShowSendheadlineView" object:nil];
@kWeakify(self);
[[NSNotificationCenter defaultCenter] addObserverForName:@"kExchangeRoomAnimationViewAndGameViewIndex"
object:nil
queue:NSOperationQueue.mainQueue
usingBlock:^(NSNotification * _Nonnull notification) {
@kStrongify(self);
if (self.view.subviews.count > 0) {
UIView *topView = self.view.subviews.lastObject;
UIView *secondView = [self.view.subviews xpSafeObjectAtIndex:self.view.subviews.count-2];
if (secondView && secondView.tag == 913) {
NSInteger index1 = [self.view.subviews indexOfObject:topView];
NSInteger index2 = [self.view.subviews indexOfObject:secondView];
[self.view exchangeSubviewAtIndex:index1 withSubviewAtIndex:index2];
}
}
}];
}
- (void)setupNimSDK {