diff --git a/.vscode/settings.json b/.vscode/settings.json index 07a1e0a3..e0910948 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,6 +23,7 @@ "Interitem", "kindof", "MAXFLOAT", + "Moli", "MSRTL", "NIMSDK", "Nonnull", diff --git a/YuMi/Modules/YMRoom/Manager/PublicRoomManager.m b/YuMi/Modules/YMRoom/Manager/PublicRoomManager.m index e10a8fed..39abf585 100644 --- a/YuMi/Modules/YMRoom/Manager/PublicRoomManager.m +++ b/YuMi/Modules/YMRoom/Manager/PublicRoomManager.m @@ -336,7 +336,7 @@ if (message.session.sessionType == NIMSessionTypeChatroom) { NSString *sessionId = message.session.sessionId; if ([sessionId isEqualToString:self.currentPublicRoomId]) { - NSLog(@"PublicRoomManager: 收到公共房间消息: %@", message.text); + NSLog(@"PublicRoomManager: 收到公共房间消息: %@", message.rawAttachContent); // 这里可以添加公共房间消息的处理逻辑 // TODO: 全服广播转移到此类 } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m index bd181835..b9dccb1f 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m @@ -3056,25 +3056,36 @@ XPRoomGraffitiGiftAnimationViewDelegate } PIBaseAnimationViewModel *model = self.animationListB.firstObject; - if(model.type == GiftBannerType_Lucky){ - [self createBigPrizeAnimation:model]; - }else if (model.type == GiftBannerType_Love){ - [self createCandyTreeBannerAnimation:model]; - }else if(model.type == GiftBannerType_Nobleman){ - [self createNobleLevelUpBannerAnimation:model]; - }else if(model.type == GiftBannerType_kitchen){ - [self createStarKitchenBannerAnimation:model]; - }else if(model.type == GiftBannerType_AnchorHour){ - [self createAnchorHourRankAnimation:model]; - }else if(model.type == GiftBannerType_LicneseHour){ - [self createAnchorHourRankAnimation:model]; - }else if(model.type == GiftBannerType_Fairy){ - [self createTreasureFairyBannerAnimation:model]; - - }else if(model.type == GiftBannerType_Magic_House){ - [self createGiftCompoundBannerAnimation:model]; - }else if (model.type == GiftBannerType_General_Floating_Screen){ - [self createGeneralFloatingScreenAnimation:model bannerModel:nil]; + switch (model.type) { + case GiftBannerType_Lucky: + [self createBigPrizeAnimation:model]; + break; + case GiftBannerType_Love: + [self createCandyTreeBannerAnimation:model]; + break; + case GiftBannerType_Nobleman: + [self createNobleLevelUpBannerAnimation:model]; + break; + case GiftBannerType_AnchorHour: + [self createAnchorHourRankAnimation:model]; + break; + case GiftBannerType_LicneseHour: + [self createAnchorHourRankAnimation:model]; + break; + case GiftBannerType_Fairy: + [self createTreasureFairyBannerAnimation:model]; + break; + case GiftBannerType_Magic_House: + [self createGiftCompoundBannerAnimation:model]; + break; + case GiftBannerType_General_Floating_Screen: + [self createGeneralFloatingScreenAnimation:model bannerModel:nil]; + break; + default: + // 其他未处理的枚举值类型 + // 可能包括但不限于：GiftBannerType_Unknown, GiftBannerType_Normal, + // GiftBannerType_Special, GiftBannerType_Event 等 + break; } } diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m index b246246c..ce5663e5 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m @@ -240,8 +240,7 @@ messageInfo.content = [self makeUserNameAttribute:message messageInfo:messageInfo]; messageInfo.rowHeight = 240; return messageInfo; - }else if(first == CustomMessageType_Guardian_Planet){ - return [self createGuardianPlanetAttribute:attachment messageInfo:messageInfo]; + }else if(first == CustomMessageType_General_Public_Screen){ return [self createGeneralPublicScreenAttribute:attachment messageInfo:messageInfo]; }else if(first == CustomMessageType_Super_Gift){ diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m index 8cdd8523..c80461a4 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m @@ -725,11 +725,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey"; @(Custom_Message_Sub_Treasure_Fairy_Convert_L2), @(Custom_Message_Sub_Treasure_Fairy_Convert_L3), nil], - @(CustomMessageType_Guardian_Planet): - [NSSet setWithObjects: - @(Custom_Message_Sub_Guardian_Planet_One_Room), - @(Custom_Message_Sub_Guardian_Planet_All_Room), - nil], + @(CustomMessageType_General_Public_Screen): [NSSet setWithObjects: @(Custom_Message_Sub_General_Public_Screen_One_Room), diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index 3e2d7786..7619bc60 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -2400,8 +2400,7 @@ XPCandyTreeInsufficientBalanceViewDelegate> BOOL isHave = NO; if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){ isHave = YES; - }else if(attachment.first == CustomMessageType_Guardian_Planet && attachment.second == Custom_Message_Sub_Guardian_Planet_All_Room){ - isHave = YES; + }else if(attachment.first == CustomMessageType_Super_Gift && (attachment.second == Custom_Message_Sub_Super_Gift || attachment.second == Custom_Message_Sub_Super_Gift_Room_Message)){ isHave = YES; diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 16ec7cec..ba26d68d 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -716,7 +716,7 @@ "XPLoginVerifBindPhoneViewController18" = "إذا كنت قد فقدت رقم هاتفك\nيرجى الاتصال بخدمة العملاء"; "XPRoomMessageParser1033333" = "تهانينا %@ لفوزه بمكافأة %@ مرات في المطبخ الفاخر، حصل على %@ من النقود!"; -"XPRoomMessageParser1033334" = "تهانينا %@ لهزيمته بنجاح لوحش في حراسة الكوكب، حصل على مكافأة %@ من النقود!"; + ///XPShareView.m "XPShareView0" = "تم النسخ بنجاح"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 7c2d2a7c..75d9e315 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -446,7 +446,7 @@ "LoginPresenter1" = "Login failed, please try again"; "XPRoomMessageParser1033333" = "Congratulations %@ on drawing %@ times the reward in Star Kitchen and obtaining %@ Coins!"; -"XPRoomMessageParser1033334" = "Congratulations %@ for successfully defeating monsters in Guardian Planet and obtaining %@ Coins rewards"; + "XPShareView0" = "Copy success"; "XPShareView1" = "Play O"; "XPShareView2" = "Please install the app"; diff --git a/YuMi/pt-BR.lproj/Localizable.strings b/YuMi/pt-BR.lproj/Localizable.strings index 233b4eaa..ccd09174 100644 --- a/YuMi/pt-BR.lproj/Localizable.strings +++ b/YuMi/pt-BR.lproj/Localizable.strings @@ -354,7 +354,7 @@ "LoginPresenter1" = "Login falhou, por favor tente novamente"; "XPRoomMessageParser1033333" = "Parabéns %@ por desenhar %@ vezes a recompensa na Cozinha Estrela e obter %@ Moedas!"; -"XPRoomMessageParser1033334" = "Parabéns %@ por derrotar com sucesso monstros no Planeta Guardião e obter %@ Moedas de recompensa"; + "XPShareView0" = "Cópia bem-sucedida"; "XPShareView1" = "Jogar O"; "XPShareView2" = "Por favor instale o aplicativo"; diff --git a/YuMi/tr.lproj/Localizable.strings b/YuMi/tr.lproj/Localizable.strings index 92629b0d..97118b41 100644 --- a/YuMi/tr.lproj/Localizable.strings +++ b/YuMi/tr.lproj/Localizable.strings @@ -40,7 +40,7 @@ "LoginPresenter1" = "Giriş başarısız, lütfen tekrar deneyin"; "XPRoomMessageParser1033333"="%@ tebrikler, Yıldızlı Mutfak'ta %@ kat ödül kazandı, %@ altın kazandı!"; -"XPRoomMessageParser1033334"="%@ tebrikler, Koruma Altındaki Gezegen'de canavarı başarıyla yendi, %@ altın ödül kazandı"; + ///XPShareView.m "XPShareView0" = "Bağlantı kopyalandı"; "XPShareView1" = "Oyna gel"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index cb0cde2c..2ef23cde 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -50,7 +50,7 @@ "LoginPresenter1" = "登錄失敗，請重試"; "XPRoomMessageParser1033333"="恭喜%@在星級廚房抽中 %@倍獎勵，獲得 %@金幣！"; -"XPRoomMessageParser1033334"="恭喜 %@ 在守護星球中成功擊敗怪獸，獲得%@金幣獎勵"; + ///XPShareView.m "XPShareView0" = "拷貝成功"; "XPShareView1" = "來玩奧";