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

開黑點單 & Bug fix

Browse Source
This commit is contained in:
eggmanQQQ
2024-07-11 10:06:33 +08:00
parent 8ba415a6b5
commit 0d950baaf4
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
YuMi.xcodeproj/project.pbxproj
View File

@@ -535,6 +535,14 @@
54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */; };
54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */; };
54C389672C24464600FD47B1 /* HomeMineRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */; };
54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */; };
54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */; };
54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */; };
54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */; };
54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */; };
54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */; };
54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */; };
54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */; };
54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */; };
54F469382C29C3B400A83655 /* XPMineAlbumTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */; };
54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693A2C2A984D00A83655 /* MedalModel.m */; };
@@ -2607,6 +2615,22 @@
54C389642C24448900FD47B1 /* XPHomeMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineProtocol.h; sourceTree = "<group>"; };
54C389652C24464600FD47B1 /* HomeMineRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeMineRoomModel.h; sourceTree = "<group>"; };
54C389662C24464600FD47B1 /* HomeMineRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeMineRoomModel.m; sourceTree = "<group>"; };
54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataGameMateTableViewCell.h; sourceTree = "<group>"; };
54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataGameMateTableViewCell.m; sourceTree = "<group>"; };
54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGameMateOrderView.h; sourceTree = "<group>"; };
54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGameMateOrderView.m; sourceTree = "<group>"; };
54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListViewController.h; sourceTree = "<group>"; };
54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListViewController.m; sourceTree = "<group>"; };
54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListTableViewCell.h; sourceTree = "<group>"; };
54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListTableViewCell.m; sourceTree = "<group>"; };
54C9A11A2C3D9EDD00C6D970 /* Api+GameOrder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+GameOrder.h"; sourceTree = "<group>"; };
54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+GameOrder.m"; sourceTree = "<group>"; };
54C9A11D2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGamePartnerInfoModel.h; sourceTree = "<group>"; };
54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGamePartnerInfoModel.m; sourceTree = "<group>"; };
54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderModel.h; sourceTree = "<group>"; };
54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderModel.m; sourceTree = "<group>"; };
54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderView.h; sourceTree = "<group>"; };
54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderView.m; sourceTree = "<group>"; };
54F469332C29711400A83655 /* XPMomentUserDataViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentUserDataViewController.h; sourceTree = "<group>"; };
54F469342C29711400A83655 /* XPMomentUserDataViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentUserDataViewController.m; sourceTree = "<group>"; };
54F469362C29C3B400A83655 /* XPMineAlbumTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAlbumTableViewCell.h; sourceTree = "<group>"; };
@@ -5293,6 +5317,8 @@
235714762BEC9E5E004C81D6 /* MSSessionContextHeadlinesView.m */,
234E50A32BF5E556005CB6D5 /* MessageContentChatHallHeadView.h */,
234E50A42BF5E556005CB6D5 /* MessageContentChatHallHeadView.m */,
54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */,
54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */,
);
path = Content;
sourceTree = "<group>";
@@ -7567,6 +7593,8 @@
235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */,
235714902BEDC9B1004C81D6 /* MSSessionPublicChatHalImageModel.h */,
235714912BEDC9B1004C81D6 /* MSSessionPublicChatHalImageModel.m */,
54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */,
54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */,
);
path = SesssionModel;
sourceTree = "<group>";
@@ -10718,6 +10746,8 @@
children = (
E8E70D7C26F2F19D00F03460 /* Api+Mine.h */,
E8E70D7D26F2F19D00F03460 /* Api+Mine.m */,
54C9A11A2C3D9EDD00C6D970 /* Api+GameOrder.h */,
54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */,
);
path = Api;
sourceTree = "<group>";
@@ -10747,6 +10777,8 @@
E8EEB90B26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m */,
9B734F74288A92FB00CBDAA9 /* XPMineFuntionItemModel.h */,
9B734F75288A92FB00CBDAA9 /* XPMineFuntionItemModel.m */,
54C9A11D2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.h */,
54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */,
);
path = Model;
sourceTree = "<group>";
@@ -10766,6 +10798,8 @@
E8E70D7F26F2F39000F03460 /* SubViews */,
E8E70D7526F2F15100F03460 /* XPMineViewController.h */,
E8E70D7626F2F15100F03460 /* XPMineViewController.m */,
54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */,
54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */,
23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */,
23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */,
23E9EA932A84BE4800B792F2 /* XPGiftUserDataViewController.h */,
@@ -10948,6 +10982,8 @@
236B2E552AA18E12003967A8 /* XPMIneGameCollectionViewCell.m */,
236B2E562AA18E12003967A8 /* XPMineGameTableViewCell.h */,
236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */,
54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */,
54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */,
);
path = Cell;
sourceTree = "<group>";
@@ -11016,6 +11052,10 @@
E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */,
E873EB00280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.h */,
E873EB01280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m */,
54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */,
54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */,
54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */,
54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */,
);
path = MineInfo;
sourceTree = "<group>";
@@ -11585,6 +11625,7 @@
E8AFF7E3298CA1E500FBDE32 /* SessionSayHelloCountModel.m in Sources */,
E8998D7A2859784200C68558 /* XPSVGAPlayer.m in Sources */,
23FE47D82BB3CEAF00F09D23 /* PINobleCenterTitleView.m in Sources */,
54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */,
9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */,
E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */,
54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */,
@@ -11673,6 +11714,7 @@
23CEFC502AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m in Sources */,
E87E545429AA05EA00EBE52B /* XPFootPrintNavView.m in Sources */,
E8252FEE27687DF1002B3164 /* ActivityInfoModel.m in Sources */,
54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */,
E84BF7D1277BFCDD00EF8877 /* RoomTagModel.m in Sources */,
E8AC723526F49939007D6E91 /* XPMineNotificaPresenter.m in Sources */,
1427218E29A75F6F00C7C423 /* HTTPMessage.m in Sources */,
@@ -11712,6 +11754,7 @@
E8E20BEC2816A5B90033B688 /* XPMineBlackListViewController.m in Sources */,
E8AC722F26F49610007D6E91 /* XPMineNotificationItemModel.m in Sources */,
E85410352864155A005CFD9F /* XPMonentDetailPresenter.m in Sources */,
54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */,
2331C1B12A60F32D00E1D940 /* XPCandyTreeGiftView.m in Sources */,
9B1B72BC28003E06003FACE9 /* XPAnchorPKTableViewCell.m in Sources */,
E8E70D7A26F2F16600F03460 /* XPMinePresent.m in Sources */,
@@ -11808,6 +11851,7 @@
E852D7412863249F001465ED /* XPMonentsReplyTableViewCell.m in Sources */,
237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */,
239D0FFA2C05BE9B002977CE /* MSRoomGameVictoryCell.m in Sources */,
54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */,
23E9EA942A84BE4800B792F2 /* XPGiftUserDataViewController.m in Sources */,
2331C16D2A5EB71000E1D940 /* XPNobleSettingNavView.m in Sources */,
E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */,
@@ -11933,6 +11977,7 @@
236B2E492AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m in Sources */,
2305EF042AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m in Sources */,
2305EEF02AD677F200AD403C /* PIRoomPhotoAlbumVC.m in Sources */,
54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */,
14B880E7299A4B62005FCA1B /* XPLoginPhoneViewController.m in Sources */,
E824544626F5934700BE8163 /* XPMinePayPwdPresenter.m in Sources */,
189DD54B26DE338800AB55B1 /* BaseViewController.m in Sources */,
@@ -12300,6 +12345,7 @@
E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */,
E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */,
9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */,
54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */,
23B8D8DE2B860B8800CA472F /* PIHoemCategoryCollectionView.m in Sources */,
9BE01AE728938AB600B50299 /* XPDressUpShopCardTableViewCell.m in Sources */,
E82E75062828E76400C25EF7 /* XPCoreDataManager.m in Sources */,
@@ -12380,6 +12426,7 @@
E8998D852859B4FA00C68558 /* XPMineUserInfoGiftView.m in Sources */,
23FE47E72BB4378700F09D23 /* PINobleCenterListModel.m in Sources */,
186A536B26FC6F2E00D67B2C /* XPShareItemCell.m in Sources */,
54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */,
237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */,
23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */,
9B42869228C1AED4009034D2 /* XPReceiveRedPacketModel.m in Sources */,
@@ -12426,6 +12473,7 @@
E81DCCD0282B63FD0039E5C5 /* XPMonentsRecommendViewController.m in Sources */,
9B7D804A2753783D003DAC0C /* SessionViewController.m in Sources */,
E85E7BA92A4EC99300B6D00A /* XPMineConfirmGiveDiamondView.m in Sources */,
54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */,
E85E7BA72A4EC99300B6D00A /* XPMineGiveDiamondPasswordView.m in Sources */,
2331C1742A5EB71000E1D940 /* XPNobleCenterResidueView.m in Sources */,
E80E2377299A47F60013FD40 /* AESUtils.m in Sources */,

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

@@ -1930,7 +1930,21 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
return;
}
// 非本房间不处理
NSString *publicChatRoomId = [NSString stringWithFormat:@"%@",[ClientConfig shareConfig].configInfo.publicChatRoomIdMap[self.userInfo.partitionId]];
if([message.session.sessionId isEqualToString:publicChatRoomId]){
// 非本房间不处理
if(message.messageType == NIMMessageTypeText) {
[self.messageContainerView handleNIMTextMessage:message];
}else if(message.messageType == NIMMessageTypeImage){
[self.messageContainerView handleNIMImageMessage:message];
}
return;
}
if (![message.session.sessionId isEqualToString:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]) {
return;
}
if (message.yidunAntiSpamRes) {
NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject;
id spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject;