From 133b66d7322312c65b208148aae85612e9156706 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Tue, 5 Dec 2023 16:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yinmeng-ios/Podfile.lock | 2 +- .../yinmeng-ios.xcodeproj/project.pbxproj | 24 +++++++++---------- .../Mew/Party/View/MewPartyViewController.m | 16 +++++++------ .../View/Session/MewSessionViewController.m | 2 +- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/yinmeng-ios/Podfile.lock b/yinmeng-ios/Podfile.lock index f380380..01f05a0 100644 --- a/yinmeng-ios/Podfile.lock +++ b/yinmeng-ios/Podfile.lock @@ -156,4 +156,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: cc88fa05da662ee682fc0eeb502faab221faa032 -COCOAPODS: 1.14.2 +COCOAPODS: 1.12.1 diff --git a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj index b080f17..0b05151 100644 --- a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj @@ -48,6 +48,8 @@ 2370515C2B1D7CD500F5DE14 /* MEWRechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051452B1D7CD500F5DE14 /* MEWRechargeStorage.m */; }; 2370515D2B1D7CD500F5DE14 /* YYReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051492B1D7CD500F5DE14 /* YYReachability.m */; }; 2370515E2B1D7CD500F5DE14 /* NSObject+MEWExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370514B2B1D7CD500F5DE14 /* NSObject+MEWExtension.m */; }; + 237052C12B1F11D300F5DE14 /* MewHomeFilterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237052C02B1F11D300F5DE14 /* MewHomeFilterView.m */; }; + 237052C42B1F13AD00F5DE14 /* MewAudioPlayerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 237052C22B1F13AD00F5DE14 /* MewAudioPlayerManager.m */; }; 8C4D535A2AFD4CF600238AE6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D53582AFD4CF600238AE6 /* Main.storyboard */; }; 8C4D535C2AFD4CF700238AE6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535B2AFD4CF700238AE6 /* Assets.xcassets */; }; 8C4D535F2AFD4CF700238AE6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535D2AFD4CF700238AE6 /* LaunchScreen.storyboard */; }; @@ -149,7 +151,6 @@ 8C9C845B2B0C697A00A601BC /* Api+Main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83BE2B0C697A00A601BC /* Api+Main.m */; }; 8C9C845C2B0C697A00A601BC /* ClientConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83BF2B0C697A00A601BC /* ClientConfig.m */; }; 8C9C845D2B0C697A00A601BC /* MewHomePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83C52B0C697A00A601BC /* MewHomePresenter.m */; }; - 8C9C845E2B0C697A00A601BC /* AudioPlayerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83CA2B0C697A00A601BC /* AudioPlayerManager.m */; }; 8C9C845F2B0C697A00A601BC /* MewHomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83CC2B0C697A00A601BC /* MewHomeViewController.m */; }; 8C9C84602B0C697A00A601BC /* MewVoiceGuideView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83CF2B0C697A00A601BC /* MewVoiceGuideView.m */; }; 8C9C84612B0C697A00A601BC /* MewPushExclusiveVoiceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83D02B0C697A00A601BC /* MewPushExclusiveVoiceView.m */; }; @@ -160,7 +161,6 @@ 8C9C84662B0C697A00A601BC /* MewUserIntroductionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83DD2B0C697A00A601BC /* MewUserIntroductionView.m */; }; 8C9C84672B0C697A00A601BC /* MewHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83DE2B0C697A00A601BC /* MewHeaderView.m */; }; 8C9C84682B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83E02B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.m */; }; - 8C9C84692B0C697A00A601BC /* YMHomeFilterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83E22B0C697A00A601BC /* YMHomeFilterView.m */; }; 8C9C846A2B0C697A00A601BC /* Api+MewHome.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83E42B0C697A00A601BC /* Api+MewHome.m */; }; 8C9C846B2B0C697A00A601BC /* MewSocialMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83EC2B0C697A00A601BC /* MewSocialMicroView.m */; }; 8C9C846C2B0C697A00A601BC /* MewSocialStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83EE2B0C697A00A601BC /* MewSocialStageView.m */; }; @@ -281,6 +281,10 @@ 237051492B1D7CD500F5DE14 /* YYReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYReachability.m; sourceTree = ""; }; 2370514A2B1D7CD500F5DE14 /* MewHUDTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHUDTool.h; sourceTree = ""; }; 2370514B2B1D7CD500F5DE14 /* NSObject+MEWExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MEWExtension.m"; sourceTree = ""; }; + 237052BF2B1F11D300F5DE14 /* MewHomeFilterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHomeFilterView.h; sourceTree = ""; }; + 237052C02B1F11D300F5DE14 /* MewHomeFilterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewHomeFilterView.m; sourceTree = ""; }; + 237052C22B1F13AD00F5DE14 /* MewAudioPlayerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewAudioPlayerManager.m; sourceTree = ""; }; + 237052C32B1F13AD00F5DE14 /* MewAudioPlayerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewAudioPlayerManager.h; sourceTree = ""; }; 8C4D534C2AFD4CF600238AE6 /* yinmeng-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "yinmeng-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 8C4D53592AFD4CF600238AE6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 8C4D535B2AFD4CF700238AE6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -509,8 +513,6 @@ 8C9C83C42B0C697A00A601BC /* MewHomePresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHomePresenter.h; sourceTree = ""; }; 8C9C83C52B0C697A00A601BC /* MewHomePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewHomePresenter.m; sourceTree = ""; }; 8C9C83C72B0C697A00A601BC /* MewHomeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHomeProtocol.h; sourceTree = ""; }; - 8C9C83C92B0C697A00A601BC /* AudioPlayerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioPlayerManager.h; sourceTree = ""; }; - 8C9C83CA2B0C697A00A601BC /* AudioPlayerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioPlayerManager.m; sourceTree = ""; }; 8C9C83CC2B0C697A00A601BC /* MewHomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewHomeViewController.m; sourceTree = ""; }; 8C9C83CD2B0C697A00A601BC /* MewHomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHomeViewController.h; sourceTree = ""; }; 8C9C83CF2B0C697A00A601BC /* MewVoiceGuideView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewVoiceGuideView.m; sourceTree = ""; }; @@ -522,7 +524,6 @@ 8C9C83D52B0C697A00A601BC /* MewPlayVoiceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewPlayVoiceView.m; sourceTree = ""; }; 8C9C83D62B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRightFollowVoiceCollectionCell.h; sourceTree = ""; }; 8C9C83D72B0C697A00A601BC /* MewRightFollowVoiceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRightFollowVoiceView.m; sourceTree = ""; }; - 8C9C83D82B0C697A00A601BC /* YMHomeFilterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMHomeFilterView.h; sourceTree = ""; }; 8C9C83D92B0C697A00A601BC /* MewVoiceDiscView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewVoiceDiscView.h; sourceTree = ""; }; 8C9C83DA2B0C697A00A601BC /* MewPushExclusiveVoiceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewPushExclusiveVoiceView.h; sourceTree = ""; }; 8C9C83DB2B0C697A00A601BC /* MewVoiceGuideView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewVoiceGuideView.h; sourceTree = ""; }; @@ -532,7 +533,6 @@ 8C9C83DF2B0C697A00A601BC /* MewRightFollowVoiceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRightFollowVoiceView.h; sourceTree = ""; }; 8C9C83E02B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRightFollowVoiceCollectionCell.m; sourceTree = ""; }; 8C9C83E12B0C697A00A601BC /* MewPlayVoiceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewPlayVoiceView.h; sourceTree = ""; }; - 8C9C83E22B0C697A00A601BC /* YMHomeFilterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMHomeFilterView.m; sourceTree = ""; }; 8C9C83E42B0C697A00A601BC /* Api+MewHome.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+MewHome.m"; sourceTree = ""; }; 8C9C83E52B0C697A00A601BC /* Api+MewHome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+MewHome.h"; sourceTree = ""; }; 8C9C83EA2B0C697A00A601BC /* MewSocialStageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewSocialStageView.h; sourceTree = ""; }; @@ -1831,8 +1831,8 @@ 8C9C83C82B0C697A00A601BC /* Manager */ = { isa = PBXGroup; children = ( - 8C9C83C92B0C697A00A601BC /* AudioPlayerManager.h */, - 8C9C83CA2B0C697A00A601BC /* AudioPlayerManager.m */, + 237052C32B1F13AD00F5DE14 /* MewAudioPlayerManager.h */, + 237052C22B1F13AD00F5DE14 /* MewAudioPlayerManager.m */, ); path = Manager; sourceTree = ""; @@ -1859,7 +1859,6 @@ 8C9C83D52B0C697A00A601BC /* MewPlayVoiceView.m */, 8C9C83D62B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.h */, 8C9C83D72B0C697A00A601BC /* MewRightFollowVoiceView.m */, - 8C9C83D82B0C697A00A601BC /* YMHomeFilterView.h */, 8C9C83D92B0C697A00A601BC /* MewVoiceDiscView.h */, 8C9C83DA2B0C697A00A601BC /* MewPushExclusiveVoiceView.h */, 8C9C83DB2B0C697A00A601BC /* MewVoiceGuideView.h */, @@ -1869,7 +1868,8 @@ 8C9C83DF2B0C697A00A601BC /* MewRightFollowVoiceView.h */, 8C9C83E02B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.m */, 8C9C83E12B0C697A00A601BC /* MewPlayVoiceView.h */, - 8C9C83E22B0C697A00A601BC /* YMHomeFilterView.m */, + 237052BF2B1F11D300F5DE14 /* MewHomeFilterView.h */, + 237052C02B1F11D300F5DE14 /* MewHomeFilterView.m */, ); path = SubView; sourceTree = ""; @@ -2319,7 +2319,6 @@ 8C9C82B92B0C695600A601BC /* NSObject+AutoCoding.m in Sources */, 233757622B0CB577001D0B7F /* MewMessageContentImage.m in Sources */, 8C9C84772B0C697A00A601BC /* MewLoginPhoneView.m in Sources */, - 8C9C84692B0C697A00A601BC /* YMHomeFilterView.m in Sources */, 8C9C84532B0C697A00A601BC /* LoginForgetPasswordViewController.m in Sources */, 8C9C84752B0C697A00A601BC /* MewMineCollectionViewController.m in Sources */, 8C9C82AF2B0C695600A601BC /* TTAlertConfig.m in Sources */, @@ -2334,6 +2333,7 @@ 237051512B1D7CD500F5DE14 /* NSArray+MewSafe.m in Sources */, 2370515E2B1D7CD500F5DE14 /* NSObject+MEWExtension.m in Sources */, 233757652B0CB577001D0B7F /* MewSessionNavView.m in Sources */, + 237052C12B1F11D300F5DE14 /* MewHomeFilterView.m in Sources */, 8C9C84722B0C697A00A601BC /* MewPartyListCollectionViewCell.m in Sources */, 8C9C846F2B0C697A00A601BC /* MewRoomMessageTableCell.m in Sources */, 8C9C84282B0C697A00A601BC /* MewRoomMessageParser.m in Sources */, @@ -2396,7 +2396,6 @@ 8C92A80B2B0EEE73008F362C /* LoginVerifBindPhonePresenter.m in Sources */, 8C9C84502B0C697A00A601BC /* LoginVerifCodePresent.m in Sources */, 8C9C844C2B0C697A00A601BC /* CustomAttachmentDecoder.m in Sources */, - 8C9C845E2B0C697A00A601BC /* AudioPlayerManager.m in Sources */, 8C9C848C2B0D2B8500A601BC /* MewGiftReceiveInfoModel.m in Sources */, 8C9C84572B0C697A00A601BC /* Api+Login.m in Sources */, 2337575D2B0CB577001D0B7F /* MewSessionToolbarView.m in Sources */, @@ -2450,6 +2449,7 @@ 233757572B0CB577001D0B7F /* MewMessageMenuModel.m in Sources */, 8C9C844B2B0C697A00A601BC /* AttachmentModel.m in Sources */, 237051582B1D7CD500F5DE14 /* MEWTimer.m in Sources */, + 237052C42B1F13AD00F5DE14 /* MewAudioPlayerManager.m in Sources */, 237051562B1D7CD500F5DE14 /* MEWBase64.m in Sources */, 8C92A8112B0EEFAE008F362C /* LoginBindPhonePresent.m in Sources */, 8C9C84562B0C697A00A601BC /* LoginFullInfoViewController.m in Sources */, diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.m index c4de769..02eb62a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.m @@ -18,10 +18,11 @@ #import "MewPartyModel.h" #import "HomeRecommendRoomModel.h" /// Presenter -#import "YMHomePresenter.h" -#import "YMHomeProtocol.h" +#import "MewPartyPresenter.h" +#import "MewHomeProtocol.h" + +@interface MewPartyViewController () -@interface MewPartyViewController () @property (nonatomic, strong) UIImageView *contentBgImageView; // 多人派对 @@ -49,8 +50,9 @@ return YES; } -- (YMHomePresenter *)createPresenter { - return [[YMHomePresenter alloc] init]; +- (MewPartyPresenter *)createPresenter { + return [[MewPartyPresenter alloc] init]; + } #pragma mark - Life Cycle @@ -70,12 +72,12 @@ #pragma mark - Load Data - (void)mew_loadData { - [self.presenter homeRecommendRoomList]; + [self.presenter mew_partyRecommendRoomList]; } #pragma mark - YMHomeProtocol -- (void)mew_homeRecommendRoomListSuccess:(NSArray *)list { +- (void)mew_partyRecommendRoomListSuccess:(NSArray *)list { self.homeRecommendModels = list; [self.partyCollectionView reloadData]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.m index b53f037..0899fe9 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.m @@ -52,7 +52,7 @@ @end @implementation MewSessionViewController -- (BOOL)isHiddenNavBar { +- (BOOL)mew_isHiddenNavBar { return YES; } - (MewMessagePresenter *)createPresenter {