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

boom 重构暂存

Browse Source
This commit is contained in:
edwinQQQ
2025-03-25 15:22:01 +08:00
parent d9850e2c8b
commit bc9a02802d
18 changed files with 716 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m
View File

@@ -472,14 +472,6 @@ XPRoomGraffitiGiftAnimationViewDelegate
- (void)sortBannerQueue {
#if DEBUG
AttachmentModel *attachmentModel = [self.roomBannertModelsQueueV2 xpSafeObjectAtIndex:0];
if (attachmentModel) {
NSLog(@"内容：%@ | %@", [attachmentModel.data objectForKey:@"roomUid"], [attachmentModel.data objectForKey:@"uidList"]);
}
#endif
// TODO: 用户本人飘屏>房间内其他人飘屏>房间外飘屏
// MARK: 不一定能确定是 本人 触发的飘屏，飘屏的 ID 不一定存在。
RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo;
NSString *currentRoomUid = @(roomInfo.uid).stringValue;
NSString *currentUid = [AccountInfoStorage instance].getUid;
@@ -487,15 +479,15 @@ XPRoomGraffitiGiftAnimationViewDelegate
// 检查 obj1 的属性
NSArray *obj1UidList = [obj1.data valueForKey:@"uidList"];
NSString *obj1RoomUid = [obj1.data valueForKey:@"roomUid"];
NSNumber *obj1RoomUid = [obj1.data valueForKey:@"roomUid"];
BOOL obj1IsCurrentUser = obj1UidList && [obj1UidList containsObject:currentUid];
BOOL obj1IsCurrentRoom = obj1RoomUid && [obj1RoomUid isEqualToString:currentRoomUid];
BOOL obj1IsCurrentRoom = obj1RoomUid && [obj1RoomUid.stringValue isEqualToString:currentRoomUid];
// 检查 obj2 的属性
NSArray *obj2UidList = [obj2.data valueForKey:@"uidList"];
NSString *obj2RoomUid = [obj2.data valueForKey:@"roomUid"];
NSNumber *obj2RoomUid = [obj2.data valueForKey:@"roomUid"];
BOOL obj2IsCurrentUser = obj2UidList && [obj2UidList containsObject:currentUid];
BOOL obj2IsCurrentRoom = obj2RoomUid && [obj2RoomUid isEqualToString:currentRoomUid];
BOOL obj2IsCurrentRoom = obj2RoomUid && [obj2RoomUid.stringValue isEqualToString:currentRoomUid];
if (obj1IsCurrentUser && !obj2IsCurrentUser) {
return NSOrderedAscending;

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

@@ -379,12 +379,14 @@ XPCandyTreeInsufficientBalanceViewDelegate>
@kWeakify(self);
[[RoomBoomManager sharedManager] registerBoomExplosion:^(id _Nonnull sth) {
@kStrongify(self);
dispatch_async(dispatch_get_main_queue(), ^{
[RoomBoomExplosionView display:self.view with:sth complete:^{
}];
});
[self.presenter getBoomDetail:self.roomUid];
if (![sth isKindOfClass:[NSArray class]]) {
return;
}
dispatch_async(dispatch_get_main_queue(), ^{
[RoomBoomExplosionView display:self.view with:sth complete:^{ }];
});
} target:self];
[[RoomBoomManager sharedManager] registerBoomGiftDisplay:^(id _Nonnull sth) {
@@ -396,6 +398,9 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[[RoomBoomManager sharedManager] registerBoomEnterRoomExplosion:^(id _Nonnull sth) {
@kStrongify(self);
if (![sth isKindOfClass:[NSArray class]]) {
return;
}
dispatch_async(dispatch_get_main_queue(), ^{
[RoomBoomExplosionView display:self.view with:sth complete:^{