From 7fe6cc9125a08229f347c032977c2c27ff3cf027 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Wed, 17 Jul 2024 17:49:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E5=8D=95=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 269 +++++++++--------- YuMi/Global/YUMIConstant.m | 2 +- .../Content/MessageContentMonentsView.m | 10 +- .../Content/MessageContentTextClickable.m | 14 +- .../SesssionModel/MessageMonentsModel.h | 4 +- .../SesssionModel/MessageMonentsModel.m | 4 +- .../Presenter/XPMineFootPrintPresenter.m | 2 +- .../Presenter/XPMineUserDataPresenter.m | 18 +- .../MineInfo/XPMineUserDataViewController.h | 4 +- .../MineInfo/XPMineUserDataViewController.m | 76 ++--- .../MineInfo/XPMineUserInfoViewController.m | 2 +- .../YMMine/View/XPMineViewController.m | 2 +- .../View/XPMomentUserDataViewController.h | 4 +- .../View/XPMomentUserDataViewController.m | 90 +++--- .../Api/{Api+Monents.h => Api+Moments.h} | 54 ++-- .../Api/{Api+Monents.m => Api+Moments.m} | 61 ++-- ...{MonentsInfoModel.h => MomentsInfoModel.h} | 12 +- ...{MonentsInfoModel.m => MomentsInfoModel.m} | 8 +- ...ListInfoModel.h => MomentsListInfoModel.h} | 6 +- ...ListInfoModel.m => MomentsListInfoModel.m} | 6 +- ...onentsTopicModel.h => MomentsTopicModel.h} | 2 +- ...onentsTopicModel.m => MomentsTopicModel.m} | 4 +- .../YMMonents/Model/MonentsInteractiveModel.h | 4 +- ...inePresenter.h => XPMomentMinePresenter.h} | 6 +- ...inePresenter.m => XPMomentMinePresenter.m} | 20 +- ...LayoutConfig.h => XPMomentsLayoutConfig.h} | 32 +-- ...LayoutConfig.m => XPMomentsLayoutConfig.m} | 188 ++++++------ ...senter.h => XPMomentsRecommendPresenter.h} | 12 +- ...senter.m => XPMomentsRecommendPresenter.m} | 59 ++-- ...senter.h => XPMomentsTopicListPresenter.h} | 2 +- ...senter.m => XPMomentsTopicListPresenter.m} | 22 +- .../Presenter/XPMonentDetailPresenter.m | 22 +- .../Presenter/XPMonentsAttentionPresenter.m | 14 +- .../Presenter/XPMonentsInteractivePresenter.m | 6 +- .../Presenter/XPMonentsLatestPresenter.m | 14 +- .../Presenter/XPMonentsPublishPresenter.h | 2 +- .../Presenter/XPMonentsPublishPresenter.m | 4 +- .../Presenter/XPMonentsTopicLatestPresenter.m | 14 +- .../XPMonentsTopicRecommendPresenter.m | 14 +- ...> XPMomentsDetailViewControllerDelegate.h} | 4 +- ...MineProtocol.h => XPMomentsMineProtocol.h} | 6 +- .../Protocol/XPMomentsRecommendProtocol.h | 29 ++ .../Protocol/XPMomentsTopicListProtocol.h | 21 ++ .../Protocol/XPMonentsAttentionProtocol.h | 4 +- .../Protocol/XPMonentsDetailProtocol.h | 4 +- .../Protocol/XPMonentsLatestProtocol.h | 4 +- .../Protocol/XPMonentsRecommendProtocol.h | 29 -- .../Protocol/XPMonentsTopicLatestProtocol.h | 4 +- .../Protocol/XPMonentsTopicListProtocol.h | 21 -- .../XPMonentsTopicRecommendProtocol.h | 4 +- .../Cell/XPMomentListCollectionViewCell.h | 4 +- .../Cell/XPMomentListCollectionViewCell.m | 6 +- ...ewCell.h => XPMomentsEmptyTableViewCell.h} | 2 +- ...ewCell.m => XPMomentsEmptyTableViewCell.m} | 6 +- .../View/Cell/XPMomentsTableViewCell.h | 40 +++ ...bleViewCell.m => XPMomentsTableViewCell.m} | 172 ++++++----- .../View/Cell/XPMonentsCommentTableViewCell.m | 2 +- .../Cell/XPMonentsReplyMoreTableViewCell.m | 2 +- .../View/Cell/XPMonentsReplyTableViewCell.m | 4 +- .../View/Cell/XPMonentsTableViewCell.h | 40 --- .../Cell/XPMonentsTopicCollectionViewCell.h | 4 +- .../Cell/XPMonentsTopicCollectionViewCell.m | 4 +- .../View/SubViews/XPMoentsTopicListView.h | 4 +- .../View/SubViews/XPMoentsTopicListView.m | 18 +- .../View/SubViews/XPMomentsContentView.h | 28 ++ ...tsContentView.m => XPMomentsContentView.m} | 18 +- .../View/SubViews/XPMomentsPhotoView.h | 26 ++ ...onentsPhotoView.m => XPMomentsPhotoView.m} | 52 ++-- .../SubViews/XPMomentsRecommendHeaderView.h | 28 ++ ...rView.m => XPMomentsRecommendHeaderView.m} | 20 +- .../View/SubViews/XPMomentsTooBarView.h | 32 +++ ...entsTooBarView.m => XPMomentsTooBarView.m} | 72 ++--- ...MoentsTopicView.h => XPMomentsTopicView.h} | 6 +- ...MoentsTopicView.m => XPMomentsTopicView.m} | 10 +- .../View/SubViews/XPMomentsUserInfoView.h | 32 +++ ...UserInfoView.m => XPMomentsUserInfoView.m} | 129 +++++---- .../View/SubViews/XPMonentsContentView.h | 28 -- .../View/SubViews/XPMonentsPhotoView.h | 26 -- .../View/SubViews/XPMonentsPublishTopicView.h | 4 +- .../View/SubViews/XPMonentsPublishTopicView.m | 4 +- .../SubViews/XPMonentsRecommendHeaderView.h | 28 -- .../View/SubViews/XPMonentsTooBarView.h | 32 --- .../View/SubViews/XPMonentsTopicHeaderView.h | 4 +- .../View/SubViews/XPMonentsTopicHeaderView.m | 4 +- .../View/SubViews/XPMonentsUserInfoView.h | 32 --- ...=> XPMomentTopicContainerViewController.h} | 2 +- ...=> XPMomentTopicContainerViewController.m} | 16 +- ...ller.h => XPMomentsDetailViewController.h} | 10 +- ...ller.m => XPMomentsDetailViewController.m} | 90 +++--- ...roller.h => XPMomentsMineViewController.h} | 6 +- ...roller.m => XPMomentsMineViewController.m} | 120 ++++---- ...r.h => XPMomentsRecommendViewController.h} | 2 +- ...r.m => XPMomentsRecommendViewController.m} | 174 +++++------ .../YMMonents/View/XPMomentsSimpleDetailNav.h | 4 +- .../YMMonents/View/XPMomentsSimpleDetailNav.m | 4 +- .../XPMomentsSimpleDetailViewController.h | 8 +- .../XPMomentsSimpleDetailViewController.m | 98 +++---- ...r.h => XPMomentsTopicListViewController.h} | 2 +- ...r.m => XPMomentsTopicListViewController.m} | 30 +- .../YMMonents/View/XPMomentsViewController.m | 8 +- .../View/XPMonentsAttentionViewController.m | 80 +++--- .../View/XPMonentsInteractiveViewController.m | 14 +- .../View/XPMonentsLatestViewController.m | 78 ++--- .../View/XPMonentsPublishViewController.h | 4 +- .../View/XPMonentsPublishViewController.m | 8 +- .../View/XPMonentsTopicLatestViewController.m | 70 ++--- .../XPMonentsTopicRecommondViewController.m | 78 ++--- YuMi/Modules/YMRoom/Api/Api+Room.h | 2 +- YuMi/Modules/YMRoom/Api/Api+Room.m | 2 +- .../YMRoom/Presenter/XPRoomPresenter.m | 2 +- .../YMTabbar/View/TabbarViewController.m | 6 +- YuMi/Modules/YMWeb/XPWebViewController.m | 4 +- YuMi/Structure/MVP/Model/UserInfoModel.h | 4 +- YuMi/Structure/MVP/Model/UserInfoModel.m | 2 +- YuMi/ar.lproj/Localizable.strings | 20 +- YuMi/en.lproj/Localizable.strings | 16 +- YuMi/zh-Hans.lproj/Localizable.strings | 8 +- YuMi/zh-Hant.lproj/Localizable.strings | 8 +- 118 files changed, 1557 insertions(+), 1565 deletions(-) rename YuMi/Modules/YMMonents/Api/{Api+Monents.h => Api+Moments.h} (74%) rename YuMi/Modules/YMMonents/Api/{Api+Monents.m => Api+Moments.m} (84%) rename YuMi/Modules/YMMonents/Model/{MonentsInfoModel.h => MomentsInfoModel.h} (91%) rename YuMi/Modules/YMMonents/Model/{MonentsInfoModel.m => MomentsInfoModel.m} (63%) rename YuMi/Modules/YMMonents/Model/{MonentsListInfoModel.h => MomentsListInfoModel.h} (65%) rename YuMi/Modules/YMMonents/Model/{MonentsListInfoModel.m => MomentsListInfoModel.m} (51%) rename YuMi/Modules/YMMonents/Model/{MonentsTopicModel.h => MomentsTopicModel.h} (93%) rename YuMi/Modules/YMMonents/Model/{MonentsTopicModel.m => MomentsTopicModel.m} (74%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentMinePresenter.h => XPMomentMinePresenter.h} (71%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentMinePresenter.m => XPMomentMinePresenter.m} (60%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentsLayoutConfig.h => XPMomentsLayoutConfig.h} (66%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentsLayoutConfig.m => XPMomentsLayoutConfig.m} (62%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentsRecommendPresenter.h => XPMomentsRecommendPresenter.h} (65%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentsRecommendPresenter.m => XPMomentsRecommendPresenter.m} (50%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentsTopicListPresenter.h => XPMomentsTopicListPresenter.h} (87%) rename YuMi/Modules/YMMonents/Presenter/{XPMonentsTopicListPresenter.m => XPMomentsTopicListPresenter.m} (59%) rename YuMi/Modules/YMMonents/Protocol/{XPMonentsDetailViewControllerDelegate.h => XPMomentsDetailViewControllerDelegate.h} (56%) rename YuMi/Modules/YMMonents/Protocol/{XPMonentsMineProtocol.h => XPMomentsMineProtocol.h} (64%) create mode 100644 YuMi/Modules/YMMonents/Protocol/XPMomentsRecommendProtocol.h create mode 100644 YuMi/Modules/YMMonents/Protocol/XPMomentsTopicListProtocol.h delete mode 100644 YuMi/Modules/YMMonents/Protocol/XPMonentsRecommendProtocol.h delete mode 100644 YuMi/Modules/YMMonents/Protocol/XPMonentsTopicListProtocol.h rename YuMi/Modules/YMMonents/View/Cell/{XPMonentsEmptyTableViewCell.h => XPMomentsEmptyTableViewCell.h} (74%) rename YuMi/Modules/YMMonents/View/Cell/{XPMonentsEmptyTableViewCell.m => XPMomentsEmptyTableViewCell.m} (94%) create mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h rename YuMi/Modules/YMMonents/View/Cell/{XPMonentsTableViewCell.m => XPMomentsTableViewCell.m} (65%) delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsTableViewCell.h create mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h rename YuMi/Modules/YMMonents/View/SubViews/{XPMonentsContentView.m => XPMomentsContentView.m} (94%) create mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h rename YuMi/Modules/YMMonents/View/SubViews/{XPMonentsPhotoView.m => XPMomentsPhotoView.m} (91%) create mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h rename YuMi/Modules/YMMonents/View/SubViews/{XPMonentsRecommendHeaderView.m => XPMomentsRecommendHeaderView.m} (93%) create mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h rename YuMi/Modules/YMMonents/View/SubViews/{XPMonentsTooBarView.m => XPMomentsTooBarView.m} (87%) rename YuMi/Modules/YMMonents/View/SubViews/{XPMoentsTopicView.h => XPMomentsTopicView.h} (55%) rename YuMi/Modules/YMMonents/View/SubViews/{XPMoentsTopicView.m => XPMomentsTopicView.m} (94%) create mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h rename YuMi/Modules/YMMonents/View/SubViews/{XPMonentsUserInfoView.m => XPMomentsUserInfoView.m} (82%) delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsContentView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.h rename YuMi/Modules/YMMonents/View/{XPMonentTopicContainerViewController.h => XPMomentTopicContainerViewController.h} (78%) rename YuMi/Modules/YMMonents/View/{XPMonentTopicContainerViewController.m => XPMomentTopicContainerViewController.m} (94%) rename YuMi/Modules/YMMonents/View/{XPMonentsDetailViewController.h => XPMomentsDetailViewController.h} (58%) rename YuMi/Modules/YMMonents/View/{XPMonentsDetailViewController.m => XPMomentsDetailViewController.m} (85%) rename YuMi/Modules/YMMonents/View/{XPMonentsMineViewController.h => XPMomentsMineViewController.h} (67%) rename YuMi/Modules/YMMonents/View/{XPMonentsMineViewController.m => XPMomentsMineViewController.m} (53%) rename YuMi/Modules/YMMonents/View/{XPMonentsRecommendViewController.h => XPMomentsRecommendViewController.h} (80%) rename YuMi/Modules/YMMonents/View/{XPMonentsRecommendViewController.m => XPMomentsRecommendViewController.m} (56%) rename YuMi/Modules/YMMonents/View/{XPMoentsTopicListViewController.h => XPMomentsTopicListViewController.h} (73%) rename YuMi/Modules/YMMonents/View/{XPMoentsTopicListViewController.m => XPMomentsTopicListViewController.m} (84%) diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 85c9f105..fe0b3060 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 140A7F52299CC69000841594 /* XPTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 140A7F51299CC69000841594 /* XPTabBar.m */; }; 1427212529A7566100C7C423 /* ZegoAudioRoom.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; }; 1427212629A7566100C7C423 /* ZegoAudioRoom.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 1427212C29A757EC00C7C423 /* MonentsListInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */; }; + 1427212C29A757EC00C7C423 /* MomentsListInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212A29A757EC00C7C423 /* MomentsListInfoModel.m */; }; 1427212F29A7599500C7C423 /* XPMonentsAttentionPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212D29A7599500C7C423 /* XPMonentsAttentionPresenter.m */; }; 1427213429A75A2600C7C423 /* XPMonentsLatestPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427213329A75A2600C7C423 /* XPMonentsLatestPresenter.m */; }; 1427218729A75F6F00C7C423 /* MyHTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427213729A75F6F00C7C423 /* MyHTTPConnection.m */; }; @@ -700,10 +700,10 @@ E801275527E3326000BAC3F2 /* XPRoomPKUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E801275427E3326000BAC3F2 /* XPRoomPKUserView.m */; }; E801275827E347FD00BAC3F2 /* RoomPKRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E801275727E347FD00BAC3F2 /* RoomPKRecordModel.m */; }; E80487652717DDD9008595F2 /* XPRoomMenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E80487642717DDD9008595F2 /* XPRoomMenuItem.m */; }; - E8098CA7282E00920090B9F0 /* Api+Monents.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CA6282E00920090B9F0 /* Api+Monents.m */; }; - E8098CAA282E03B40090B9F0 /* XPMonentsRecommendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CA9282E03B40090B9F0 /* XPMonentsRecommendPresenter.m */; }; - E8098CAE282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CAD282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m */; }; - E8098CB1282E86EF0090B9F0 /* XPMonentsContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB0282E86EF0090B9F0 /* XPMonentsContentView.m */; }; + E8098CA7282E00920090B9F0 /* Api+Moments.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CA6282E00920090B9F0 /* Api+Moments.m */; }; + E8098CAA282E03B40090B9F0 /* XPMomentsRecommendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CA9282E03B40090B9F0 /* XPMomentsRecommendPresenter.m */; }; + E8098CAE282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CAD282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m */; }; + E8098CB1282E86EF0090B9F0 /* XPMomentsContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB0282E86EF0090B9F0 /* XPMomentsContentView.m */; }; E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */; }; E80A086227F2AC190027B30C /* RoomPKDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */; }; E80A63DC28B86B9700690914 /* MessageContentMonentsAutoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */; }; @@ -935,8 +935,8 @@ E81A65312834E53600F55894 /* XPMonentsLatestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A65302834E53600F55894 /* XPMonentsLatestViewController.m */; }; E81A653F283511BE00F55894 /* XPMonentsInteractiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */; }; E81A65422835120200F55894 /* XPMonentsInteractivePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A65412835120200F55894 /* XPMonentsInteractivePresenter.m */; }; - E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A6545283519CA00F55894 /* MonentsTopicModel.m */; }; - E81A654928351B9500F55894 /* XPMonentsRecommendHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */; }; + E81A6546283519CA00F55894 /* MomentsTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A6545283519CA00F55894 /* MomentsTopicModel.m */; }; + E81A654928351B9500F55894 /* XPMomentsRecommendHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654828351B9500F55894 /* XPMomentsRecommendHeaderView.m */; }; E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */; }; E81AF32827F1EE69003B9E43 /* XPRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */; }; E81C1B1C27705F6B0020D1E4 /* XPArrangeMicPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1B27705F6B0020D1E4 /* XPArrangeMicPresenter.m */; }; @@ -957,7 +957,7 @@ E81C27AE26EF39AB0031E639 /* AppDelegate+ThirdConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C27AD26EF39AB0031E639 /* AppDelegate+ThirdConfig.m */; }; E81D58822720082A003063FE /* MicroWaveView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81D58812720082A003063FE /* MicroWaveView.m */; }; E81DCCCD282B63B40039E5C5 /* XPMomentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */; }; - E81DCCD0282B63FD0039E5C5 /* XPMonentsRecommendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCF282B63FD0039E5C5 /* XPMonentsRecommendViewController.m */; }; + E81DCCD0282B63FD0039E5C5 /* XPMomentsRecommendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCF282B63FD0039E5C5 /* XPMomentsRecommendViewController.m */; }; E81E09C9290F71BF00A1F410 /* XPAdvertiseView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09C8290F71BF00A1F410 /* XPAdvertiseView.m */; }; E81E09CC290F732600A1F410 /* XPAdImageTool.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09CB290F732600A1F410 /* XPAdImageTool.m */; }; E81E09CF290F750800A1F410 /* AdvertiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09CE290F750800A1F410 /* AdvertiseModel.m */; }; @@ -1066,7 +1066,7 @@ E84CBCE128436D3C00D43221 /* XPMineContactViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E84CBCE028436D3C00D43221 /* XPMineContactViewController.m */; }; E84CBCE4284372D800D43221 /* XPRoomHalfMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84CBCE3284372D800D43221 /* XPRoomHalfMessageView.m */; }; E84CBCE72843807500D43221 /* XPMineFriendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E84CBCE62843807400D43221 /* XPMineFriendPresenter.m */; }; - E852D73B286317F0001465ED /* XPMonentsDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D73A286317F0001465ED /* XPMonentsDetailViewController.m */; }; + E852D73B286317F0001465ED /* XPMomentsDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D73A286317F0001465ED /* XPMomentsDetailViewController.m */; }; E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D73D28631C18001465ED /* XPMonentsCommentTableViewCell.m */; }; E852D7412863249F001465ED /* XPMonentsReplyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D7402863249F001465ED /* XPMonentsReplyTableViewCell.m */; }; E852D74428633A08001465ED /* MonentsCommentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D74328633A08001465ED /* MonentsCommentModel.m */; }; @@ -1316,7 +1316,7 @@ E885D5362977CE28004DC088 /* SessionSettingModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E885D5352977CE28004DC088 /* SessionSettingModel.m */; }; E885D5392977D10E004DC088 /* SessionSettingUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E885D5382977D10E004DC088 /* SessionSettingUserView.m */; }; E885D53C2977FBFD004DC088 /* MessageTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E885D53B2977FBFD004DC088 /* MessageTimeView.m */; }; - E88749B6282B8FC600C3C7DB /* MonentsInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E88749B5282B8FC600C3C7DB /* MonentsInfoModel.m */; }; + E88749B6282B8FC600C3C7DB /* MomentsInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E88749B5282B8FC600C3C7DB /* MomentsInfoModel.m */; }; E88863C6278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863C5278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m */; }; E88863C9278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863C8278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m */; }; E88863CC278EC336004BCFAB /* AcrossRoomPKPrizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863CB278EC336004BCFAB /* AcrossRoomPKPrizeModel.m */; }; @@ -1341,11 +1341,11 @@ E890BC07273CF1800007C46B /* XPGiftCountCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E890BC06273CF1800007C46B /* XPGiftCountCollectionViewCell.m */; }; E890BC0D273D09A50007C46B /* XPGiftCountView.m in Sources */ = {isa = PBXBuildFile; fileRef = E890BC0C273D09A50007C46B /* XPGiftCountView.m */; }; E890BC10273D23F00007C46B /* GiftInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E890BC0F273D23F00007C46B /* GiftInfoModel.m */; }; - E8950180282CAC49007E459A /* XPMonentsUserInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E895017F282CAC49007E459A /* XPMonentsUserInfoView.m */; }; - E8950183282CAC6A007E459A /* XPMonentsPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950182282CAC6A007E459A /* XPMonentsPhotoView.m */; }; - E8950186282CAC80007E459A /* XPMonentsTooBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950185282CAC80007E459A /* XPMonentsTooBarView.m */; }; - E8950189282CFFB1007E459A /* XPMonentsLayoutConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950188282CFFB1007E459A /* XPMonentsLayoutConfig.m */; }; - E895018C282D0701007E459A /* XPMoentsTopicView.m in Sources */ = {isa = PBXBuildFile; fileRef = E895018B282D0701007E459A /* XPMoentsTopicView.m */; }; + E8950180282CAC49007E459A /* XPMomentsUserInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E895017F282CAC49007E459A /* XPMomentsUserInfoView.m */; }; + E8950183282CAC6A007E459A /* XPMomentsPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950182282CAC6A007E459A /* XPMomentsPhotoView.m */; }; + E8950186282CAC80007E459A /* XPMomentsTooBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950185282CAC80007E459A /* XPMomentsTooBarView.m */; }; + E8950189282CFFB1007E459A /* XPMomentsLayoutConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950188282CFFB1007E459A /* XPMomentsLayoutConfig.m */; }; + E895018C282D0701007E459A /* XPMomentsTopicView.m in Sources */ = {isa = PBXBuildFile; fileRef = E895018B282D0701007E459A /* XPMomentsTopicView.m */; }; E896EF942771AAC100AD2CC1 /* XPMineFansPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EF932771AAC100AD2CC1 /* XPMineFansPresenter.m */; }; E896EF972771AAE400AD2CC1 /* XPMineAttentionPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EF962771AAE400AD2CC1 /* XPMineAttentionPresenter.m */; }; E896EF9C2771AE6B00AD2CC1 /* XPMineFansViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EF9B2771AE6B00AD2CC1 /* XPMineFansViewController.m */; }; @@ -1404,16 +1404,16 @@ E8A88D3027E85EEA00CA8837 /* RoomPKInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A88D2F27E85EEA00CA8837 /* RoomPKInfoModel.m */; }; E8AA6EEF27DF1E6B009B4C2B /* XPRoomTopicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AA6EEE27DF1E6B009B4C2B /* XPRoomTopicViewController.m */; }; E8AA6EF227DF1E97009B4C2B /* XPRoomTopicPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AA6EF127DF1E97009B4C2B /* XPRoomTopicPresenter.m */; }; - E8AB630D28ADD8C60023B0D2 /* XPMonentTopicContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB630C28ADD8C60023B0D2 /* XPMonentTopicContainerViewController.m */; }; + E8AB630D28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB630C28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m */; }; E8AB631028ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB630F28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m */; }; E8AB631328ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631228ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m */; }; E8AB631628ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631528ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m */; }; E8AB631928ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631828ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m */; }; E8AB631C28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631B28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m */; }; - E8AB632428AE10310023B0D2 /* XPMoentsTopicListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632328AE10310023B0D2 /* XPMoentsTopicListViewController.m */; }; - E8AB632728AE13210023B0D2 /* XPMonentsTopicListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632628AE13210023B0D2 /* XPMonentsTopicListPresenter.m */; }; - E8AB632C28AE19600023B0D2 /* XPMonentsMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632B28AE19600023B0D2 /* XPMonentsMineViewController.m */; }; - E8AB632F28AE19DE0023B0D2 /* XPMonentMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632E28AE19DE0023B0D2 /* XPMonentMinePresenter.m */; }; + E8AB632428AE10310023B0D2 /* XPMomentsTopicListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632328AE10310023B0D2 /* XPMomentsTopicListViewController.m */; }; + E8AB632728AE13210023B0D2 /* XPMomentsTopicListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632628AE13210023B0D2 /* XPMomentsTopicListPresenter.m */; }; + E8AB632C28AE19600023B0D2 /* XPMomentsMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632B28AE19600023B0D2 /* XPMomentsMineViewController.m */; }; + E8AB632F28AE19DE0023B0D2 /* XPMomentMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632E28AE19DE0023B0D2 /* XPMomentMinePresenter.m */; }; E8AB633328AE51470023B0D2 /* XPSailingPrizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB633228AE51470023B0D2 /* XPSailingPrizeView.m */; }; E8AB633628AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB633528AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m */; }; E8AC721026F43955007D6E91 /* UIImageConstant.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC720F26F43955007D6E91 /* UIImageConstant.m */; }; @@ -1489,7 +1489,7 @@ E8D4DE472940473500EC788D /* GiftTwelveStarFirstModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4DE462940473500EC788D /* GiftTwelveStarFirstModel.m */; }; E8D55C9D28113218006935A5 /* MessageMenuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D55C9C28113218006935A5 /* MessageMenuModel.m */; }; E8D55CA0281186D6006935A5 /* SessionAudioRecordView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D55C9F281186D6006935A5 /* SessionAudioRecordView.m */; }; - E8D7D74B282BA1EC0007D7BD /* XPMonentsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D7D74A282BA1EC0007D7BD /* XPMonentsTableViewCell.m */; }; + E8D7D74B282BA1EC0007D7BD /* XPMomentsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D7D74A282BA1EC0007D7BD /* XPMomentsTableViewCell.m */; }; E8DAC5AC2858305A00012CFD /* XPRoomMessageBubbleView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DAC5AB2858305A00012CFD /* XPRoomMessageBubbleView.m */; }; E8DACCFB2766EDC60052092C /* MicroGiftValueView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DACCFA2766EDC60052092C /* MicroGiftValueView.m */; }; E8DACCFE27673F870052092C /* GiftValueInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DACCFD27673F870052092C /* GiftValueInfoModel.m */; }; @@ -1580,8 +1580,8 @@ 140A7F50299CC69000841594 /* XPTabBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTabBar.h; sourceTree = ""; }; 140A7F51299CC69000841594 /* XPTabBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTabBar.m; sourceTree = ""; }; 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ZegoAudioRoom.framework; sourceTree = ""; }; - 1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MonentsListInfoModel.m; sourceTree = ""; }; - 1427212B29A757EC00C7C423 /* MonentsListInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonentsListInfoModel.h; sourceTree = ""; }; + 1427212A29A757EC00C7C423 /* MomentsListInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MomentsListInfoModel.m; sourceTree = ""; }; + 1427212B29A757EC00C7C423 /* MomentsListInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MomentsListInfoModel.h; sourceTree = ""; }; 1427212D29A7599500C7C423 /* XPMonentsAttentionPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMonentsAttentionPresenter.m; sourceTree = ""; }; 1427212E29A7599500C7C423 /* XPMonentsAttentionPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMonentsAttentionPresenter.h; sourceTree = ""; }; 1427213029A759D200C7C423 /* XPMonentsAttentionProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMonentsAttentionProtocol.h; sourceTree = ""; }; @@ -1660,7 +1660,7 @@ 14DCAD0D299B6AD900A7DD31 /* XPForgetPwdViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPForgetPwdViewController.m; sourceTree = ""; }; 14EB640729A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsSimpleDetailViewController.h; sourceTree = ""; }; 14EB640829A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsSimpleDetailViewController.m; sourceTree = ""; }; - 14EB640A29A5BEE800A4A00B /* XPMonentsDetailViewControllerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsDetailViewControllerDelegate.h; sourceTree = ""; }; + 14EB640A29A5BEE800A4A00B /* XPMomentsDetailViewControllerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsDetailViewControllerDelegate.h; sourceTree = ""; }; 14EB640B29A5C16000A4A00B /* XPMomentsSimpleDetailNav.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsSimpleDetailNav.h; sourceTree = ""; }; 14EB640C29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsSimpleDetailNav.m; sourceTree = ""; }; 180116F7279E8C4C00F2CBC0 /* PLTimeUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLTimeUtil.h; sourceTree = ""; }; @@ -2955,15 +2955,15 @@ E801275727E347FD00BAC3F2 /* RoomPKRecordModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKRecordModel.m; sourceTree = ""; }; E80487632717DDD9008595F2 /* XPRoomMenuItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuItem.h; sourceTree = ""; }; E80487642717DDD9008595F2 /* XPRoomMenuItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuItem.m; sourceTree = ""; }; - E8098CA5282E00920090B9F0 /* Api+Monents.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Monents.h"; sourceTree = ""; }; - E8098CA6282E00920090B9F0 /* Api+Monents.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Monents.m"; sourceTree = ""; }; - E8098CA8282E03B40090B9F0 /* XPMonentsRecommendPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsRecommendPresenter.h; sourceTree = ""; }; - E8098CA9282E03B40090B9F0 /* XPMonentsRecommendPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsRecommendPresenter.m; sourceTree = ""; }; - E8098CAB282E04870090B9F0 /* XPMonentsRecommendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsRecommendProtocol.h; sourceTree = ""; }; - E8098CAC282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsEmptyTableViewCell.h; sourceTree = ""; }; - E8098CAD282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsEmptyTableViewCell.m; sourceTree = ""; }; - E8098CAF282E86EF0090B9F0 /* XPMonentsContentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsContentView.h; sourceTree = ""; }; - E8098CB0282E86EF0090B9F0 /* XPMonentsContentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsContentView.m; sourceTree = ""; }; + E8098CA5282E00920090B9F0 /* Api+Moments.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Moments.h"; sourceTree = ""; }; + E8098CA6282E00920090B9F0 /* Api+Moments.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Moments.m"; sourceTree = ""; }; + E8098CA8282E03B40090B9F0 /* XPMomentsRecommendPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendPresenter.h; sourceTree = ""; }; + E8098CA9282E03B40090B9F0 /* XPMomentsRecommendPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsRecommendPresenter.m; sourceTree = ""; }; + E8098CAB282E04870090B9F0 /* XPMomentsRecommendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendProtocol.h; sourceTree = ""; }; + E8098CAC282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsEmptyTableViewCell.h; sourceTree = ""; }; + E8098CAD282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsEmptyTableViewCell.m; sourceTree = ""; }; + E8098CAF282E86EF0090B9F0 /* XPMomentsContentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsContentView.h; sourceTree = ""; }; + E8098CB0282E86EF0090B9F0 /* XPMomentsContentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsContentView.m; sourceTree = ""; }; E8098CB2282E97550090B9F0 /* XPMineBlackListPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListPresenter.h; sourceTree = ""; }; E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineBlackListPresenter.m; sourceTree = ""; }; E8098CB6282E97AC0090B9F0 /* XPMineBlackListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListProtocol.h; sourceTree = ""; }; @@ -3259,10 +3259,10 @@ E81A65402835120200F55894 /* XPMonentsInteractivePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractivePresenter.h; sourceTree = ""; }; E81A65412835120200F55894 /* XPMonentsInteractivePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsInteractivePresenter.m; sourceTree = ""; }; E81A65432835121000F55894 /* XPMonentsInteractiveProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractiveProtocol.h; sourceTree = ""; }; - E81A6544283519CA00F55894 /* MonentsTopicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonentsTopicModel.h; sourceTree = ""; }; - E81A6545283519CA00F55894 /* MonentsTopicModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonentsTopicModel.m; sourceTree = ""; }; - E81A654728351B9500F55894 /* XPMonentsRecommendHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsRecommendHeaderView.h; sourceTree = ""; }; - E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsRecommendHeaderView.m; sourceTree = ""; }; + E81A6544283519CA00F55894 /* MomentsTopicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MomentsTopicModel.h; sourceTree = ""; }; + E81A6545283519CA00F55894 /* MomentsTopicModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MomentsTopicModel.m; sourceTree = ""; }; + E81A654728351B9500F55894 /* XPMomentsRecommendHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendHeaderView.h; sourceTree = ""; }; + E81A654828351B9500F55894 /* XPMomentsRecommendHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsRecommendHeaderView.m; sourceTree = ""; }; E81A654A28351D9900F55894 /* XPMonentsTopicCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicCollectionViewCell.h; sourceTree = ""; }; E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicCollectionViewCell.m; sourceTree = ""; }; E81AF32627F1EE69003B9E43 /* XPRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelUserView.h; sourceTree = ""; }; @@ -3304,8 +3304,8 @@ E81D58812720082A003063FE /* MicroWaveView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroWaveView.m; sourceTree = ""; }; E81DCCCB282B63B40039E5C5 /* XPMomentsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsViewController.h; sourceTree = ""; }; E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsViewController.m; sourceTree = ""; }; - E81DCCCE282B63FD0039E5C5 /* XPMonentsRecommendViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsRecommendViewController.h; sourceTree = ""; }; - E81DCCCF282B63FD0039E5C5 /* XPMonentsRecommendViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsRecommendViewController.m; sourceTree = ""; }; + E81DCCCE282B63FD0039E5C5 /* XPMomentsRecommendViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendViewController.h; sourceTree = ""; }; + E81DCCCF282B63FD0039E5C5 /* XPMomentsRecommendViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsRecommendViewController.m; sourceTree = ""; }; E81E09C7290F71BF00A1F410 /* XPAdvertiseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAdvertiseView.h; sourceTree = ""; }; E81E09C8290F71BF00A1F410 /* XPAdvertiseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAdvertiseView.m; sourceTree = ""; }; E81E09CA290F732500A1F410 /* XPAdImageTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAdImageTool.h; sourceTree = ""; }; @@ -3526,8 +3526,8 @@ E84CBCE52843807400D43221 /* XPMineFriendPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendPresenter.h; sourceTree = ""; }; E84CBCE62843807400D43221 /* XPMineFriendPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFriendPresenter.m; sourceTree = ""; }; E84CBCE8284380B300D43221 /* XPMineFriendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendProtocol.h; sourceTree = ""; }; - E852D739286317F0001465ED /* XPMonentsDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsDetailViewController.h; sourceTree = ""; }; - E852D73A286317F0001465ED /* XPMonentsDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsDetailViewController.m; sourceTree = ""; }; + E852D739286317F0001465ED /* XPMomentsDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsDetailViewController.h; sourceTree = ""; }; + E852D73A286317F0001465ED /* XPMomentsDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsDetailViewController.m; sourceTree = ""; }; E852D73C28631C18001465ED /* XPMonentsCommentTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsCommentTableViewCell.h; sourceTree = ""; }; E852D73D28631C18001465ED /* XPMonentsCommentTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsCommentTableViewCell.m; sourceTree = ""; }; E852D73F2863249F001465ED /* XPMonentsReplyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsReplyTableViewCell.h; sourceTree = ""; }; @@ -4054,8 +4054,8 @@ E885D5382977D10E004DC088 /* SessionSettingUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionSettingUserView.m; sourceTree = ""; }; E885D53A2977FBFD004DC088 /* MessageTimeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTimeView.h; sourceTree = ""; }; E885D53B2977FBFD004DC088 /* MessageTimeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTimeView.m; sourceTree = ""; }; - E88749B4282B8FC600C3C7DB /* MonentsInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonentsInfoModel.h; sourceTree = ""; }; - E88749B5282B8FC600C3C7DB /* MonentsInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonentsInfoModel.m; sourceTree = ""; }; + E88749B4282B8FC600C3C7DB /* MomentsInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MomentsInfoModel.h; sourceTree = ""; }; + E88749B5282B8FC600C3C7DB /* MomentsInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MomentsInfoModel.m; sourceTree = ""; }; E88863C4278EAFC3004BCFAB /* XPAcrossRoomPKResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKResultView.h; sourceTree = ""; }; E88863C5278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKResultView.m; sourceTree = ""; }; E88863C7278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKForceEndResultView.h; sourceTree = ""; }; @@ -4104,16 +4104,16 @@ E890BC0C273D09A50007C46B /* XPGiftCountView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftCountView.m; sourceTree = ""; }; E890BC0E273D23F00007C46B /* GiftInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftInfoModel.h; sourceTree = ""; }; E890BC0F273D23F00007C46B /* GiftInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftInfoModel.m; sourceTree = ""; }; - E895017E282CAC49007E459A /* XPMonentsUserInfoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsUserInfoView.h; sourceTree = ""; }; - E895017F282CAC49007E459A /* XPMonentsUserInfoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsUserInfoView.m; sourceTree = ""; }; - E8950181282CAC6A007E459A /* XPMonentsPhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPhotoView.h; sourceTree = ""; }; - E8950182282CAC6A007E459A /* XPMonentsPhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsPhotoView.m; sourceTree = ""; }; - E8950184282CAC80007E459A /* XPMonentsTooBarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTooBarView.h; sourceTree = ""; }; - E8950185282CAC80007E459A /* XPMonentsTooBarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTooBarView.m; sourceTree = ""; }; - E8950187282CFFB1007E459A /* XPMonentsLayoutConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsLayoutConfig.h; sourceTree = ""; }; - E8950188282CFFB1007E459A /* XPMonentsLayoutConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsLayoutConfig.m; sourceTree = ""; }; - E895018A282D0701007E459A /* XPMoentsTopicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMoentsTopicView.h; sourceTree = ""; }; - E895018B282D0701007E459A /* XPMoentsTopicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMoentsTopicView.m; sourceTree = ""; }; + E895017E282CAC49007E459A /* XPMomentsUserInfoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsUserInfoView.h; sourceTree = ""; }; + E895017F282CAC49007E459A /* XPMomentsUserInfoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsUserInfoView.m; sourceTree = ""; }; + E8950181282CAC6A007E459A /* XPMomentsPhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsPhotoView.h; sourceTree = ""; }; + E8950182282CAC6A007E459A /* XPMomentsPhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsPhotoView.m; sourceTree = ""; }; + E8950184282CAC80007E459A /* XPMomentsTooBarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTooBarView.h; sourceTree = ""; }; + E8950185282CAC80007E459A /* XPMomentsTooBarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTooBarView.m; sourceTree = ""; }; + E8950187282CFFB1007E459A /* XPMomentsLayoutConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsLayoutConfig.h; sourceTree = ""; }; + E8950188282CFFB1007E459A /* XPMomentsLayoutConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsLayoutConfig.m; sourceTree = ""; }; + E895018A282D0701007E459A /* XPMomentsTopicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicView.h; sourceTree = ""; }; + E895018B282D0701007E459A /* XPMomentsTopicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTopicView.m; sourceTree = ""; }; E896EF922771AAC100AD2CC1 /* XPMineFansPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFansPresenter.h; sourceTree = ""; }; E896EF932771AAC100AD2CC1 /* XPMineFansPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFansPresenter.m; sourceTree = ""; }; E896EF952771AAE400AD2CC1 /* XPMineAttentionPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAttentionPresenter.h; sourceTree = ""; }; @@ -4237,8 +4237,8 @@ E8AA6EF027DF1E97009B4C2B /* XPRoomTopicPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTopicPresenter.h; sourceTree = ""; }; E8AA6EF127DF1E97009B4C2B /* XPRoomTopicPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTopicPresenter.m; sourceTree = ""; }; E8AA6EF327DF1EB6009B4C2B /* XPRoomTopicProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTopicProtocol.h; sourceTree = ""; }; - E8AB630B28ADD8C60023B0D2 /* XPMonentTopicContainerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentTopicContainerViewController.h; sourceTree = ""; }; - E8AB630C28ADD8C60023B0D2 /* XPMonentTopicContainerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentTopicContainerViewController.m; sourceTree = ""; }; + E8AB630B28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentTopicContainerViewController.h; sourceTree = ""; }; + E8AB630C28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentTopicContainerViewController.m; sourceTree = ""; }; E8AB630E28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicRecommondViewController.h; sourceTree = ""; }; E8AB630F28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicRecommondViewController.m; sourceTree = ""; }; E8AB631128ADDCF20023B0D2 /* XPMonentsTopicHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicHeaderView.h; sourceTree = ""; }; @@ -4251,16 +4251,16 @@ E8AB631B28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicLatestPresenter.m; sourceTree = ""; }; E8AB632028ADE5720023B0D2 /* XPMonentsTopicRecommendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicRecommendProtocol.h; sourceTree = ""; }; E8AB632128ADE5880023B0D2 /* XPMonentsTopicLatestProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicLatestProtocol.h; sourceTree = ""; }; - E8AB632228AE10310023B0D2 /* XPMoentsTopicListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMoentsTopicListViewController.h; sourceTree = ""; }; - E8AB632328AE10310023B0D2 /* XPMoentsTopicListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMoentsTopicListViewController.m; sourceTree = ""; }; - E8AB632528AE13210023B0D2 /* XPMonentsTopicListPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicListPresenter.h; sourceTree = ""; }; - E8AB632628AE13210023B0D2 /* XPMonentsTopicListPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicListPresenter.m; sourceTree = ""; }; - E8AB632928AE15070023B0D2 /* XPMonentsTopicListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicListProtocol.h; sourceTree = ""; }; - E8AB632A28AE19600023B0D2 /* XPMonentsMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsMineViewController.h; sourceTree = ""; }; - E8AB632B28AE19600023B0D2 /* XPMonentsMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsMineViewController.m; sourceTree = ""; }; - E8AB632D28AE19DE0023B0D2 /* XPMonentMinePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentMinePresenter.h; sourceTree = ""; }; - E8AB632E28AE19DE0023B0D2 /* XPMonentMinePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentMinePresenter.m; sourceTree = ""; }; - E8AB633028AE19FA0023B0D2 /* XPMonentsMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsMineProtocol.h; sourceTree = ""; }; + E8AB632228AE10310023B0D2 /* XPMomentsTopicListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicListViewController.h; sourceTree = ""; }; + E8AB632328AE10310023B0D2 /* XPMomentsTopicListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTopicListViewController.m; sourceTree = ""; }; + E8AB632528AE13210023B0D2 /* XPMomentsTopicListPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicListPresenter.h; sourceTree = ""; }; + E8AB632628AE13210023B0D2 /* XPMomentsTopicListPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTopicListPresenter.m; sourceTree = ""; }; + E8AB632928AE15070023B0D2 /* XPMomentsTopicListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicListProtocol.h; sourceTree = ""; }; + E8AB632A28AE19600023B0D2 /* XPMomentsMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsMineViewController.h; sourceTree = ""; }; + E8AB632B28AE19600023B0D2 /* XPMomentsMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsMineViewController.m; sourceTree = ""; }; + E8AB632D28AE19DE0023B0D2 /* XPMomentMinePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentMinePresenter.h; sourceTree = ""; }; + E8AB632E28AE19DE0023B0D2 /* XPMomentMinePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentMinePresenter.m; sourceTree = ""; }; + E8AB633028AE19FA0023B0D2 /* XPMomentsMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsMineProtocol.h; sourceTree = ""; }; E8AB633128AE51470023B0D2 /* XPSailingPrizeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingPrizeView.h; sourceTree = ""; }; E8AB633228AE51470023B0D2 /* XPSailingPrizeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingPrizeView.m; sourceTree = ""; }; E8AB633428AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingPrizeCollectionViewCell.h; sourceTree = ""; }; @@ -4409,8 +4409,8 @@ E8D55C9C28113218006935A5 /* MessageMenuModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageMenuModel.m; sourceTree = ""; }; E8D55C9E281186D6006935A5 /* SessionAudioRecordView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionAudioRecordView.h; sourceTree = ""; }; E8D55C9F281186D6006935A5 /* SessionAudioRecordView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionAudioRecordView.m; sourceTree = ""; }; - E8D7D749282BA1EC0007D7BD /* XPMonentsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTableViewCell.h; sourceTree = ""; }; - E8D7D74A282BA1EC0007D7BD /* XPMonentsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTableViewCell.m; sourceTree = ""; }; + E8D7D749282BA1EC0007D7BD /* XPMomentsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTableViewCell.h; sourceTree = ""; }; + E8D7D74A282BA1EC0007D7BD /* XPMomentsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTableViewCell.m; sourceTree = ""; }; E8DAC5AA2858305A00012CFD /* XPRoomMessageBubbleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageBubbleView.h; sourceTree = ""; }; E8DAC5AB2858305A00012CFD /* XPRoomMessageBubbleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageBubbleView.m; sourceTree = ""; }; E8DACCF92766EDC60052092C /* MicroGiftValueView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroGiftValueView.h; sourceTree = ""; }; @@ -7748,15 +7748,15 @@ children = ( 1427213129A75A1700C7C423 /* XPMonentsLatestProtocol.h */, 1427213029A759D200C7C423 /* XPMonentsAttentionProtocol.h */, - E8098CAB282E04870090B9F0 /* XPMonentsRecommendProtocol.h */, + E8098CAB282E04870090B9F0 /* XPMomentsRecommendProtocol.h */, E81A65432835121000F55894 /* XPMonentsInteractiveProtocol.h */, E8541036286443D8005CFD9F /* XPMonentsDetailProtocol.h */, E818E34C286ECAD8005EDF68 /* XPMonentsPublishProtocol.h */, E8AB632028ADE5720023B0D2 /* XPMonentsTopicRecommendProtocol.h */, E8AB632128ADE5880023B0D2 /* XPMonentsTopicLatestProtocol.h */, - E8AB632928AE15070023B0D2 /* XPMonentsTopicListProtocol.h */, - E8AB633028AE19FA0023B0D2 /* XPMonentsMineProtocol.h */, - 14EB640A29A5BEE800A4A00B /* XPMonentsDetailViewControllerDelegate.h */, + E8AB632928AE15070023B0D2 /* XPMomentsTopicListProtocol.h */, + E8AB633028AE19FA0023B0D2 /* XPMomentsMineProtocol.h */, + 14EB640A29A5BEE800A4A00B /* XPMomentsDetailViewControllerDelegate.h */, ); path = Protocol; sourceTree = ""; @@ -7768,10 +7768,10 @@ 1427213329A75A2600C7C423 /* XPMonentsLatestPresenter.m */, 1427212E29A7599500C7C423 /* XPMonentsAttentionPresenter.h */, 1427212D29A7599500C7C423 /* XPMonentsAttentionPresenter.m */, - E8950187282CFFB1007E459A /* XPMonentsLayoutConfig.h */, - E8950188282CFFB1007E459A /* XPMonentsLayoutConfig.m */, - E8098CA8282E03B40090B9F0 /* XPMonentsRecommendPresenter.h */, - E8098CA9282E03B40090B9F0 /* XPMonentsRecommendPresenter.m */, + E8950187282CFFB1007E459A /* XPMomentsLayoutConfig.h */, + E8950188282CFFB1007E459A /* XPMomentsLayoutConfig.m */, + E8098CA8282E03B40090B9F0 /* XPMomentsRecommendPresenter.h */, + E8098CA9282E03B40090B9F0 /* XPMomentsRecommendPresenter.m */, E81A65402835120200F55894 /* XPMonentsInteractivePresenter.h */, E81A65412835120200F55894 /* XPMonentsInteractivePresenter.m */, E85410332864155A005CFD9F /* XPMonentDetailPresenter.h */, @@ -7782,10 +7782,10 @@ E8AB631828ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m */, E8AB631A28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.h */, E8AB631B28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m */, - E8AB632528AE13210023B0D2 /* XPMonentsTopicListPresenter.h */, - E8AB632628AE13210023B0D2 /* XPMonentsTopicListPresenter.m */, - E8AB632D28AE19DE0023B0D2 /* XPMonentMinePresenter.h */, - E8AB632E28AE19DE0023B0D2 /* XPMonentMinePresenter.m */, + E8AB632528AE13210023B0D2 /* XPMomentsTopicListPresenter.h */, + E8AB632628AE13210023B0D2 /* XPMomentsTopicListPresenter.m */, + E8AB632D28AE19DE0023B0D2 /* XPMomentMinePresenter.h */, + E8AB632E28AE19DE0023B0D2 /* XPMomentMinePresenter.m */, ); path = Presenter; sourceTree = ""; @@ -7797,28 +7797,28 @@ E8D7D747282BA1C20007D7BD /* Cell */, E81DCCCB282B63B40039E5C5 /* XPMomentsViewController.h */, E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */, - E81DCCCE282B63FD0039E5C5 /* XPMonentsRecommendViewController.h */, - E81DCCCF282B63FD0039E5C5 /* XPMonentsRecommendViewController.m */, + E81DCCCE282B63FD0039E5C5 /* XPMomentsRecommendViewController.h */, + E81DCCCF282B63FD0039E5C5 /* XPMomentsRecommendViewController.m */, E81A65292834E4F600F55894 /* XPMonentsAttentionViewController.h */, E81A652A2834E4F600F55894 /* XPMonentsAttentionViewController.m */, E81A652F2834E53600F55894 /* XPMonentsLatestViewController.h */, E81A65302834E53600F55894 /* XPMonentsLatestViewController.m */, E81A653D283511BE00F55894 /* XPMonentsInteractiveViewController.h */, E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */, - E852D739286317F0001465ED /* XPMonentsDetailViewController.h */, - E852D73A286317F0001465ED /* XPMonentsDetailViewController.m */, + E852D739286317F0001465ED /* XPMomentsDetailViewController.h */, + E852D73A286317F0001465ED /* XPMomentsDetailViewController.m */, E818E346286ECA4B005EDF68 /* XPMonentsPublishViewController.h */, E818E347286ECA4B005EDF68 /* XPMonentsPublishViewController.m */, - E8AB630B28ADD8C60023B0D2 /* XPMonentTopicContainerViewController.h */, - E8AB630C28ADD8C60023B0D2 /* XPMonentTopicContainerViewController.m */, + E8AB630B28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.h */, + E8AB630C28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m */, E8AB630E28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.h */, E8AB630F28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m */, E8AB631428ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.h */, E8AB631528ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m */, - E8AB632228AE10310023B0D2 /* XPMoentsTopicListViewController.h */, - E8AB632328AE10310023B0D2 /* XPMoentsTopicListViewController.m */, - E8AB632A28AE19600023B0D2 /* XPMonentsMineViewController.h */, - E8AB632B28AE19600023B0D2 /* XPMonentsMineViewController.m */, + E8AB632228AE10310023B0D2 /* XPMomentsTopicListViewController.h */, + E8AB632328AE10310023B0D2 /* XPMomentsTopicListViewController.m */, + E8AB632A28AE19600023B0D2 /* XPMomentsMineViewController.h */, + E8AB632B28AE19600023B0D2 /* XPMomentsMineViewController.m */, 14EB640729A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.h */, 14EB640829A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m */, 14EB640B29A5C16000A4A00B /* XPMomentsSimpleDetailNav.h */, @@ -7830,8 +7830,8 @@ E81DCCC9282B63840039E5C5 /* Api */ = { isa = PBXGroup; children = ( - E8098CA5282E00920090B9F0 /* Api+Monents.h */, - E8098CA6282E00920090B9F0 /* Api+Monents.m */, + E8098CA5282E00920090B9F0 /* Api+Moments.h */, + E8098CA6282E00920090B9F0 /* Api+Moments.m */, ); path = Api; sourceTree = ""; @@ -7839,12 +7839,12 @@ E81DCCCA282B638B0039E5C5 /* Model */ = { isa = PBXGroup; children = ( - 1427212B29A757EC00C7C423 /* MonentsListInfoModel.h */, - 1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */, - E88749B4282B8FC600C3C7DB /* MonentsInfoModel.h */, - E88749B5282B8FC600C3C7DB /* MonentsInfoModel.m */, - E81A6544283519CA00F55894 /* MonentsTopicModel.h */, - E81A6545283519CA00F55894 /* MonentsTopicModel.m */, + 1427212B29A757EC00C7C423 /* MomentsListInfoModel.h */, + 1427212A29A757EC00C7C423 /* MomentsListInfoModel.m */, + E88749B4282B8FC600C3C7DB /* MomentsInfoModel.h */, + E88749B5282B8FC600C3C7DB /* MomentsInfoModel.m */, + E81A6544283519CA00F55894 /* MomentsTopicModel.h */, + E81A6545283519CA00F55894 /* MomentsTopicModel.m */, E878B8562835F0D300E22DCF /* MonentsInteractiveModel.h */, E878B8572835F0D300E22DCF /* MonentsInteractiveModel.m */, E878B85C283640A500E22DCF /* MonentsUnReadModel.h */, @@ -10577,10 +10577,10 @@ E8D7D747282BA1C20007D7BD /* Cell */ = { isa = PBXGroup; children = ( - E8D7D749282BA1EC0007D7BD /* XPMonentsTableViewCell.h */, - E8D7D74A282BA1EC0007D7BD /* XPMonentsTableViewCell.m */, - E8098CAC282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.h */, - E8098CAD282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m */, + E8D7D749282BA1EC0007D7BD /* XPMomentsTableViewCell.h */, + E8D7D74A282BA1EC0007D7BD /* XPMomentsTableViewCell.m */, + E8098CAC282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.h */, + E8098CAD282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m */, E81A654A28351D9900F55894 /* XPMonentsTopicCollectionViewCell.h */, E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */, E878B8592835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.h */, @@ -10602,18 +10602,18 @@ E8D7D748282BA1C90007D7BD /* SubViews */ = { isa = PBXGroup; children = ( - E895017E282CAC49007E459A /* XPMonentsUserInfoView.h */, - E895017F282CAC49007E459A /* XPMonentsUserInfoView.m */, - E8950181282CAC6A007E459A /* XPMonentsPhotoView.h */, - E8950182282CAC6A007E459A /* XPMonentsPhotoView.m */, - E8950184282CAC80007E459A /* XPMonentsTooBarView.h */, - E8950185282CAC80007E459A /* XPMonentsTooBarView.m */, - E8098CAF282E86EF0090B9F0 /* XPMonentsContentView.h */, - E8098CB0282E86EF0090B9F0 /* XPMonentsContentView.m */, - E895018A282D0701007E459A /* XPMoentsTopicView.h */, - E895018B282D0701007E459A /* XPMoentsTopicView.m */, - E81A654728351B9500F55894 /* XPMonentsRecommendHeaderView.h */, - E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */, + E895017E282CAC49007E459A /* XPMomentsUserInfoView.h */, + E895017F282CAC49007E459A /* XPMomentsUserInfoView.m */, + E8950181282CAC6A007E459A /* XPMomentsPhotoView.h */, + E8950182282CAC6A007E459A /* XPMomentsPhotoView.m */, + E8950184282CAC80007E459A /* XPMomentsTooBarView.h */, + E8950185282CAC80007E459A /* XPMomentsTooBarView.m */, + E8098CAF282E86EF0090B9F0 /* XPMomentsContentView.h */, + E8098CB0282E86EF0090B9F0 /* XPMomentsContentView.m */, + E895018A282D0701007E459A /* XPMomentsTopicView.h */, + E895018B282D0701007E459A /* XPMomentsTopicView.m */, + E81A654728351B9500F55894 /* XPMomentsRecommendHeaderView.h */, + E81A654828351B9500F55894 /* XPMomentsRecommendHeaderView.m */, E8B9842B28AB77F10022D026 /* XPMonentsPublishTopicView.h */, E8B9842C28AB77F10022D026 /* XPMonentsPublishTopicView.m */, E8B9842E28AB90200022D026 /* XPMoentsTopicListView.h */, @@ -11543,7 +11543,7 @@ E87E62782A3F5907002F68C9 /* XPNewHomePartyTableViewCell.m in Sources */, 238B37B72AC55A2C00BFC9D5 /* XPTreasureFairySendRecordCell.m in Sources */, E8A3539B28FE840A0014A784 /* XPWishGiftViewController.m in Sources */, - E8950183282CAC6A007E459A /* XPMonentsPhotoView.m in Sources */, + E8950183282CAC6A007E459A /* XPMomentsPhotoView.m in Sources */, E8AC721E26F472BF007D6E91 /* XPMineSettingProtocol.h in Sources */, E8F63CB4298B563D00B338BA /* Api+SayHello.m in Sources */, 23E9EA972A84C37000B792F2 /* XPMineUserInfoRecordedSoundVC.m in Sources */, @@ -11563,7 +11563,7 @@ 54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */, E8751E6E28A64F990056EF44 /* XPSailingEmptyTableViewCell.m in Sources */, E87E625A2A3F560B002F68C9 /* XPHomeRecommendViewController.m in Sources */, - E8950189282CFFB1007E459A /* XPMonentsLayoutConfig.m in Sources */, + E8950189282CFFB1007E459A /* XPMomentsLayoutConfig.m in Sources */, 2357149B2BEE2AD1004C81D6 /* MsRoomMessagChatHallCell.m in Sources */, E81061032987CFCE00B772F0 /* MessageSkillCardModel.m in Sources */, 9BD9A18727A120FD004186FE /* XPMineVisitorUnReadModel.m in Sources */, @@ -11592,7 +11592,7 @@ E8A88D2D27E81E8700CA8837 /* RoomPKChooseUserModel.m in Sources */, E82325F9274E2E42003A3332 /* Api+UserCard.m in Sources */, 238B37A62AC55A2C00BFC9D5 /* TreasureFairySendRecordModel.m in Sources */, - E8AB632F28AE19DE0023B0D2 /* XPMonentMinePresenter.m in Sources */, + E8AB632F28AE19DE0023B0D2 /* XPMomentMinePresenter.m in Sources */, E85E7B042A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.m in Sources */, 54F4693E2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m in Sources */, 9BD9A17C27A0EE24004186FE /* XPMineVisitorViewController.m in Sources */, @@ -11690,7 +11690,7 @@ 239D0FE12C04850A002977CE /* MSRoomGameHeadView.m in Sources */, 2331C1AA2A60F32D00E1D940 /* XPCandyTreePresenter.m in Sources */, E8AC723D26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m in Sources */, - E8AB632728AE13210023B0D2 /* XPMonentsTopicListPresenter.m in Sources */, + E8AB632728AE13210023B0D2 /* XPMomentsTopicListPresenter.m in Sources */, 239D0FB32BFD8C67002977CE /* MSRoomSetingBackdropCell.m in Sources */, 1427218729A75F6F00C7C423 /* MyHTTPConnection.m in Sources */, 23CEFB6C2AFB803B00576D89 /* PISwitchingEnvironmentVC.m in Sources */, @@ -11787,7 +11787,7 @@ E83ABF03280EC90C00322EE4 /* ContentApplicationShareModel.m in Sources */, 9BA812E028BF6ABB00783EA7 /* Api+RedPacket.m in Sources */, 9BA3B40F293DD2F90071DF1C /* XPUpgradeView.m in Sources */, - E81A654928351B9500F55894 /* XPMonentsRecommendHeaderView.m in Sources */, + E81A654928351B9500F55894 /* XPMomentsRecommendHeaderView.m in Sources */, E84B0E3F2727EDF6008818C6 /* XPRoomMessageTableViewCell.m in Sources */, E82325FC274E4735003A3332 /* XPUserCardItemModel.m in Sources */, E8C1CD6627D88EF800376F83 /* XPRoomFaceViewController.m in Sources */, @@ -11916,7 +11916,7 @@ 232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */, 9B7D804D27537950003DAC0C /* MessageCell.m in Sources */, 23E9EAA62A84C97C00B792F2 /* XPMineUserInfoTagVC.m in Sources */, - E8950180282CAC49007E459A /* XPMonentsUserInfoView.m in Sources */, + E8950180282CAC49007E459A /* XPMomentsUserInfoView.m in Sources */, 18F404C927609A4300A6C548 /* MessagePresenter.m in Sources */, 9BC9DAEF27E33B3F009EE409 /* XPRoomGiftAnimationParser.m in Sources */, E89DCF602900F4FB001647EC /* XPWishGiftEnterView.m in Sources */, @@ -12196,7 +12196,7 @@ E8AC722C26F49580007D6E91 /* XPMineNotificaViewController.m in Sources */, 237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */, 9B335B492925D8A00048A116 /* XPAnchorPKSelectTypeController.m in Sources */, - E8098CAE282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m in Sources */, + E8098CAE282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m in Sources */, 237700D72BC7D51400D661F1 /* UIButton+MSRTL.m in Sources */, E85E7B4F2A4EB0D300B6D00A /* XPMineExchangeAuthorityVC.m in Sources */, 235714952BEDF517004C81D6 /* MsRoomMessagChatHallView.m in Sources */, @@ -12207,7 +12207,7 @@ E85E7B172A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m in Sources */, 54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */, 9B044DA0282D32F700DE4859 /* MicroInviteExtModel.m in Sources */, - E8D7D74B282BA1EC0007D7BD /* XPMonentsTableViewCell.m in Sources */, + E8D7D74B282BA1EC0007D7BD /* XPMomentsTableViewCell.m in Sources */, E8D34D5A28082357009C4835 /* UserGiftWallInfoModel.m in Sources */, E82107842987E35300DE7040 /* MessageMonentsAutoModel.m in Sources */, 189DD52E26DE255300AB55B1 /* AppDelegate.m in Sources */, @@ -12264,7 +12264,7 @@ 9B8DE0E1289CF02900FB6EC2 /* XPGiftCompoundModel.m in Sources */, 23FF256E2ABC48810064E904 /* XPSessionMainViewController.m in Sources */, E85E7B092A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.m in Sources */, - E8950186282CAC80007E459A /* XPMonentsTooBarView.m in Sources */, + E8950186282CAC80007E459A /* XPMomentsTooBarView.m in Sources */, 2357145A2BE8BC6C004C81D6 /* MSSessionPublicChatHallVC.m in Sources */, E86507E5281A7D4D006951B0 /* MessageContentTweetView.m in Sources */, E824544B26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m in Sources */, @@ -12293,7 +12293,7 @@ 2357146E2BEB816B004C81D6 /* MSSessionPublicChatHallHeadView.m in Sources */, 238B37CD2AC55A2C00BFC9D5 /* XPTreasureFailyResultView.m in Sources */, E824545126F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m in Sources */, - E8098CB1282E86EF0090B9F0 /* XPMonentsContentView.m in Sources */, + E8098CB1282E86EF0090B9F0 /* XPMomentsContentView.m in Sources */, E85E3FA728B7A6F000268DC8 /* MessageContentMonentsView.m in Sources */, 234E50A82BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.m in Sources */, E880B3AF278BE1D800A83B0D /* Api+AcrossRoomPK.m in Sources */, @@ -12316,8 +12316,8 @@ 18E7B33226F317A20064BC9B /* XPWebViewController.m in Sources */, E8AEAEF927141CA30017FCE0 /* RoomHeaderView.m in Sources */, 545831A32C2AF01100364026 /* FifteenMicStageView.m in Sources */, - E8AB632428AE10310023B0D2 /* XPMoentsTopicListViewController.m in Sources */, - E8098CAA282E03B40090B9F0 /* XPMonentsRecommendPresenter.m in Sources */, + E8AB632428AE10310023B0D2 /* XPMomentsTopicListViewController.m in Sources */, + E8098CAA282E03B40090B9F0 /* XPMomentsRecommendPresenter.m in Sources */, E8F63CBB298B648300B338BA /* SessionSayHelloListModel.m in Sources */, 9B1B729828002147003FACE9 /* XPMineFansTeamPresenter.m in Sources */, 23FF42702AA6C7CF0055733C /* XPNewHomeItemCell.m in Sources */, @@ -12348,7 +12348,7 @@ E8F1559028125E2D00EE8C06 /* MessageAudioCenter.m in Sources */, E8901CF628B38D89001E9A92 /* XPGraffitiGiftView.m in Sources */, E89DA67527009ACD008483C1 /* XPMineRechargeNavView.m in Sources */, - E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */, + E81A6546283519CA00F55894 /* MomentsTopicModel.m in Sources */, E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */, 9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */, 54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */, @@ -12367,7 +12367,7 @@ E84A2E9C2A52823900D6AF8A /* XPTextField.m in Sources */, 186A536926FC6F2E00D67B2C /* XPShareView.m in Sources */, 23CEFC602AFB8FC100576D89 /* RealViewCellModel.m in Sources */, - E8AB632C28AE19600023B0D2 /* XPMonentsMineViewController.m in Sources */, + E8AB632C28AE19600023B0D2 /* XPMomentsMineViewController.m in Sources */, 23CEFC5F2AFB8FC100576D89 /* BSLogTableViewController.m in Sources */, 236B2E4D2AA07D06003967A8 /* XPRoomLittleGameContainerView.m in Sources */, E87AE8C1284E184300CAFBB3 /* RoomNewUserGreetModel.m in Sources */, @@ -12415,7 +12415,7 @@ 2331C1712A5EB71000E1D940 /* XPNobleCenterTableHeadView.m in Sources */, 2357148C2BECEE33004C81D6 /* MSSessionPublicChatHalTextCell.m in Sources */, 181D7F212727D9DB00B7C059 /* SocialStageView.m in Sources */, - E8AB630D28ADD8C60023B0D2 /* XPMonentTopicContainerViewController.m in Sources */, + E8AB630D28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m in Sources */, 23E9EA7C2A83977400B792F2 /* MessageContentTreasureFairyView.m in Sources */, E8D4DE472940473500EC788D /* GiftTwelveStarFirstModel.m in Sources */, E87DF4FB2A42CCDE009C1185 /* XPHomeRedommendCollectionViewCell.m in Sources */, @@ -12476,7 +12476,7 @@ 1427219529A75F6F00C7C423 /* DDNumber.m in Sources */, 236B2E5A2AA18E13003967A8 /* XPMineGameTableViewCell.m in Sources */, E8DEC9AC2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.m in Sources */, - E81DCCD0282B63FD0039E5C5 /* XPMonentsRecommendViewController.m in Sources */, + E81DCCD0282B63FD0039E5C5 /* XPMomentsRecommendViewController.m in Sources */, 9B7D804A2753783D003DAC0C /* SessionViewController.m in Sources */, E85E7BA92A4EC99300B6D00A /* XPMineConfirmGiveDiamondView.m in Sources */, 54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */, @@ -12554,7 +12554,7 @@ E8778AF02988EF0600CF139B /* XPSessionSayHelloViewController.m in Sources */, 187EEEE126E89BFB002833B2 /* AccountModel.m in Sources */, 235A451D2B04A452009753F5 /* PIRoomActivityWebCell.m in Sources */, - E8098CA7282E00920090B9F0 /* Api+Monents.m in Sources */, + E8098CA7282E00920090B9F0 /* Api+Moments.m in Sources */, E896EFA92771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.m in Sources */, E8F1559328129EBA00EE8C06 /* ContentSecretaryModel.m in Sources */, E85E7B342A4EB0D300B6D00A /* XPMineMainGuildListVC.m in Sources */, @@ -12576,7 +12576,7 @@ 18EE3FDF2750C1F700A452BF /* SessionListCell.m in Sources */, 9BD798B72926362F003E03E6 /* XPSessionListHeadItem.m in Sources */, E80487652717DDD9008595F2 /* XPRoomMenuItem.m in Sources */, - E895018C282D0701007E459A /* XPMoentsTopicView.m in Sources */, + E895018C282D0701007E459A /* XPMomentsTopicView.m in Sources */, E8A353A028FE84670014A784 /* XPWishGiftInfoView.m in Sources */, E89BD7D4277D471100E31B19 /* XPRoomOnlineTableViewCell.m in Sources */, 1427219329A75F6F00C7C423 /* MultipartMessageHeader.m in Sources */, @@ -12594,7 +12594,7 @@ E84B0E422727EE0A008818C6 /* XPRoomMessageHeaderView.m in Sources */, 238B37AC2AC55A2C00BFC9D5 /* TreasureFailryMessageModel.m in Sources */, 2331C1812A5ECD3800E1D940 /* XPNobleCenterPayCell.m in Sources */, - E852D73B286317F0001465ED /* XPMonentsDetailViewController.m in Sources */, + E852D73B286317F0001465ED /* XPMomentsDetailViewController.m in Sources */, 2331C1692A5EB71000E1D940 /* XPNobleSettingViewController.m in Sources */, E85E7B392A4EB0D300B6D00A /* XPGuildChooseManagerRoomTableViewCell.m in Sources */, 239D0FAD2BFCB88D002977CE /* XPRoomAnchorRankEnterView.m in Sources */, @@ -12605,7 +12605,7 @@ E84BF7E0277C869A00EF8877 /* XPRoomOnLineViewController.m in Sources */, 186A534826FC6ED900D67B2C /* TTAlertButtonConfig.m in Sources */, 236B2E422AA07D06003967A8 /* SudCommon.m in Sources */, - E88749B6282B8FC600C3C7DB /* MonentsInfoModel.m in Sources */, + E88749B6282B8FC600C3C7DB /* MomentsInfoModel.m in Sources */, E89D60BA271D643A001F8895 /* Api+Room.m in Sources */, E84843B227F5A0740050D365 /* XPRomPKResultTitleLabel.m in Sources */, E80EC80F28ACD84000D133C5 /* QEmotion.m in Sources */, @@ -12638,7 +12638,7 @@ 189DD75926E6003C00AB55B1 /* Api.m in Sources */, 2331C1652A5EB71000E1D940 /* NobleRechargeModel.m in Sources */, E87C0A9D27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.m in Sources */, - 1427212C29A757EC00C7C423 /* MonentsListInfoModel.m in Sources */, + 1427212C29A757EC00C7C423 /* MomentsListInfoModel.m in Sources */, 23E9EB152A84D02400B792F2 /* XPMineUserInfoEditPickView.m in Sources */, 9BA812D628BF52E100783EA7 /* XPRoomSendRedPacketViewController.m in Sources */, E86E79D328A4E94E006DAF48 /* SessionRiskView.m in Sources */, @@ -12908,6 +12908,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/YuMi/Global/YUMIConstant.m b/YuMi/Global/YUMIConstant.m index 7ec8f8db..9c6d6463 100644 --- a/YuMi/Global/YUMIConstant.m +++ b/YuMi/Global/YUMIConstant.m @@ -37,7 +37,7 @@ NSString * const kInviteMemeberSuccess = @"a0ludml0ZU1lbWViZXJTdWNjZXNz"; NSString * const kUserFirstRegisterKey = @"kUserFirstRegisterKey"; ///登录方式 NSString * const kLoginMethod = @"a0xvZ2luTWV0aG9k"; -NSString * const kRequestRicket = @"a1JlcXVlc3RSaWNrZXQ="; +NSString * const kRequestTicket = @"a1JlcXVlc3RSaWNrZXQ="; NSString * const kUpdateSoundInfo = @"kUpdateSoundInfo"; NSString * const kMineInfoDelTag = @"kMineInfoDelTag"; NSString * const kOpenRoomNotification = @"kOpenRoomNotification";///进房 diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m index b4be264a..b18339d1 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m @@ -19,9 +19,9 @@ #import "GiftReceiveInfoModel.h" #import "MessageMonentsModel.h" ///View -#import "XPMonentsDetailViewController.h" +#import "XPMomentsDetailViewController.h" #import "XPMomentsSimpleDetailViewController.h" -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" @interface MessageContentMonentsView () ///礼物的 @property (nonatomic,strong) NetImageView *monentsView; @@ -30,7 +30,7 @@ ///描述 @property (nonatomic,strong) UILabel *contentLabel; ///动态 -@property (nonatomic,strong) MonentsInfoModel *monents; +@property (nonatomic,strong) MomentsInfoModel *monents; @end @implementation MessageContentMonentsView @@ -73,8 +73,8 @@ } - (void)tapBackView { - XPMonentsDetailViewController * detailView = [[XPMonentsDetailViewController alloc] init]; - detailView.monentsInfo = self.monents; + XPMomentsDetailViewController * detailView = [[XPMomentsDetailViewController alloc] init]; + detailView.momentsInfo = self.monents; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:detailView animated:YES]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m index 315e9352..0e24d39f 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m @@ -32,7 +32,7 @@ #import "XPMineDressUpViewController.h" #import "XPDressUpShopViewController.h" #import "XPMineLoginPasswordViewController.h" -#import "XPMonentTopicContainerViewController.h" +#import "XPMomentTopicContainerViewController.h" #import "XPNobleCenterViewController.h" ///P #import "RoomHostDelegate.h" @@ -88,11 +88,11 @@ _messageText.attributedText = textModel.attributedText; _contentInfo = textModel.contentInfo; - CGFloat oneHeight = [YMLocalizedString(@"MessageContentTweetView0") boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height + 2.5; - - CGFloat titleHeight = [textModel.attributedText.string boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height; +// CGFloat oneHeight = [YMLocalizedString(@"MessageContentTweetView0") boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin +// attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height + 2.5; +// +// CGFloat titleHeight = [textModel.attributedText.string boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin +// attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height; // if (titleHeight <= oneHeight * 2) { // [self.messageText mas_updateConstraints:^(MASConstraintMaker *make) { // make.height.mas_equalTo(titleHeight + 5); @@ -234,7 +234,7 @@ break; case SecretaryRouterType_Square_Topic: { - XPMonentTopicContainerViewController *topicVC = [[XPMonentTopicContainerViewController alloc] init]; + XPMomentTopicContainerViewController *topicVC = [[XPMomentTopicContainerViewController alloc] init]; topicVC.worldId = value; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:topicVC animated:YES]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h index 96559d23..8caa91f7 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h +++ b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h @@ -8,9 +8,9 @@ #import "MessageBaseModel.h" NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel; +@class MomentsInfoModel; @interface MessageMonentsModel : MessageBaseModel -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; +@property (nonatomic,strong) MomentsInfoModel *monentsInfo; ///图片的链接 @property (nonatomic,strong) NSString *imageUrl; ///标题 diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m index 4dbf4f87..bb96221b 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m @@ -7,7 +7,7 @@ #import "MessageMonentsModel.h" #import "AttachmentModel.h" -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "NSObject+MJExtension.h" @implementation MessageMonentsModel - (instancetype)initWithMessage:(NIMMessage *)message { @@ -16,7 +16,7 @@ NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; AttachmentModel * attach = obj.attachment; NSDictionary * dic = attach.data; - self.monentsInfo = [MonentsInfoModel modelWithDictionary:dic]; + self.monentsInfo = [MomentsInfoModel modelWithDictionary:dic]; self.imageUrl = dic[@"imageUrl"]; NSString * nick = self.monentsInfo.nick; if (nick.length > 6) { diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m index a430a725..daae806c 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m +++ b/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m @@ -43,7 +43,7 @@ NSString * uid = [AccountInfoStorage instance].getUid; [Api collectRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] collectRoomSuccess]; - }] roomUid:roomUid uid:uid type:type roomUids:NULL]; + }] roomUid:roomUid uid:uid type:type roomUids:@""]; } @end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m index f7accab4..13b2ab1e 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m +++ b/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m @@ -13,9 +13,9 @@ #import "MineSkillCardListInfoModel.h" #import "XPMineUserDataProtocol.h" #import "UserInfoModel.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "Api+Room.h" -#import "XPMonentsMineProtocol.h" +#import "XPMomentsMineProtocol.h" #import "Api+GameOrder.h" #import "XPMineGamePartnerInfoModel.h" @@ -27,9 +27,9 @@ RACSubject* owner = [RACSubject subject]; RACSubject* currentUser = [RACSubject subject]; - @kWeakify(self); +// @kWeakify(self); [[RACSignal combineLatest:@[owner, currentUser] reduce:^id(ClanDetailInfoModel* ownerClanInfo, ClanDetailInfoModel* currentUserClanInfo){ - @kStrongify(self); +// @kStrongify(self); // [[self getView] getClanDetailInfoSuccess:ownerClanInfo currentUserClanInfo:currentUserClanInfo]; return nil; }] subscribeError:^(NSError * _Nullable error) { @@ -84,9 +84,9 @@ @kWeakify(self); NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { @kStrongify(self); - [[self getView] likeMonentsSuccess:dynamicId status:status]; + [[self getView] likeMomentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } @@ -96,14 +96,14 @@ - (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { @kWeakify(self); NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { @kStrongify(self); - [[self getView] deleteMonentsSuccess:dynamicId]; + [[self getView] deleteMomentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } - (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ @kWeakify(self); - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { @kStrongify(self); [[self getView] requesstShieldingSuccess:objId]; }] type:type objId:objId]; diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h index 0f35420e..f5785f24 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h @@ -7,7 +7,7 @@ #import "MvpViewController.h" #import -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "XPMineGamePartnerInfoModel.h" @class MedalModel, UserGiftWallInfoModel; @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,copy) NSString *userUid; ///用户信息 @property (nonatomic, strong) UserInfoModel *userInfo; -@property (nonatomic, strong) NSArray*dynamicInfo; +@property (nonatomic, strong) NSArray*dynamicInfo; @property (nonatomic, strong) MedalModel *medalInfo; @property (nonatomic, strong) NSArray *giftWall; @property (nonatomic, strong) NSArray *luckyGiftWall; diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m index 2a609b96..9b67bb61 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m @@ -10,23 +10,23 @@ #import ///Tool #import "AccountInfoStorage.h" -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" ///View #import "XPMineDataGiftTableViewCell.h" -#import "XPMonentsTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" +#import "XPMomentsTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" ///Model #import "UserInfoModel.h" #import "MineSkillCardListInfoModel.h" ///P #import "XPMineUserDataPresenter.h" #import "XPMineUserDataProtocol.h" -#import "XPMonentsMineProtocol.h" +#import "XPMomentsMineProtocol.h" ///View #import "XPMineUserInfoGiftWallViewController.h" #import "XPMineGuildViewController.h" -#import "XPMonentsDetailViewController.h" +#import "XPMomentsDetailViewController.h" #import "XPMineUserInfoAlbumViewController.h" #import "XPMineDataGiftTableViewCell.h" @@ -145,7 +145,7 @@ typedef enum : NSUInteger { @end -@interface XPMineUserDataViewController () +@interface XPMineUserDataViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; @@ -156,7 +156,7 @@ typedef enum : NSUInteger { @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); ///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; //@property (nonatomic,strong) UIView *headView; @property (nonatomic, strong) UIButton *giftsExpandButton; @property (nonatomic, strong) UIButton *luckyGiftsExpandButton; @@ -422,7 +422,7 @@ typedef enum : NSUInteger { } break; default: - return [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + return [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; break; } } @@ -431,49 +431,49 @@ typedef enum : NSUInteger { if(indexPath.section == 0)return; [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; if(monentsInfo.dynamicId == nil){ return; } - detailVC.monentsInfo = monentsInfo; + detailVC.momentsInfo = monentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { if(monentsInfo.dynamicId == nil){ [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController2")]; return; } [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicCommon:(MonentsInfoModel *)monentsInfo{ +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo{ if(monentsInfo.dynamicId == nil){ [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController3")]; return; } - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + detailVC.momentsInfo = monentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsMineViewController0") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(nonnull MonentsInfoModel *)monentsInfo{ +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(nonnull MomentsInfoModel *)monentsInfo{ [self showLoading]; [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + __block MomentsInfoModel * monentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { monentsInfos = obj; *stop = YES; @@ -485,10 +485,10 @@ typedef enum : NSUInteger { } } -#pragma mark - XPMonentsDetailViewControllerDelegate -- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId { - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +#pragma mark - XPMomentsDetailViewControllerDelegate +- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; } @@ -500,12 +500,12 @@ typedef enum : NSUInteger { } } -#pragma mark - XPMonentsMineProtocol +#pragma mark - XPMomentsMineProtocol - (void)requesstShieldingSuccess:(NSString *)monentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -516,8 +516,8 @@ typedef enum : NSUInteger { [self.tableView reloadData]; } } -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { NSInteger likeCount = obj.likeCount.integerValue; if (status) { @@ -534,10 +534,10 @@ typedef enum : NSUInteger { [self.tableView reloadData]; } -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController1")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)deleteMomentsSuccess:(NSString *)monentsInfo { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController1")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -590,7 +590,7 @@ typedef enum : NSUInteger { [self.tableView reloadData]; } uid:userInfo.uid]; } -- (void)setDynamicInfo:(NSArray *)dynamicInfo { +- (void)setDynamicInfo:(NSArray *)dynamicInfo { [self.datasource removeAllObjects]; [self.datasource addObjectsFromArray:dynamicInfo]; [self.tableView reloadData]; @@ -620,7 +620,7 @@ typedef enum : NSUInteger { forCellReuseIdentifier:NSStringFromClass([XPMineMedalsTableViewCell class])]; [_tableView registerClass:[XPMineGiftsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGiftsTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; [_tableView registerClass:[XPMineDataGiftTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineDataGiftTableViewCell class])]; if (isMSRTL()) { _tableView.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; @@ -629,7 +629,7 @@ typedef enum : NSUInteger { return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m index 89d831e7..44e5037a 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m @@ -42,7 +42,7 @@ #import "SessionViewController.h" #import "XPRoomViewController.h" #import "XPMineUserDataViewController.h" -#import "XPMonentsMineViewController.h" +#import "XPMomentsMineViewController.h" #import "XPGiftUserDataViewController.h" #import "XPRoomMiniManager.h" diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index a696b9dd..790be796 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineViewController.m @@ -70,7 +70,7 @@ #import "XPGameOrdersListViewController.h" -UIKIT_EXTERN NSString *kRequestRicket; +UIKIT_EXTERN NSString *kRequestTicket; @interface XPMineViewController () ///顶部背景 diff --git a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h b/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h index 07809cce..0256560a 100644 --- a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h +++ b/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h @@ -7,13 +7,13 @@ #import "MvpViewController.h" #import -@class MonentsInfoModel; +@class MomentsInfoModel; NS_ASSUME_NONNULL_BEGIN @interface XPMomentUserDataViewController : MvpViewController -@property (nonatomic,strong) NSArray*dynamicInfo; +@property (nonatomic,strong) NSArray*dynamicInfo; @end diff --git a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m b/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m index 2dc64846..27876818 100644 --- a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m +++ b/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m @@ -7,19 +7,19 @@ #import "XPMomentUserDataViewController.h" -#import "XPMonentsDetailViewController.h" +#import "XPMomentsDetailViewController.h" #import "XPMineUserDataPresenter.h" -#import "XPMonentsMineProtocol.h" +#import "XPMomentsMineProtocol.h" -#import "XPMonentsLayoutConfig.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsTableViewCell.h" -#import "MonentsInfoModel.h" +#import "XPMomentsLayoutConfig.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsTableViewCell.h" +#import "MomentsInfoModel.h" -@interface XPMomentUserDataViewController () +@interface XPMomentUserDataViewController () -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; @property (nonatomic,strong) UITableView *tableView; @property (nonatomic,strong) UIView *headView; @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); @@ -39,7 +39,7 @@ return [[XPMineUserDataPresenter alloc] init]; } -- (void)setDynamicInfo:(NSArray *)dynamicInfo { +- (void)setDynamicInfo:(NSArray *)dynamicInfo { [self.datasource removeAllObjects]; [self.datasource addObjectsFromArray:dynamicInfo]; [self.tableView reloadData]; @@ -77,8 +77,8 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - MonentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMonentsLayoutConfig getNewlayoutMonentsModelWithDynamic:momentInfo]; + MomentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; + [XPMomentsLayoutConfig getNewLayoutMomentsModelWithDynamic:momentInfo]; if(momentInfo.content.length == 0){ return momentInfo.rowHeight + 20; } @@ -101,14 +101,14 @@ } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"XPMonentsDynamicTableViewCell" forIndexPath:indexPath]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"XPMomentsDynamicTableViewCell" forIndexPath:indexPath]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; cell.delegate = self; - cell.mineMonentsInfo = monentsInfo; + cell.mineMomentsInfo = monentsInfo; cell.isFillet = indexPath.row == self.datasource.count - 1; return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } @@ -116,49 +116,49 @@ if(indexPath.section == 0)return; [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; if(monentsInfo.dynamicId == nil){ return; } - detailVC.monentsInfo = monentsInfo; + detailVC.momentsInfo = monentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { if(monentsInfo.dynamicId == nil){ [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController2")]; return; } [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicCommon:(MonentsInfoModel *)monentsInfo{ +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo{ if(monentsInfo.dynamicId == nil){ [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController3")]; return; } - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + detailVC.momentsInfo = monentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsMineViewController0") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(nonnull MonentsInfoModel *)monentsInfo{ +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(nonnull MomentsInfoModel *)monentsInfo{ [self showLoading]; [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + __block MomentsInfoModel * monentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { monentsInfos = obj; *stop = YES; @@ -170,10 +170,10 @@ } } -#pragma mark - XPMonentsDetailViewControllerDelegate -- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId { - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +#pragma mark - XPMomentsDetailViewControllerDelegate +- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; } @@ -185,12 +185,12 @@ } } -#pragma mark - XPMonentsMineProtocol +#pragma mark - XPMomentsMineProtocol - (void)requesstShieldingSuccess:(NSString *)monentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -201,8 +201,8 @@ [self.tableView reloadData]; } } -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { NSInteger likeCount = obj.likeCount.integerValue; if (status) { @@ -219,10 +219,10 @@ [self.tableView reloadData]; } -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController1")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)deleteMomentsSuccess:(NSString *)monentsInfo { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController1")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -245,13 +245,13 @@ if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:@"XPMonentsDynamicTableViewCell"]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:@"XPMomentsDynamicTableViewCell"]; } return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } diff --git a/YuMi/Modules/YMMonents/Api/Api+Monents.h b/YuMi/Modules/YMMonents/Api/Api+Moments.h similarity index 74% rename from YuMi/Modules/YMMonents/Api/Api+Monents.h rename to YuMi/Modules/YMMonents/Api/Api+Moments.h index 708f9d19..45a47f4a 100644 --- a/YuMi/Modules/YMMonents/Api/Api+Monents.h +++ b/YuMi/Modules/YMMonents/Api/Api+Moments.h @@ -9,39 +9,39 @@ NS_ASSUME_NONNULL_BEGIN -@interface Api (Monents) +@interface Api (Moments) /// 朋友圈动态推荐列表 /// @param completion 完成 /// @param page 当前的页数 /// @param pageSize 一页的个数 /// @param types 类型 0,2 -+ (void)monentsRecommendList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types; ++ (void)momentsRecommendList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types; /// 朋友圈动态最新列表 /// @param completion 完成 /// @param dynamicId 最新动态的id /// @param pageSize 一页的个数 /// @param types 类型 0,2 -+ (void)monentsLatestList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; ++ (void)momentsLatestList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; /// 朋友圈动态关注列表 /// @param completion 完成 /// @param dynamicId 最新动态的id /// @param pageSize 一页的个数 /// @param types 类型 0,2 -+ (void)monentsFollowerList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; ++ (void)momentsFollowerList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; /// 互动消息列表 /// @param completion 完成 /// @param dynamicId 动态的id /// @param pageSize 一页的个数 /// @param uid 类型 uid -+ (void)monentsInteractiveList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize uid:(NSString *)uid; ++ (void)momentsInteractiveList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize uid:(NSString *)uid; /// 清空互动消息 -/// @param complection 完成 +/// @param Completion 完成 /// @param uid 用户的uid -+ (void)monentsInteractiveClear:(HttpRequestHelperCompletion)complection uid:(NSString *)uid; ++ (void)momentsInteractiveClear:(HttpRequestHelperCompletion)Completion uid:(NSString *)uid; /// 获取话题列表 /// @param completion 完成 @@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param page 当前的页数 /// @param pageSize 一页多少个 /// @param worldTypeId 类型0 -+ (void)monentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize worldTypeId:(NSString *)worldTypeId; ++ (void)momentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize worldTypeId:(NSString *)worldTypeId; /// 分享动态 /// @param completion 完成 @@ -57,7 +57,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param uid 动态发布者的uid /// @param worldId 动态的话题id /// @param shareUid 分享者的uid -+ (void)userShareMonents:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid worldId:(NSString *)worldId shareUid:(NSString *)shareUid; ++ (void)userShareMoments:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid worldId:(NSString *)worldId shareUid:(NSString *)shareUid; /// 点赞动态 @@ -67,21 +67,21 @@ NS_ASSUME_NONNULL_BEGIN /// @param status 0 取消点赞 1 点赞 /// @param likedUid 点赞人的uid /// @param worldId 世界的id -+ (void)monentsLike:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; ++ (void)momentsLike:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; /// 动态详情 /// @param completion 完成 /// @param dynamicId 动态的id /// @param worldId 话题的id /// @param uid 用户的uid -+ (void)monentsDetail:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId uid:(NSString *)uid; ++ (void)momentsDetail:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId uid:(NSString *)uid; /// 评论动态 /// @param completion 完成 /// @param uid 用户的uid /// @param dynamicId 动态的id /// @param content 内容 -+ (void)monentDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content; ++ (void)momentDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content; /// 回复评论 /// @param completion 完成 @@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param dynamicId 动态的id /// @param content 内容 /// @param commentId 评论的id -+ (void)replyMonentsDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content commentId:(NSString *)commentId; ++ (void)replyMomentsDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content commentId:(NSString *)commentId; /// 请求评论列表 /// @param completion 完成 @@ -97,7 +97,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param uid uid /// @param pageSize 一页多少个 /// @param timestamp 上一个评论的时间戳 -+ (void)monentsCommentList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize timestamp:(NSString *)timestamp; ++ (void)momentsCommentList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize timestamp:(NSString *)timestamp; /// 评论回复列表 /// @param completion 完成 @@ -106,14 +106,14 @@ NS_ASSUME_NONNULL_BEGIN /// @param pageSize 每页多少个 /// @param commentId 评论的id /// @param timestamp 上条回复的时间 -+ (void)monentsCommentReplyList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize commentId:(NSString *)commentId timestamp:(NSString *)timestamp; ++ (void)momentsCommentReplyList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize commentId:(NSString *)commentId timestamp:(NSString *)timestamp; /// 获取可以选择的话题列表 /// @param completion 完成 /// @param uid 用户的uid /// @param type 类型 /// @param page 当前的页数 -+ (void)monentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type page:(NSString *)page; ++ (void)momentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type page:(NSString *)page; /// 发布动态 /// @param completion 完成 @@ -122,7 +122,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param worldId 话题的id /// @param content 内容 /// @param resList 发布的图片 -+ (void)monentsPublish:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList; ++ (void)momentsPublish:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList; /// 获取动态话题最新记录 /// @param completion 完成 @@ -131,7 +131,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param types l类型 /// @param worldId 话题的id /// @param pageSize 一页多少个 -+ (void)monentsTopicLatestList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize; ++ (void)momentsTopicLatestList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize; /// 获取动态话题推荐记录 /// @param completion 完成 @@ -140,37 +140,29 @@ NS_ASSUME_NONNULL_BEGIN /// @param types l类型 /// @param worldId 话题的id /// @param pageSize 一页多少个 -+ (void)monentsTopicRecommendList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize; ++ (void)momentsTopicRecommendList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize; /// 获取动态话题详情 /// @param completion 完成 /// @param worldId 话题id /// @param uid 用户uid -+ (void)monentsTopicDetailInfo:(HttpRequestHelperCompletion)completion worldId:(NSString *)worldId uid:(NSString *)uid; - -/// 获取动态话题列表 -/// @param completion 完成 -/// @param uid uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param worldTypeId 类型 -+ (void)moentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize worldTypeId:(NSString *)worldTypeId; ++ (void)momentsTopicDetailInfo:(HttpRequestHelperCompletion)completion worldId:(NSString *)worldId uid:(NSString *)uid; /// 删除动态 /// @param completion 完成 /// @param uid uid /// @param dynamicId 动态的id /// @param worldId 话题的id -+ (void)monentsDelete:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId; ++ (void)momentsDelete:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId; /// 获取动态没有阅读数 /// @param completion 完成 /// @param uid uid -+ (void)monentsUnReadCount:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; ++ (void)momentsUnReadCount:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; /// 屏蔽 /// @param completion 完成 /// @param type type为0 => 屏蔽动态, objId 为 动态id, type为1 => 屏蔽房间, objId 为 用户uid -+ (void)requesstShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId; ++ (void)requestShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Api/Api+Monents.m b/YuMi/Modules/YMMonents/Api/Api+Moments.m similarity index 84% rename from YuMi/Modules/YMMonents/Api/Api+Monents.m rename to YuMi/Modules/YMMonents/Api/Api+Moments.m index 2bd4ba1e..e1c9cc45 100644 --- a/YuMi/Modules/YMMonents/Api/Api+Monents.m +++ b/YuMi/Modules/YMMonents/Api/Api+Moments.m @@ -5,18 +5,18 @@ // Created by YUMI on 2022/5/13. // -#import "Api+Monents.h" +#import "Api+Moments.h" #import "NSObject+MJExtension.h" #import "NSMutableDictionary+Saft.h" #import -@implementation Api (Monents) +@implementation Api (Moments) /// 朋友圈动态推荐列表 /// @param completion 完成 /// @param page 当前的页数 /// @param pageSize 一页的个数 /// @param types 类型 0,2 -+ (void)monentsRecommendList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types { ++ (void)momentsRecommendList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9zcXVhcmUvcmVjb21tZW5kRHluYW1pY3M="];///dynamic/square/recommendDynamics [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, page, pageSize, types, nil]; } @@ -26,7 +26,7 @@ /// @param dynamicId 最新动态的id /// @param pageSize 一页的个数 /// @param types 类型 0,2 -+ (void)monentsLatestList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { ++ (void)momentsLatestList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9zcXVhcmUvbGF0ZXN0RHluYW1pY3M="];///dynamic/square/latestDynamics [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, dynamicId, pageSize, types, nil]; } @@ -36,7 +36,7 @@ /// @param dynamicId 最新动态的id /// @param pageSize 一页的个数 /// @param types 类型 0,2 -+ (void)monentsFollowerList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { ++ (void)momentsFollowerList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9zcXVhcmUvZm9sbG93ZXJEeW5hbWljcw=="];///dynamic/square/followerDynamics [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, dynamicId, pageSize, types, nil]; } @@ -46,7 +46,7 @@ /// @param dynamicId 动态的id /// @param pageSize 一页的个数 /// @param uid 类型 uid -+ (void)monentsInteractiveList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize uid:(NSString *)uid { ++ (void)momentsInteractiveList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize uid:(NSString *)uid { NSString * fang = [NSString stringFromBase64String:@"aW50ZXJhY3RpdmUvbGlzdA=="];///interactive/list NSMutableDictionary * dic = [NSMutableDictionary dictionary]; [dic safeSetObject:dynamicId forKey:@"id"]; @@ -56,11 +56,11 @@ } /// 清空互动消息 -/// @param complection 完成 +/// @param completion 完成 /// @param uid 用户的uid -+ (void)monentsInteractiveClear:(HttpRequestHelperCompletion)complection uid:(NSString *)uid { ++ (void)momentsInteractiveClear:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { NSString * fang = [NSString stringFromBase64String:@"aW50ZXJhY3RpdmUvY2xlYXI="];///interactive/clear - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, uid, nil]; + [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, nil]; } /// 获取话题列表 @@ -69,7 +69,7 @@ /// @param page 当前的页数 /// @param pageSize 一页多少个 /// @param worldTypeId 类型0 -+ (void)monentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize worldTypeId:(NSString *)worldTypeId { ++ (void)momentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize worldTypeId:(NSString *)worldTypeId { NSString * fang = [NSString stringFromBase64String:@"d29ybGQvbGlzdA=="];///world/list [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, page, pageSize, worldTypeId, nil]; } @@ -80,7 +80,7 @@ /// @param uid 动态发布者的uid /// @param worldId 动态的话题id /// @param shareUid 分享者的uid -+ (void)userShareMonents:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid worldId:(NSString *)worldId shareUid:(NSString *)shareUid { ++ (void)userShareMoments:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid worldId:(NSString *)worldId shareUid:(NSString *)shareUid { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9zaGFyZQ=="];///dynamic/share [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dynamicId, uid, worldId, shareUid, nil]; } @@ -92,7 +92,7 @@ /// @param status 0 取消点赞 1 点赞 /// @param likedUid 点赞人的uid /// @param worldId 世界的id -+ (void)monentsLike:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { ++ (void)momentsLike:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9saWtl"];///dynamic/like [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dynamicId, uid, status, likedUid, worldId, nil]; } @@ -102,7 +102,7 @@ /// @param dynamicId 动态的id /// @param worldId 话题的id /// @param uid 用户的uid -+ (void)monentsDetail:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId uid:(NSString *)uid { ++ (void)momentsDetail:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId uid:(NSString *)uid { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9kZXRhaWw="];///dynamic/detail [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dynamicId, worldId, uid, nil]; } @@ -112,7 +112,7 @@ /// @param uid 用户的uid /// @param dynamicId 动态的id /// @param content 内容 -+ (void)monentDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content { ++ (void)momentDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9jb21tZW50L3B1Ymxpc2g="];///dynamic/comment/publish [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, dynamicId, content, nil]; } @@ -123,7 +123,7 @@ /// @param dynamicId 动态的id /// @param content 内容 /// @param commentId 评论的id -+ (void)replyMonentsDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content commentId:(NSString *)commentId { ++ (void)replyMomentsDetailCommon:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId content:(NSString *)content commentId:(NSString *)commentId { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9jb21tZW50L3JlcGx5"];///dynamic/comment/reply [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, dynamicId, content, commentId, nil]; } @@ -135,7 +135,7 @@ /// @param uid uid /// @param pageSize 一页多少个 /// @param timestamp 上一个评论的时间戳 -+ (void)monentsCommentList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize timestamp:(NSString *)timestamp { ++ (void)momentsCommentList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize timestamp:(NSString *)timestamp { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9jb21tZW50L2xpc3Q="];///dynamic/comment/list NSMutableDictionary * dic = [NSMutableDictionary dictionary]; [dic safeSetObject:dynamicId forKey:@"dynamicId"]; @@ -154,7 +154,7 @@ /// @param pageSize 每页多少个 /// @param commentId 评论的id /// @param timestamp 上条回复的时间 -+ (void)monentsCommentReplyList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize commentId:(NSString *)commentId timestamp:(NSString *)timestamp { ++ (void)momentsCommentReplyList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid pageSize:(NSString *)pageSize commentId:(NSString *)commentId timestamp:(NSString *)timestamp { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9jb21tZW50L3JlcGx5L2xpc3Q="];///dynamic/comment/reply/list [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dynamicId, uid, pageSize, commentId, timestamp, nil]; } @@ -165,7 +165,7 @@ /// @param uid 用户的uid /// @param type 类型 /// @param page 当前的页数 -+ (void)monentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type page:(NSString *)page { ++ (void)momentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type page:(NSString *)page { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9zcXVhcmUvd29ybGQ="];///dynamic/square/world [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, type, page, nil]; } @@ -178,7 +178,7 @@ /// @param worldId 话题的id /// @param content 内容 /// @param resList 发布的图片 -+ (void)monentsPublish:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList { ++ (void)momentsPublish:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9zcXVhcmUvcHVibGlzaA=="];///dynamic/square/publish NSMutableDictionary * dic = [NSMutableDictionary dictionary]; [dic safeSetObject:uid forKey:@"uid"]; @@ -203,7 +203,7 @@ /// @param types l类型 /// @param worldId 话题的id /// @param pageSize 一页多少个 -+ (void)monentsTopicLatestList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize { ++ (void)momentsTopicLatestList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize { NSMutableDictionary * dic = [NSMutableDictionary dictionary]; [dic safeSetObject:uid forKey:@"uid"]; [dic safeSetObject:types forKey:@"types"]; @@ -223,7 +223,7 @@ /// @param types l类型 /// @param worldId 话题的id /// @param pageSize 一页多少个 -+ (void)monentsTopicRecommendList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize { ++ (void)momentsTopicRecommendList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId types:(NSString *)types worldId:(NSString *)worldId pageSize:(NSString *)pageSize { NSMutableDictionary * dic = [NSMutableDictionary dictionary]; [dic safeSetObject:uid forKey:@"uid"]; [dic safeSetObject:types forKey:@"types"]; @@ -240,28 +240,17 @@ /// @param completion 完成 /// @param worldId 话题id /// @param uid 用户uid -+ (void)monentsTopicDetailInfo:(HttpRequestHelperCompletion)completion worldId:(NSString *)worldId uid:(NSString *)uid{ ++ (void)momentsTopicDetailInfo:(HttpRequestHelperCompletion)completion worldId:(NSString *)worldId uid:(NSString *)uid{ NSString * fang = [NSString stringFromBase64String:@"d29ybGQvZGV0YWls"];///world/detail [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,worldId, uid, nil]; } -/// 获取动态话题列表 -/// @param completion 完成 -/// @param uid uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param worldTypeId 类型 -+ (void)moentsTopicList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize worldTypeId:(NSString *)worldTypeId { - NSString * fang = [NSString stringFromBase64String:@"d29ybGQvbGlzdA=="];///world/list - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, page, pageSize, worldTypeId, nil]; -} - /// 删除动态 /// @param completion 完成 /// @param uid uid /// @param dynamicId 动态的id /// @param worldId 话题的id -+ (void)monentsDelete:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId { ++ (void)momentsDelete:(HttpRequestHelperCompletion)completion uid:(NSString *)uid dynamicId:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * fang = [NSString stringFromBase64String:@"ZHluYW1pYy9kZWxldGU="];///dynamic/delete [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, dynamicId, worldId, nil]; } @@ -269,14 +258,14 @@ /// 获取动态没有阅读数 /// @param completion 完成 /// @param uid uid -+ (void)monentsUnReadCount:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { ++ (void)momentsUnReadCount:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { NSString * fang = [NSString stringFromBase64String:@"aW50ZXJhY3RpdmUvdW5yZWFkQ291bnQ="];///interactive/unreadCount [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, nil]; } /// 屏蔽 /// @param completion 完成 /// @param type type为0 => 屏蔽动态, objId 为 动态id, type为1 => 屏蔽房间, objId 为 用户uid -+ (void)requesstShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId{ ++ (void)requestShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId{ [self makeRequest:[NSString stringWithFormat:@"%@%@%@",@"user/",@"black/",@"add"] method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, type,objId, nil]; } @end diff --git a/YuMi/Modules/YMMonents/Model/MonentsInfoModel.h b/YuMi/Modules/YMMonents/Model/MomentsInfoModel.h similarity index 91% rename from YuMi/Modules/YMMonents/Model/MonentsInfoModel.h rename to YuMi/Modules/YMMonents/Model/MomentsInfoModel.h index ff7b54c2..d34d3bf4 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsInfoModel.h +++ b/YuMi/Modules/YMMonents/Model/MomentsInfoModel.h @@ -13,10 +13,10 @@ typedef NS_ENUM(NSInteger, MonentsContentType) { ///纯文字的 MonentsContentType_Text = 0, ///图片 - MonentsContentType_Picture = 2 + MomentsContentType_Picture = 2 }; -@class MonentsPicInfoModel; -@interface MonentsInfoModel : PIBaseModel +@class MomentsPicInfoModel; +@interface MomentsInfoModel : PIBaseModel ///类型 @property (nonatomic,assign) MonentsContentType type; ///用户的uid @@ -44,7 +44,7 @@ typedef NS_ENUM(NSInteger, MonentsContentType) { //发布时间 @property (nonatomic,copy) NSString *publishTime; ///等级 -@property (nonatomic,strong) NSString *experLevelPic; +@property (nonatomic,strong) NSString *expertLevelPic; ///魅力等级 @property (nonatomic,strong) NSString *charmLevelPic; ///广场是否置顶 @@ -54,7 +54,7 @@ typedef NS_ENUM(NSInteger, MonentsContentType) { ///VIP信息 @property (nonatomic, strong) UserVipInfoVo *userVipInfoVO; ///发布的内容 -@property (nonatomic,copy) NSArray *dynamicResList; +@property (nonatomic,copy) NSArray *dynamicResList; ///头饰url地址 @property (nonatomic,copy) NSString *headwearPic; ///头饰url地址 @@ -93,7 +93,7 @@ typedef NS_ENUM(NSInteger, MonentsContentType) { @property (nonatomic, assign) NSInteger numberOfText; @end -@interface MonentsPicInfoModel : PIBaseModel +@interface MomentsPicInfoModel : PIBaseModel ///图片的地址 @property (nonatomic,copy) NSString * resUrl; ///格式 diff --git a/YuMi/Modules/YMMonents/Model/MonentsInfoModel.m b/YuMi/Modules/YMMonents/Model/MomentsInfoModel.m similarity index 63% rename from YuMi/Modules/YMMonents/Model/MonentsInfoModel.m rename to YuMi/Modules/YMMonents/Model/MomentsInfoModel.m index 8d1f9a6f..3c9fc2b5 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsInfoModel.m +++ b/YuMi/Modules/YMMonents/Model/MomentsInfoModel.m @@ -5,10 +5,10 @@ // Created by 冯硕 on 2022/5/11. // -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "NSString+Utils.h" -@implementation MonentsInfoModel +@implementation MomentsInfoModel - (instancetype)init { if (self = [super init]) { self.isFold = YES; @@ -17,12 +17,12 @@ } + (NSDictionary *)objectClassInArray { - return @{@"dynamicResList":MonentsPicInfoModel.class}; + return @{@"dynamicResList":MomentsPicInfoModel.class}; } @end -@implementation MonentsPicInfoModel +@implementation MomentsPicInfoModel @end diff --git a/YuMi/Modules/YMMonents/Model/MonentsListInfoModel.h b/YuMi/Modules/YMMonents/Model/MomentsListInfoModel.h similarity index 65% rename from YuMi/Modules/YMMonents/Model/MonentsListInfoModel.h rename to YuMi/Modules/YMMonents/Model/MomentsListInfoModel.h index 38ba3b95..56df6a58 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsListInfoModel.h +++ b/YuMi/Modules/YMMonents/Model/MomentsListInfoModel.h @@ -6,12 +6,12 @@ // #import -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" NS_ASSUME_NONNULL_BEGIN -@interface MonentsListInfoModel : PIBaseModel +@interface MomentsListInfoModel : PIBaseModel ///列表数据 -@property (nonatomic,strong) NSArray *dynamicList; +@property (nonatomic,strong) NSArray *dynamicList; ///下一个动态的id @property (nonatomic,copy) NSString *nextDynamicId; @end diff --git a/YuMi/Modules/YMMonents/Model/MonentsListInfoModel.m b/YuMi/Modules/YMMonents/Model/MomentsListInfoModel.m similarity index 51% rename from YuMi/Modules/YMMonents/Model/MonentsListInfoModel.m rename to YuMi/Modules/YMMonents/Model/MomentsListInfoModel.m index 5b02a853..c4b445fb 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsListInfoModel.m +++ b/YuMi/Modules/YMMonents/Model/MomentsListInfoModel.m @@ -5,12 +5,12 @@ // Created by YUMI on 2022/5/18. // -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" -@implementation MonentsListInfoModel +@implementation MomentsListInfoModel + (NSDictionary *)objectClassInArray { - return @{@"dynamicList":[MonentsInfoModel class]}; + return @{@"dynamicList":[MomentsInfoModel class]}; } @end diff --git a/YuMi/Modules/YMMonents/Model/MonentsTopicModel.h b/YuMi/Modules/YMMonents/Model/MomentsTopicModel.h similarity index 93% rename from YuMi/Modules/YMMonents/Model/MonentsTopicModel.h rename to YuMi/Modules/YMMonents/Model/MomentsTopicModel.h index 075e4b6d..fe70ed4d 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsTopicModel.h +++ b/YuMi/Modules/YMMonents/Model/MomentsTopicModel.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MonentsTopicModel : PIBaseModel +@interface MomentsTopicModel : PIBaseModel ///创建人id @property (nonatomic, copy) NSString *ownerUid; ///名称 diff --git a/YuMi/Modules/YMMonents/Model/MonentsTopicModel.m b/YuMi/Modules/YMMonents/Model/MomentsTopicModel.m similarity index 74% rename from YuMi/Modules/YMMonents/Model/MonentsTopicModel.m rename to YuMi/Modules/YMMonents/Model/MomentsTopicModel.m index 33e6ad24..57a947fc 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsTopicModel.m +++ b/YuMi/Modules/YMMonents/Model/MomentsTopicModel.m @@ -5,9 +5,9 @@ // Created by YUMI on 2022/5/18. // -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" -@implementation MonentsTopicModel +@implementation MomentsTopicModel + (NSDictionary *)replacedKeyFromPropertyName { return @{@"tId":@"id", @"desc":@"description"}; diff --git a/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h b/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h index 48c69a10..6d7bfd78 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h +++ b/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h @@ -6,7 +6,7 @@ // #import -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "YUMINNNN.h" NS_ASSUME_NONNULL_BEGIN @@ -59,7 +59,7 @@ typedef NS_ENUM(NSInteger, MonentsInteractiveActionType) { ///话题的名称 @property (nonatomic,copy) NSString *worldName; ///动态的图片 -@property (nonatomic,strong) MonentsPicInfoModel *dynamicRes; +@property (nonatomic,strong) MomentsPicInfoModel *dynamicRes; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentMinePresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMomentMinePresenter.h similarity index 71% rename from YuMi/Modules/YMMonents/Presenter/XPMonentMinePresenter.h rename to YuMi/Modules/YMMonents/Presenter/XPMomentMinePresenter.h index 9f507818..dd7c72d3 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentMinePresenter.h +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentMinePresenter.h @@ -9,18 +9,18 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPMonentMinePresenter : BaseMvpPresenter +@interface XPMomentMinePresenter : BaseMvpPresenter /// 动态点赞 /// @param dynamicId 动态id /// @param status yes 点赞 NO 取消 /// @param likedUid 点赞人的uid /// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; +- (void)likeMoment:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; /// 删除动态 /// @param dynamicId 动态id /// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId; +- (void)deleteMoments:(NSString *)dynamicId worldId:(NSString *)worldId; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentMinePresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMomentMinePresenter.m similarity index 60% rename from YuMi/Modules/YMMonents/Presenter/XPMonentMinePresenter.m rename to YuMi/Modules/YMMonents/Presenter/XPMomentMinePresenter.m index 79a740a2..2228bf2c 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentMinePresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentMinePresenter.m @@ -5,12 +5,12 @@ // Created by YUMI on 2022/8/18. // -#import "XPMonentMinePresenter.h" -#import "Api+Monents.h" -#import "XPMonentsMineProtocol.h" +#import "XPMomentMinePresenter.h" +#import "Api+Moments.h" +#import "XPMomentsMineProtocol.h" #import "AccountInfoStorage.h" -@implementation XPMonentMinePresenter +@implementation XPMomentMinePresenter /// 动态点赞 @@ -18,21 +18,21 @@ /// @param status yes 点赞 NO 取消 /// @param likedUid 点赞人的uid /// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { +- (void)likeMoment:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] likeMonentsSuccess:dynamicId status:status]; + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] likeMomentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } /// 删除动态 /// @param dynamicId 动态id /// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { +- (void)deleteMoments:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [[self getView] deleteMonentsSuccess:dynamicId]; + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [[self getView] deleteMomentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } @end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsLayoutConfig.h b/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h similarity index 66% rename from YuMi/Modules/YMMonents/Presenter/XPMonentsLayoutConfig.h rename to YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h index 9cf7a7ba..fce0e25c 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsLayoutConfig.h +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h @@ -11,13 +11,13 @@ NS_ASSUME_NONNULL_BEGIN #define kMONENTS_CONTENT_LEFT_PADDING 67 #define kMONENTS_CONTENT_RIGHT_PADDING 36 #define kMONENTS_CONTENT_MAX_WIDTH (KScreenWidth - kMONENTS_CONTENT_LEFT_PADDING - kMONENTS_CONTENT_RIGHT_PADDING) -#define kMONENTS_PIC_ONE_WIDTH 200 ///只有一个动态图片的高度 -#define kMONENTS_PIC_SPACE 4 ///图片之间的间隙的宽度或者高度 +#define kMOMENTS_PIC_ONE_WIDTH 200 ///只有一个动态图片的高度 +#define kMOMENTS_PIC_SPACE 4 ///图片之间的间隙的宽度或者高度 #define kMONENTS_USER_INFO_HEIGHT 60 ///用户信息的高度 -#define kMONENTS_TOOL_BAR_HEIGHT 58 ///底部操作栏的高度 -#define kMONENTS_CONTENT_SPACAE_HEIGHT 12 /// 每个内容之间下面的间隙的高度 -#define kMONENTS_TEXT_TOPIC_HEIGHT 20 /// 话题的高度 -#define kMONENTS_FOLD_HEIGHT 20 /// 展开 关闭的高度 +#define kMOMENTS_TOOL_BAR_HEIGHT 58 ///底部操作栏的高度 +#define kMOMENTS_CONTENT_SPACAE_HEIGHT 12 /// 每个内容之间下面的间隙的高度 +#define kMOMENTS_TEXT_TOPIC_HEIGHT 20 /// 话题的高度 +#define kMOMENTS_FOLD_HEIGHT 20 /// 展开 关闭的高度 #pragma mark - 评论的配置 #define kMONENTS_COMMENT_LEFT_PADDING 15 ///评论左的间隙 #define kMONENTS_COMMENT_RIGHT_PADDING 25 ///评论右的间隙 @@ -27,25 +27,25 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - 评论回复的配置 #define KMONENTS_COMMENT_REPLY_AVATAR_WIDTH 30 ///评论回复的头像大小 #define kMONENTS_COMMENT_REPLY_LEFT_PADDING (kMONENTS_COMMENT_LEFT_PADDING + kMONENTS_COMMENT_RIGHT_PADDING + kMONENTS_COMMENT_AVATAR_NICK_PADDING) ///回复这左边的间隙 -#define KMONENTS_COMMENT_REPLY_MAX_WIDTH (KMONENTS_COMMENT_MAX_WIDTH - KMONENTS_COMMENT_REPLY_AVATAR_WIDTH - kMONENTS_COMMENT_AVATAR_NICK_PADDING) ///评论回复内容的最大宽度 +#define kMOMENTS_COMMENT_REPLY_MAX_WIDTH (KMONENTS_COMMENT_MAX_WIDTH - KMONENTS_COMMENT_REPLY_AVATAR_WIDTH - kMONENTS_COMMENT_AVATAR_NICK_PADDING) ///评论回复内容的最大宽度 #pragma mark - 审核UI配置 #define kSIMPLE_MONENTS_CONTENT_LEFT_PADDING 16 ///动态内容左边间距 #define kSIMPLE_MONENTS_CONTENT_RIGHT_PADDING 16 ///动态内容右边间距 -#define kSIMPLE_MONENTS_CONTENT_MAX_WIDTH (KScreenWidth - kSIMPLE_MONENTS_CONTENT_LEFT_PADDING - kSIMPLE_MONENTS_CONTENT_RIGHT_PADDING) ///动态内容最大宽度 +#define kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH (KScreenWidth - kSIMPLE_MONENTS_CONTENT_LEFT_PADDING - kSIMPLE_MONENTS_CONTENT_RIGHT_PADDING) ///动态内容最大宽度 #define KSIMPLE_MONENTS_COMMENT_AVATAR_WIDTH 40 ///评论的头像大小 -@class MonentsInfoModel, MonentsCommentModel; -@interface XPMonentsLayoutConfig : NSObject -+ (void)layoutSimpleMonentsModel:(MonentsInfoModel *)monents; -+ (void)layoutMonentsModel:(MonentsInfoModel *)monents; -+ (CGFloat)monentsPicHeight:(MonentsInfoModel *)monents; -+ (CGFloat)monentsContentHeight:(MonentsInfoModel *)monents; +@class MomentsInfoModel, MonentsCommentModel; +@interface XPMomentsLayoutConfig : NSObject ++ (void)layoutSimpleMomentsModel:(MomentsInfoModel *)monents; ++ (void)layoutMomentsModel:(MomentsInfoModel *)monents; ++ (CGFloat)momentsPicHeight:(MomentsInfoModel *)monents; ++ (CGFloat)momentsContentHeight:(MomentsInfoModel *)monents; ///计算评论的高度 + (CGFloat)commentCommentRowHeight:(MonentsCommentModel * )comment; -+ (void)layoutMonentsModelWithDynamic:(MonentsInfoModel *)monents; -+ (void)getNewlayoutMonentsModelWithDynamic:(MonentsInfoModel *)monents; ++ (void)layoutMonentsModelWithDynamic:(MomentsInfoModel *)monents; ++ (void)getNewLayoutMomentsModelWithDynamic:(MomentsInfoModel *)monents; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsLayoutConfig.m b/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m similarity index 62% rename from YuMi/Modules/YMMonents/Presenter/XPMonentsLayoutConfig.m rename to YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m index e792f468..4b2962d0 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsLayoutConfig.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m @@ -5,40 +5,40 @@ // Created by YUMI on 2022/5/12. // -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "DJDKMIMOMColor.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "MonentsCommentModel.h" #import "QEmotionHelper.h" -@implementation XPMonentsLayoutConfig +@implementation XPMomentsLayoutConfig #pragma mark - 审核的布局 -+ (void)getNewlayoutMonentsModelWithDynamic:(MonentsInfoModel *)monents { ++ (void)getNewLayoutMomentsModelWithDynamic:(MomentsInfoModel *)moments { CGFloat rowHeight = 10; ///用户信息和文字之间的间隙 - rowHeight += kMONENTS_CONTENT_SPACAE_HEIGHT; + rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; ///文字内容的高度 - rowHeight += [self monentsContentHeight:monents]; + rowHeight += [self momentsContentHeight:moments]; ///图片的高度 - rowHeight += [self getNewMonentsPicHeight:monents]; + rowHeight += [self getNewMomentsPicHeight:moments]; ///如果没有图片的话 间隙就只有一个 - if (monents.type == MonentsContentType_Picture && monents.content.length > 0) { - rowHeight += (kMONENTS_CONTENT_SPACAE_HEIGHT); + if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { + rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT); } ///话题的高度 - if (monents.worldId > 0) { - rowHeight += kMONENTS_TEXT_TOPIC_HEIGHT; + if (moments.worldId > 0) { + rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; } ///底部操作栏的高度 - rowHeight += kMONENTS_TOOL_BAR_HEIGHT; - monents.rowHeight = rowHeight; + rowHeight += kMOMENTS_TOOL_BAR_HEIGHT; + moments.rowHeight = rowHeight; } -+ (CGFloat)getNewMonentsPicHeight:(MonentsInfoModel *)monents { ++ (CGFloat)getNewMomentsPicHeight:(MomentsInfoModel *)moments { ///计算图片的高度 - NSInteger picCount = monents.dynamicResList.count; + NSInteger picCount = moments.dynamicResList.count; CGFloat picHeight = 0; CGFloat width = KScreenWidth-27*2; if (picCount == 0) { @@ -46,210 +46,210 @@ } else if(picCount == 1) { picHeight = width; } else if(picCount == 2) { - picHeight = (width - kMONENTS_PIC_SPACE) / 2; + picHeight = (width - kMOMENTS_PIC_SPACE) / 2; } else { if (picCount > 9) { picCount = 9; } - CGFloat itemWidth = (width - kMONENTS_PIC_SPACE * 2) / 3; + CGFloat itemWidth = (width - kMOMENTS_PIC_SPACE * 2) / 3; NSInteger page = picCount % 3; NSInteger line = picCount / 3; if (page == 0) { - picHeight = itemWidth * line + (line -1)* kMONENTS_PIC_SPACE; + picHeight = itemWidth * line + (line -1)* kMOMENTS_PIC_SPACE; } else { - picHeight = itemWidth * (line +1) + line * kMONENTS_PIC_SPACE; + picHeight = itemWidth * (line +1) + line * kMOMENTS_PIC_SPACE; } } - monents.picHeight = picHeight; + moments.picHeight = picHeight; return picHeight; } -+ (void)layoutMonentsModelWithDynamic:(MonentsInfoModel *)monents { ++ (void)layoutMonentsModelWithDynamic:(MomentsInfoModel *)moments { CGFloat rowHeight = 10; ///用户信息和文字之间的间隙 - rowHeight += kMONENTS_CONTENT_SPACAE_HEIGHT; + rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; ///文字内容的高度 - rowHeight += [self monentsContentHeight:monents]; + rowHeight += [self momentsContentHeight:moments]; ///图片的高度 - rowHeight += [self monentsPicHeight:monents]; + rowHeight += [self momentsPicHeight:moments]; ///如果没有图片的话 间隙就只有一个 - if (monents.type == MonentsContentType_Picture && monents.content.length > 0) { - rowHeight += (kMONENTS_CONTENT_SPACAE_HEIGHT); + if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { + rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT); } ///话题的高度 - if (monents.worldId > 0) { - rowHeight += kMONENTS_TEXT_TOPIC_HEIGHT; + if (moments.worldId > 0) { + rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; } ///底部操作栏的高度 - rowHeight += kMONENTS_TOOL_BAR_HEIGHT; - monents.rowHeight = rowHeight; + rowHeight += kMOMENTS_TOOL_BAR_HEIGHT; + moments.rowHeight = rowHeight; } -+ (void)layoutSimpleMonentsModel:(MonentsInfoModel *)monents { - CGFloat rowHeight = kMONENTS_CONTENT_SPACAE_HEIGHT; ++ (void)layoutSimpleMomentsModel:(MomentsInfoModel *)moments { + CGFloat rowHeight = kMOMENTS_CONTENT_SPACAE_HEIGHT; ///文字内容的高度 - rowHeight += [self simpleMonentsContentHeight:monents]; + rowHeight += [self simpleMomentsContentHeight:moments]; ///图片的高度 - rowHeight += [self monentsPicHeight:monents]; + rowHeight += [self momentsPicHeight:moments]; ///如果没有图片的话 间隙就只有一个 - if (monents.type == MonentsContentType_Picture && monents.content.length > 0) { - rowHeight += (kMONENTS_CONTENT_SPACAE_HEIGHT * 2); + if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { + rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT * 2); }else { - rowHeight += kMONENTS_CONTENT_SPACAE_HEIGHT; + rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; } ///话题的高度 - rowHeight += kMONENTS_TEXT_TOPIC_HEIGHT; - monents.rowHeight = rowHeight; + rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; + moments.rowHeight = rowHeight; } -+ (CGFloat)simpleMonentsContentHeight:(MonentsInfoModel *)monents { - if (monents.content.length <= 0) { - monents.contentHeight = 0; ++ (CGFloat)simpleMomentsContentHeight:(MomentsInfoModel *)moments { + if (moments.content.length <= 0) { + moments.contentHeight = 0; return 0; } ///计算文本的高度 - if (!monents.contentAttribute) { + if (!moments.contentAttribute) { NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - if (monents.squareTop ) {//动态/广场 + if (moments.squareTop ) {//动态/广场 NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; attachment.bounds = CGRectMake(0, 0, 25 * 1.3 ,10 * 1.3); attachment.image = [UIImage getLanguageImage:@"monents_info_top"]; NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; [attributedString insertAttributedString:starAttribute atIndex:0]; } - [attributedString appendAttributedString:[self creatStrAttrByStr:monents.content attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15]}]]; + [attributedString appendAttributedString:[self creatStrAttrByStr:moments.content attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15]}]]; attributedString.yy_lineSpacing = 5; attributedString.yy_lineBreakMode = NSLineBreakByWordWrapping; - monents.contentAttribute = attributedString; + moments.contentAttribute = attributedString; } YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(kSIMPLE_MONENTS_CONTENT_MAX_WIDTH, CGFLOAT_MAX); + container.size = CGSizeMake(kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH, CGFLOAT_MAX); container.maximumNumberOfRows = 0; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:monents.contentAttribute]; - monents.numberOfText = layout.rowCount; + YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; + moments.numberOfText = layout.rowCount; CGFloat foldHeight = 0; if (layout.rowCount > 6) { - foldHeight = kMONENTS_FOLD_HEIGHT; - NSInteger numberOfLines = monents.isFold ? 6 : 0; + foldHeight = kMOMENTS_FOLD_HEIGHT; + NSInteger numberOfLines = moments.isFold ? 6 : 0; container.maximumNumberOfRows = numberOfLines; } - YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:monents.contentAttribute]; + YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; CGFloat contentHeight = realLayout.textBoundingSize.height; - monents.contentHeight =contentHeight; + moments.contentHeight =contentHeight; return contentHeight + foldHeight; } -+ (CGFloat)simpleMonentsPicHeight:(MonentsInfoModel *)monents { ++ (CGFloat)simpleMonentsPicHeight:(MomentsInfoModel *)moments { ///计算图片的高度 - NSInteger picCount = monents.dynamicResList.count; + NSInteger picCount = moments.dynamicResList.count; CGFloat picHeight = 0; if (picCount == 0) { picHeight = 0; } else if(picCount == 1) { - picHeight = kMONENTS_PIC_ONE_WIDTH; + picHeight = kMOMENTS_PIC_ONE_WIDTH; } else if(picCount == 2) { - picHeight = (kSIMPLE_MONENTS_CONTENT_MAX_WIDTH - kMONENTS_PIC_SPACE) / 2; + picHeight = (kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE) / 2; } else { if (picCount > 9) { picCount = 9; } - CGFloat itemWidth = (kSIMPLE_MONENTS_CONTENT_MAX_WIDTH - kMONENTS_PIC_SPACE * 2) / 3; + CGFloat itemWidth = (kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE * 2) / 3; NSInteger page = picCount % 3; NSInteger line = picCount / 3; if (page == 0) { - picHeight = itemWidth * line + (line -1)* kMONENTS_PIC_SPACE; + picHeight = itemWidth * line + (line -1)* kMOMENTS_PIC_SPACE; } else { - picHeight = itemWidth * (line +1) + line * kMONENTS_PIC_SPACE; + picHeight = itemWidth * (line +1) + line * kMOMENTS_PIC_SPACE; } } - monents.picHeight = picHeight; + moments.picHeight = picHeight; return picHeight; } #pragma mark - 正常的布局 -+ (void)layoutMonentsModel:(MonentsInfoModel *)monents { ++ (void)layoutMomentsModel:(MomentsInfoModel *)moments { CGFloat rowHeight = kMONENTS_USER_INFO_HEIGHT; ///用户信息和文字之间的间隙 - rowHeight += kMONENTS_CONTENT_SPACAE_HEIGHT; + rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; ///文字内容的高度 - rowHeight += [self monentsContentHeight:monents]; + rowHeight += [self momentsContentHeight:moments]; ///图片的高度 - rowHeight += [self monentsPicHeight:monents]; + rowHeight += [self momentsPicHeight:moments]; ///如果没有图片的话 间隙就只有一个 - if (monents.type == MonentsContentType_Picture && monents.content.length > 0) { - rowHeight += (kMONENTS_CONTENT_SPACAE_HEIGHT * 2); + if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { + rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT * 2); }else { - rowHeight += kMONENTS_CONTENT_SPACAE_HEIGHT; + rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; } ///话题的高度 - rowHeight += kMONENTS_TEXT_TOPIC_HEIGHT; + rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; ///底部操作栏的高度 - rowHeight += kMONENTS_TOOL_BAR_HEIGHT; - monents.rowHeight = rowHeight; + rowHeight += kMOMENTS_TOOL_BAR_HEIGHT; + moments.rowHeight = rowHeight; } -+ (CGFloat)monentsPicHeight:(MonentsInfoModel *)monents { ++ (CGFloat)momentsPicHeight:(MomentsInfoModel *)moments { ///计算图片的高度 - NSInteger picCount = monents.dynamicResList.count; + NSInteger picCount = moments.dynamicResList.count; CGFloat picHeight = 0; if (picCount == 0) { picHeight = 0; } else if(picCount == 1) { - picHeight = kMONENTS_PIC_ONE_WIDTH; + picHeight = kMOMENTS_PIC_ONE_WIDTH; } else if(picCount == 2) { - picHeight = (kMONENTS_CONTENT_MAX_WIDTH - kMONENTS_PIC_SPACE) / 2; + picHeight = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE) / 2; } else { if (picCount > 9) { picCount = 9; } - CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMONENTS_PIC_SPACE * 2) / 3; + CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE * 2) / 3; NSInteger page = picCount % 3; NSInteger line = picCount / 3; if (page == 0) { - picHeight = itemWidth * line + (line -1)* kMONENTS_PIC_SPACE; + picHeight = itemWidth * line + (line -1)* kMOMENTS_PIC_SPACE; } else { - picHeight = itemWidth * (line +1) + line * kMONENTS_PIC_SPACE; + picHeight = itemWidth * (line +1) + line * kMOMENTS_PIC_SPACE; } } - monents.picHeight = picHeight; + moments.picHeight = picHeight; return picHeight; } -+ (CGFloat)monentsContentHeight:(MonentsInfoModel *)monents { - if (monents.content.length <= 0) { - monents.contentHeight = 0; ++ (CGFloat)momentsContentHeight:(MomentsInfoModel *)moments { + if (moments.content.length <= 0) { + moments.contentHeight = 0; return 0; } ///计算文本的高度 - if (!monents.contentAttribute) { + if (!moments.contentAttribute) { NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - if (monents.squareTop ) {//动态/广场 + if (moments.squareTop ) {//动态/广场 NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; attachment.bounds = CGRectMake(0, 0, 25 * 1.3 ,10 * 1.3); attachment.image = [UIImage getLanguageImage:@"monents_info_top"]; NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; [attributedString insertAttributedString:starAttribute atIndex:0]; } - [attributedString appendAttributedString:[self creatStrAttrByStr:monents.content attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15]}]]; + [attributedString appendAttributedString:[self creatStrAttrByStr:moments.content attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15]}]]; attributedString.yy_lineSpacing = 5; attributedString.yy_lineBreakMode = NSLineBreakByWordWrapping; - monents.contentAttribute = attributedString; + moments.contentAttribute = attributedString; } YYTextContainer *container = [YYTextContainer new]; container.size = CGSizeMake(kMONENTS_CONTENT_MAX_WIDTH, CGFLOAT_MAX); container.maximumNumberOfRows = 0; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:monents.contentAttribute]; - monents.numberOfText = layout.rowCount; + YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; + moments.numberOfText = layout.rowCount; CGFloat foldHeight = 0; if (layout.rowCount > 6) { - foldHeight = kMONENTS_FOLD_HEIGHT; - NSInteger numberOfLines = monents.isFold ? 6 : 0; + foldHeight = kMOMENTS_FOLD_HEIGHT; + NSInteger numberOfLines = moments.isFold ? 6 : 0; container.maximumNumberOfRows = numberOfLines; } - YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:monents.contentAttribute]; + YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; CGFloat contentHeight = realLayout.textBoundingSize.height; - monents.contentHeight =contentHeight; + moments.contentHeight =contentHeight; return contentHeight + foldHeight; } @@ -272,7 +272,7 @@ QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; NSMutableAttributedString * attribute = [faceManager attributedStringByText:comment.content font:[UIFont systemFontOfSize:15]]; YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(KMONENTS_COMMENT_REPLY_MAX_WIDTH, CGFLOAT_MAX); + container.size = CGSizeMake(kMOMENTS_COMMENT_REPLY_MAX_WIDTH, CGFLOAT_MAX); container.maximumNumberOfRows = 0; YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:attribute]; CGFloat commentHeight = realLayout.textBoundingSize.height; @@ -299,7 +299,7 @@ CGFloat commentTopHeight = 10 + 15 + 10;///10顶部的间隙 15 昵称的高度 CGFloat commentBottomHeight = 10; YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(KMONENTS_COMMENT_REPLY_MAX_WIDTH, CGFLOAT_MAX); + container.size = CGSizeMake(kMOMENTS_COMMENT_REPLY_MAX_WIDTH, CGFLOAT_MAX); container.maximumNumberOfRows = 0; YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:obj.contentAttribute]; CGFloat replyContentHeight = realLayout.textBoundingSize.height; diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsRecommendPresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.h similarity index 65% rename from YuMi/Modules/YMMonents/Presenter/XPMonentsRecommendPresenter.h rename to YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.h index 3927531a..3ed5cd49 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsRecommendPresenter.h +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.h @@ -9,31 +9,31 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPMonentsRecommendPresenter : BaseMvpPresenter +@interface XPMomentsRecommendPresenter : BaseMvpPresenter /// 获取朋友圈动态推荐列表 /// @param page 当前的页数 /// @param pageSize 一页的个数 /// @param state 状态 -- (void)getMonentsRecommendList:(NSInteger)page pageSize:(NSInteger)pageSize state:(int)state; +- (void)getMomentsRecommendList:(NSInteger)page pageSize:(NSInteger)pageSize state:(int)state; /// 获取话题列表 /// @param page 当前的页数 /// @param pageSize 一页多少个 -- (void)getMonentsTopicList:(NSInteger)page pageSize:(NSInteger)pageSize; +- (void)getMomentsTopicList:(NSInteger)page pageSize:(NSInteger)pageSize; /// 动态点赞 /// @param dynamicId 动态id /// @param status yes 点赞 NO 取消 /// @param likedUid 点赞人的uid /// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; +- (void)likeMoment:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; /// 删除动态 /// @param dynamicId 动态id /// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId; +- (void)deleteMoments:(NSString *)dynamicId worldId:(NSString *)worldId; ///屏蔽 -- (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId; +- (void)requestShieldingWithType:(NSString *)type objId:(NSString *)objId; @end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsRecommendPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.m similarity index 50% rename from YuMi/Modules/YMMonents/Presenter/XPMonentsRecommendPresenter.m rename to YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.m index 1a32ea32..2e83e0b1 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsRecommendPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.m @@ -5,27 +5,30 @@ // Created by YUMI on 2022/5/13. // -#import "XPMonentsRecommendPresenter.h" +#import "XPMomentsRecommendPresenter.h" #import "AccountInfoStorage.h" -#import "Api+Monents.h" -#import "MonentsTopicModel.h" -#import "MonentsInfoModel.h" -#import "XPMonentsRecommendProtocol.h" -@implementation XPMonentsRecommendPresenter +#import "Api+Moments.h" +#import "MomentsTopicModel.h" +#import "MomentsInfoModel.h" +#import "XPMomentsRecommendProtocol.h" +@implementation XPMomentsRecommendPresenter /// 获取朋友圈动态推荐列表 /// @param page 当前的页数 /// @param pageSize 一页的个数 /// @param state 状态 -- (void)getMonentsRecommendList:(NSInteger)page pageSize:(NSInteger)pageSize state:(int)state { +- (void)getMomentsRecommendList:(NSInteger)page pageSize:(NSInteger)pageSize state:(int)state { NSString * pageStr = [NSString stringWithFormat:@"%ld", page]; NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api monentsRecommendList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [MonentsInfoModel modelsWithArray:data.data]; - [[self getView] getMonentsRecommendListSuccess:array state:state]; + @kWeakify(self); + [Api momentsRecommendList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + @kStrongify(self); + NSArray *array = [MomentsInfoModel modelsWithArray:data.data]; + [[self getView] getMomentsRecommendListSuccess:array state:state]; } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getMonentsRecommendListFail:msg state:state]; + @kStrongify(self); + [[self getView] getMomentsRecommendListFail:msg state:state]; } showLoading:NO] page:pageStr pageSize:pageSizeStr types:@"0,2"]; } @@ -33,13 +36,15 @@ /// 获取话题列表 /// @param page 当前的页数 /// @param pageSize 一页多少个 -- (void)getMonentsTopicList:(NSInteger)page pageSize:(NSInteger)pageSize { +- (void)getMomentsTopicList:(NSInteger)page pageSize:(NSInteger)pageSize { NSString * uid = [AccountInfoStorage instance].getUid; NSString * pageStr = [NSString stringWithFormat:@"%ld", page]; NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api monentsTopicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [MonentsTopicModel modelsWithArray:data.data[@"records"]]; - [[self getView] monentsTopicListSuccess:array]; + @kWeakify(self); + [Api momentsTopicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + @kStrongify(self); + NSArray * array = [MomentsTopicModel modelsWithArray:data.data[@"records"]]; + [[self getView] momentsTopicListSuccess:array]; }showLoading:NO] uid:uid page:pageStr pageSize:pageSizeStr worldTypeId:@"1"]; } @@ -48,26 +53,32 @@ /// @param status yes 点赞 NO 取消 /// @param likedUid 点赞人的uid /// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { +- (void)likeMoment:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] likeMonentsSuccess:dynamicId status:status]; + @kWeakify(self); + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + @kStrongify(self); + [[self getView] likeMomentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } /// 删除动态 /// @param dynamicId 动态id /// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { +- (void)deleteMoments:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [[self getView] deleteMonentsSuccess:dynamicId]; + @kWeakify(self); + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + @kStrongify(self); + [[self getView] deleteMomentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } -- (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] requesstShieldingSuccess:objId]; +- (void)requestShieldingWithType:(NSString *)type objId:(NSString *)objId{ + @kWeakify(self); + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + @kStrongify(self); + [[self getView] requestShieldingSuccess:objId]; }] type:type objId:objId]; } @end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicListPresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.h similarity index 87% rename from YuMi/Modules/YMMonents/Presenter/XPMonentsTopicListPresenter.h rename to YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.h index a48f2a8b..78b137d2 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicListPresenter.h +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPMonentsTopicListPresenter : BaseMvpPresenter +@interface XPMomentsTopicListPresenter : BaseMvpPresenter - (void)getMoentsTopicList:(int)page pageSize:(int)pageSize state:(int)state; /// 删除动态 diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicListPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.m similarity index 59% rename from YuMi/Modules/YMMonents/Presenter/XPMonentsTopicListPresenter.m rename to YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.m index 0cd6bcd1..5d836df7 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicListPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.m @@ -5,23 +5,23 @@ // Created by YUMI on 2022/8/18. // -#import "XPMonentsTopicListPresenter.h" -#import "Api+Monents.h" +#import "XPMomentsTopicListPresenter.h" +#import "Api+Moments.h" #import "AccountInfoStorage.h" -#import "MonentsTopicModel.h" -#import "XPMonentsTopicListProtocol.h" +#import "MomentsTopicModel.h" +#import "XPMomentsTopicListProtocol.h" -@implementation XPMonentsTopicListPresenter +@implementation XPMomentsTopicListPresenter - (void)getMoentsTopicList:(int)page pageSize:(int)pageSize state:(int)state { NSString * uid = [AccountInfoStorage instance].getUid; NSString * pageStr = [NSString stringWithFormat:@"%d", page]; NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api moentsTopicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [MonentsTopicModel modelsWithArray:data.data[@"records"]]; - [[self getView] getMonentsTopicListSuccess:array state:state]; + [Api momentsTopicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + NSArray * array = [MomentsTopicModel modelsWithArray:data.data[@"records"]]; + [[self getView] getMomentsTopicListSuccess:array state:state]; }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getMoentsTopicFail:msg state:state]; + [[self getView] getMomentsTopicFail:msg state:state]; } showLoading:YES] uid:uid page:pageStr pageSize:pageSizeStr worldTypeId:@"0"]; } @@ -30,8 +30,8 @@ /// @param worldId 话题id - (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [[self getView] deleteMonentsSuccess:dynamicId]; + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [[self getView] deleteMomentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m index c200ebfd..21aac29d 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m @@ -6,10 +6,10 @@ // #import "XPMonentDetailPresenter.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "AccountInfoStorage.h" #import "XPMonentsDetailProtocol.h" -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "MonentsCommentModel.h" #import "MonentsCommentReplyModel.h" @implementation XPMonentDetailPresenter @@ -18,8 +18,8 @@ /// @param dynamicId 动态ID - (void)getMonentsDetail:(NSString *)dynamicId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDetail:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MonentsInfoModel * monentsInfo = [MonentsInfoModel modelWithDictionary:data.data]; + [Api momentsDetail:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + MomentsInfoModel * monentsInfo = [MomentsInfoModel modelWithDictionary:data.data]; [[self getView] getMonentsDetailSuccess:monentsInfo]; } showLoading:YES] dynamicId:dynamicId worldId:@"" uid:uid]; } @@ -31,7 +31,7 @@ /// @param state 状态 - (void)getMonentsCommentList:(NSString *)dynamicId timestamp:(NSString *)timestamp status:(int)state{ NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsCommentList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsCommentList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { MonentsCommentListModel * info = [MonentsCommentListModel modelWithDictionary:data.data]; [[self getView] getMonentsCommentListSuccess:info state:state]; }] dynamicId:dynamicId uid:uid pageSize:@"10" timestamp:timestamp]; @@ -44,7 +44,7 @@ /// @param timestamp 最后一条评论的时间戳 - (void)getMonentsCommentReplyList:(NSString *)dynamicId commentId:(NSString *)commentId timestamp:(NSString *)timestamp { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsCommentReplyList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsCommentReplyList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { MonentsCommentReplyModel * replyInfo = [MonentsCommentReplyModel modelWithDictionary:data.data]; [[self getView] getMonentsCommentReplyListSuccess:replyInfo commentId:commentId]; }] dynamicId:dynamicId uid:uid pageSize:@"5" commentId:commentId timestamp:timestamp]; @@ -58,7 +58,7 @@ - (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] likeMonentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } @@ -68,7 +68,7 @@ /// @param worldId 话题id - (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [[self getView] deleteMonentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } @@ -79,7 +79,7 @@ /// @param content 评论的内容 - (void)commontMonents:(NSString *)dynamicId content:(NSString *)content { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentDetailCommon:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentDetailCommon:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] commonMonentsSuccess]; } showLoading:YES] uid:uid dynamicId:dynamicId content:content]; } @@ -90,12 +90,12 @@ /// @param content 评论的内容 - (void)replayCommon:(NSString *)commonId dynamicId:(NSString *)dynamicId content:(NSString *)content { NSString * uid = [AccountInfoStorage instance].getUid; - [Api replyMonentsDetailCommon:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api replyMomentsDetailCommon:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] replyMonentsSuccess]; }] uid:uid dynamicId:dynamicId content:content commentId:commonId]; } - (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] requesstShieldingSuccess:objId]; }] type:type objId:objId]; } diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsAttentionPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentsAttentionPresenter.m index 882a5215..baab58b4 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsAttentionPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentsAttentionPresenter.m @@ -6,8 +6,8 @@ // #import "XPMonentsAttentionPresenter.h" -#import "Api+Monents.h" -#import "MonentsListInfoModel.h" +#import "Api+Moments.h" +#import "MomentsListInfoModel.h" #import "XPMonentsAttentionProtocol.h" #import "AccountInfoStorage.h" @implementation XPMonentsAttentionPresenter @@ -21,8 +21,8 @@ dynamicId = @""; } NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api monentsFollowerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MonentsListInfoModel *listInfo = [MonentsListInfoModel modelWithDictionary:data.data]; + [Api momentsFollowerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + MomentsListInfoModel *listInfo = [MomentsListInfoModel modelWithDictionary:data.data]; [[self getView] getMonentsAttentionListSuccess:listInfo state:state]; } fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView] getMonentsAttentionListFail:msg state:state]; @@ -37,7 +37,7 @@ - (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] likeMonentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } @@ -47,13 +47,13 @@ /// @param worldId 话题id - (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [[self getView] deleteMonentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } - (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] requesstShieldingSuccess:objId]; }] type:type objId:objId]; } diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m index 07183055..eba90030 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m @@ -6,7 +6,7 @@ // #import "XPMonentsInteractivePresenter.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "XPMonentsInteractiveProtocol.h" #import "AccountInfoStorage.h" #import "MonentsInteractiveModel.h" @@ -21,7 +21,7 @@ - (void)getMonentsInteractiveList:(NSString *)dynamicId pageSize:(int)pageSize state:(int)state{ NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsInteractiveList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsInteractiveList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSArray * array = [MonentsInteractiveModel modelsWithArray:data.data]; [[self getView] getMonentsInteractiveListSueccess:array state:state]; } fail:^(NSInteger code, NSString * _Nullable msg) { @@ -32,7 +32,7 @@ ///清空互动消息 - (void)clearInteractiveMessage { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsInteractiveClear:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsInteractiveClear:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] clearInteractiveMessageSuccess]; } showLoading:YES] uid:uid]; } diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsLatestPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentsLatestPresenter.m index 786a087a..ed00ec09 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsLatestPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentsLatestPresenter.m @@ -6,8 +6,8 @@ // #import "XPMonentsLatestPresenter.h" -#import "Api+Monents.h" -#import "MonentsListInfoModel.h" +#import "Api+Moments.h" +#import "MomentsListInfoModel.h" #import "XPMonentsLatestProtocol.h" #import "AccountInfoStorage.h" @implementation XPMonentsLatestPresenter @@ -21,8 +21,8 @@ dynamicId = @""; } NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api monentsLatestList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MonentsListInfoModel *listInfo = [MonentsListInfoModel modelWithDictionary:data.data]; + [Api momentsLatestList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + MomentsListInfoModel *listInfo = [MomentsListInfoModel modelWithDictionary:data.data]; [[self getView] getMonentsLatestListSuccess:listInfo state:state]; } fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView] getMonentsLatestListFail:msg state:state]; @@ -37,7 +37,7 @@ - (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] likeMonentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } @@ -47,12 +47,12 @@ /// @param worldId 话题id - (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [[self getView] deleteMonentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } - (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] requesstShieldingSuccess:objId]; }] type:type objId:objId]; } diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.h index 113bc43e..ad102c68 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.h +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.h @@ -6,7 +6,7 @@ // #import "BaseMvpPresenter.h" -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" NS_ASSUME_NONNULL_BEGIN @interface XPMonentsPublishPresenter : BaseMvpPresenter diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.m index 830d5e51..86628d70 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentsPublishPresenter.m @@ -6,7 +6,7 @@ // #import "XPMonentsPublishPresenter.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "XPMonentsPublishProtocol.h" #import "AccountInfoStorage.h" @@ -15,7 +15,7 @@ - (void)publishMonents:(NSString *)worldId type:(MonentsContentType)type content:(NSString *)content resList:(NSArray *)resList { NSString * uid = [AccountInfoStorage instance].getUid; NSString * typeStr = [NSString stringWithFormat:@"%ld", type]; - [Api monentsPublish:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsPublish:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] publishMonentsSuccess]; } showLoading:YES] uid:uid type:typeStr worldId:worldId content:content resList:resList]; } diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicLatestPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicLatestPresenter.m index c2ca0a16..5a50a1f6 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicLatestPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicLatestPresenter.m @@ -6,16 +6,16 @@ // #import "XPMonentsTopicLatestPresenter.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "AccountInfoStorage.h" -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" #import "XPMonentsTopicLatestProtocol.h" @implementation XPMonentsTopicLatestPresenter - (void)getMonentsTopicLatestList:(NSString *)dynamicId worldId:(NSString *)worldId state:(int)state { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsTopicLatestList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MonentsListInfoModel * model = [MonentsListInfoModel modelWithDictionary:data.data]; + [Api momentsTopicLatestList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + MomentsListInfoModel * model = [MomentsListInfoModel modelWithDictionary:data.data]; [[self getView] getMonentsTopicLatestListSuccess:model state:state]; }fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView] getMonentsTopicLatestListFail:msg state:state]; @@ -30,7 +30,7 @@ - (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] likeMonentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } @@ -40,12 +40,12 @@ /// @param worldId 话题id - (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [[self getView] deleteMonentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } - (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] requesstShieldingSuccess:objId]; }] type:type objId:objId]; } diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicRecommendPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicRecommendPresenter.m index 0452b783..74451228 100644 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicRecommendPresenter.m +++ b/YuMi/Modules/YMMonents/Presenter/XPMonentsTopicRecommendPresenter.m @@ -6,16 +6,16 @@ // #import "XPMonentsTopicRecommendPresenter.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "AccountInfoStorage.h" -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" #import "XPMonentsTopicRecommendProtocol.h" @implementation XPMonentsTopicRecommendPresenter - (void)getMonentsTopicRecommendList:(NSString *)dynamicId worldId:(NSString *)worldId state:(int)state { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsTopicRecommendList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MonentsListInfoModel * model = [MonentsListInfoModel modelWithDictionary:data.data]; + [Api momentsTopicRecommendList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + MomentsListInfoModel * model = [MomentsListInfoModel modelWithDictionary:data.data]; [[self getView] getMonentsTopicRecommendListSuccess:model state:state]; }fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView] getMonentsTopicRecommendListFail:msg state:state]; @@ -30,7 +30,7 @@ - (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * statusStr = status ? @"1" : @"0"; - [Api monentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] likeMonentsSuccess:dynamicId status:status]; } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; } @@ -40,12 +40,12 @@ /// @param worldId 话题id - (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [[self getView] deleteMonentsSuccess:dynamicId]; } uid:uid dynamicId:dynamicId worldId:worldId]; } - (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] requesstShieldingSuccess:objId]; }] type:type objId:objId]; } diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsDetailViewControllerDelegate.h b/YuMi/Modules/YMMonents/Protocol/XPMomentsDetailViewControllerDelegate.h similarity index 56% rename from YuMi/Modules/YMMonents/Protocol/XPMonentsDetailViewControllerDelegate.h rename to YuMi/Modules/YMMonents/Protocol/XPMomentsDetailViewControllerDelegate.h index fcc87071..1ae35360 100644 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsDetailViewControllerDelegate.h +++ b/YuMi/Modules/YMMonents/Protocol/XPMomentsDetailViewControllerDelegate.h @@ -9,10 +9,10 @@ NS_ASSUME_NONNULL_BEGIN -@protocol XPMonentsDetailViewControllerDelegate +@protocol XPMomentsDetailViewControllerDelegate ///删除了动态 -- (void)xPMonentsDetailViewController:(UIViewController *)view deleteMonents:(NSString *)dynamicId; +- (void)XPMomentsDetailViewController:(UIViewController *)view deleteMoments:(NSString *)dynamicId; @end diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsMineProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMomentsMineProtocol.h similarity index 64% rename from YuMi/Modules/YMMonents/Protocol/XPMonentsMineProtocol.h rename to YuMi/Modules/YMMonents/Protocol/XPMomentsMineProtocol.h index 12c8f56c..849551e1 100644 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsMineProtocol.h +++ b/YuMi/Modules/YMMonents/Protocol/XPMomentsMineProtocol.h @@ -9,12 +9,12 @@ NS_ASSUME_NONNULL_BEGIN -@protocol XPMonentsMineProtocol +@protocol XPMomentsMineProtocol ///点赞/取消动态成功 -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status; +- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status; ///删除话题成功 -- (void)deleteMonentsSuccess:(NSString *)monentsInfo; +- (void)deleteMomentsSuccess:(NSString *)monentsInfo; ///屏蔽 - (void)requesstShieldingSuccess:(NSString *)monentsInfo; @end diff --git a/YuMi/Modules/YMMonents/Protocol/XPMomentsRecommendProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMomentsRecommendProtocol.h new file mode 100644 index 00000000..44bd02a0 --- /dev/null +++ b/YuMi/Modules/YMMonents/Protocol/XPMomentsRecommendProtocol.h @@ -0,0 +1,29 @@ +// +// XPMomentsRecommendProtocol.h +// YUMI +// +// Created by YUMI on 2022/5/13. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol XPMomentsRecommendProtocol + +///获取推荐列表从成功 +- (void)getMomentsRecommendListSuccess:(NSArray *)array state:(int)state; +///获取推荐列表失败 +- (void)getMomentsRecommendListFail:(NSString *)msg state:(int)state; +///获取话题列表成功 +- (void)momentsTopicListSuccess:(NSArray *)array; +///点赞/取消动态成功 +- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status; + +///删除话题成功 +- (void)deleteMomentsSuccess:(NSString *)monentsInfo; +///屏蔽 +- (void)requestShieldingSuccess:(NSString *)monentsInfo; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Protocol/XPMomentsTopicListProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMomentsTopicListProtocol.h new file mode 100644 index 00000000..bf563317 --- /dev/null +++ b/YuMi/Modules/YMMonents/Protocol/XPMomentsTopicListProtocol.h @@ -0,0 +1,21 @@ +// +// YMMonentsTopicListProtocol.h +// YUMI +// +// Created by YUMI on 2022/8/18. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol XPMomentsTopicListProtocol +- (void)getMomentsTopicListSuccess:(NSArray *)list state:(int)state; + +- (void)getMomentsTopicFail:(NSString *)message state:(int)state; + +///删除话题成功 +- (void)deleteMomentsSuccess:(NSString *)momentsInfo; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsAttentionProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMonentsAttentionProtocol.h index 45a52284..5a722a5c 100644 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsAttentionProtocol.h +++ b/YuMi/Modules/YMMonents/Protocol/XPMonentsAttentionProtocol.h @@ -8,10 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsListInfoModel; +@class MomentsListInfoModel; @protocol XPMonentsAttentionProtocol ///获取最新列表从成功 -- (void)getMonentsAttentionListSuccess:(MonentsListInfoModel *)listInfo state:(int)state; +- (void)getMonentsAttentionListSuccess:(MomentsListInfoModel *)listInfo state:(int)state; ///获取最新列表失败 - (void)getMonentsAttentionListFail:(NSString *)msg state:(int)state; diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsDetailProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMonentsDetailProtocol.h index fd060c71..baf7a7e8 100644 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsDetailProtocol.h +++ b/YuMi/Modules/YMMonents/Protocol/XPMonentsDetailProtocol.h @@ -8,10 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel, MonentsCommentListModel, MonentsCommentReplyModel; +@class MomentsInfoModel, MonentsCommentListModel, MonentsCommentReplyModel; @protocol XPMonentsDetailProtocol ///获取动态详情成功 -- (void)getMonentsDetailSuccess:(MonentsInfoModel *)commentInfo; +- (void)getMonentsDetailSuccess:(MomentsInfoModel *)commentInfo; ///获取动态 评论的列表 - (void)getMonentsCommentListSuccess:(MonentsCommentListModel *)replyList state:(int)state; diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsLatestProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMonentsLatestProtocol.h index 122b369d..48bfa07c 100644 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsLatestProtocol.h +++ b/YuMi/Modules/YMMonents/Protocol/XPMonentsLatestProtocol.h @@ -8,10 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsListInfoModel; +@class MomentsListInfoModel; @protocol XPMonentsLatestProtocol ///获取最新列表从成功 -- (void)getMonentsLatestListSuccess:(MonentsListInfoModel *)listInfo state:(int)state; +- (void)getMonentsLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state; ///获取最新列表从失败 - (void)getMonentsLatestListFail:(NSString *)msg state:(int)state; diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsRecommendProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMonentsRecommendProtocol.h deleted file mode 100644 index b24374ae..00000000 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsRecommendProtocol.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMonentsRecommendProtocol.h -// YUMI -// -// Created by YUMI on 2022/5/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMonentsRecommendProtocol - -///获取推荐列表从成功 -- (void)getMonentsRecommendListSuccess:(NSArray *)array state:(int)state; -///获取推荐列表失败 -- (void)getMonentsRecommendListFail:(NSString *)msg state:(int)state; -///获取话题列表成功 -- (void)monentsTopicListSuccess:(NSArray *)array; -///点赞/取消动态成功 -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status; - -///删除话题成功 -- (void)deleteMonentsSuccess:(NSString *)monentsInfo; -///屏蔽 -- (void)requesstShieldingSuccess:(NSString *)monentsInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicLatestProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicLatestProtocol.h index 9595c066..0b9f8de1 100644 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicLatestProtocol.h +++ b/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicLatestProtocol.h @@ -8,9 +8,9 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsListInfoModel; +@class MomentsListInfoModel; @protocol XPMonentsTopicLatestProtocol -- (void)getMonentsTopicLatestListSuccess:(MonentsListInfoModel *)info state:(int)state; +- (void)getMonentsTopicLatestListSuccess:(MomentsListInfoModel *)info state:(int)state; - (void)getMonentsTopicLatestListFail:(NSString *)msg state:(int)state; diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicListProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicListProtocol.h deleted file mode 100644 index 4b506355..00000000 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicListProtocol.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMonentsTopicListProtocol.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMonentsTopicListProtocol -- (void)getMonentsTopicListSuccess:(NSArray *)list state:(int)state; - -- (void)getMoentsTopicFail:(NSString *)message state:(int)state; - -///删除话题成功 -- (void)deleteMonentsSuccess:(NSString *)monentsInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicRecommendProtocol.h b/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicRecommendProtocol.h index 8d32100c..e0e86943 100644 --- a/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicRecommendProtocol.h +++ b/YuMi/Modules/YMMonents/Protocol/XPMonentsTopicRecommendProtocol.h @@ -8,10 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsListInfoModel; +@class MomentsListInfoModel; @protocol XPMonentsTopicRecommendProtocol -- (void)getMonentsTopicRecommendListSuccess:(MonentsListInfoModel *)info state:(int)state; +- (void)getMonentsTopicRecommendListSuccess:(MomentsListInfoModel *)info state:(int)state; - (void)getMonentsTopicRecommendListFail:(NSString *)msg state:(int)state; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h index 3781f44a..00609e0b 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h +++ b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h @@ -7,13 +7,13 @@ #import -@class MonentsInfoModel; +@class MomentsInfoModel; NS_ASSUME_NONNULL_BEGIN @interface XPMomentListCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; +@property (nonatomic,strong) MomentsInfoModel *monentsInfo; @end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m index 61ccf850..52d9f78b 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m @@ -11,7 +11,7 @@ #import "NetImageView.h" #import "NSArray+Safe.h" -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" @interface XPMomentListCollectionViewCell() @@ -83,11 +83,11 @@ } #pragma mark - Getters And Setters -- (void)setMonentsInfo:(MonentsInfoModel *)monentsInfo { +- (void)setMonentsInfo:(MomentsInfoModel *)monentsInfo { _monentsInfo = monentsInfo; if (_monentsInfo) { if (_monentsInfo.dynamicResList.count > 0) { - MonentsPicInfoModel * picInfo = [_monentsInfo.dynamicResList xpSafeObjectAtIndex:0]; + MomentsPicInfoModel * picInfo = [_monentsInfo.dynamicResList xpSafeObjectAtIndex:0]; self.coverImageView.imageUrl = picInfo.resUrl; }else{ self.coverImageView.imageUrl = _monentsInfo.avatar; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.h similarity index 74% rename from YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.h rename to YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.h index e3535711..6bfb1035 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.h +++ b/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPMonentsEmptyTableViewCell : UITableViewCell +@interface XPMomentsEmptyTableViewCell : UITableViewCell @end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.m similarity index 94% rename from YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.m rename to YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.m index c12bffe7..9b7b153a 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.m @@ -5,19 +5,19 @@ // Created by YUMI on 2022/5/13. // -#import "XPMonentsEmptyTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" ///Third #import ///Tool #import "DJDKMIMOMColor.h" #import "UIImageConstant.h" -@interface XPMonentsEmptyTableViewCell () +@interface XPMomentsEmptyTableViewCell () @property (nonatomic,strong) UIImageView *emptyImageView; @property (nonatomic,strong) UILabel *titleLabel; @end -@implementation XPMonentsEmptyTableViewCell +@implementation XPMomentsEmptyTableViewCell - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h new file mode 100644 index 00000000..1239b641 --- /dev/null +++ b/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h @@ -0,0 +1,40 @@ +// +// XPMonentsTableViewCell.h +// xplan-ios +// +// Created by 冯硕 on 2022/5/11. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@class MomentsInfoModel, XPMomentsTableViewCell; + +@protocol XPMomentsTableViewCellDelegate +///点击了点赞 +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentsInfo; +///点击了删除 +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentsInfo; +@optional +///点击了评论 +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)momentsInfo; +///点击了展开 +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo; +///屏蔽 +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)momentsInfo; + + +@end + +@interface XPMomentsTableViewCell : UITableViewCell +@property (nonatomic,strong) MomentsInfoModel *mineMomentsInfo; +@property (nonatomic,strong) MomentsInfoModel *momentsInfo; +@property (nonatomic,assign) BOOL isFillet; +@property (nonatomic,assign) BOOL isTopic;///是否是话题页 +///代理 +@property (nonatomic,weak) id delegate; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m similarity index 65% rename from YuMi/Modules/YMMonents/View/Cell/XPMonentsTableViewCell.m rename to YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m index 4a26121d..8e66327d 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m @@ -1,58 +1,57 @@ // -// XPMonentsTableViewCell.m +// XPMomentsTableViewCell.m // xplan-ios // // Created by 冯硕 on 2022/5/11. // -#import "XPMonentsTableViewCell.h" +#import "XPMomentsTableViewCell.h" ///Third #import ///Tool #import "NetImageView.h" -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "SDPhotoBrowser.h" #import "XCCurrentVCStackManager.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" ///View -#import "XPMonentsUserInfoView.h" -#import "XPMonentsPhotoView.h" -#import "XPMonentsTooBarView.h" -#import "XPMoentsTopicView.h" -#import "XPMonentsContentView.h" -#import "XPMonentsLayoutConfig.h" -#import "XPMonentTopicContainerViewController.h" +#import "XPMomentsUserInfoView.h" +#import "XPMomentsPhotoView.h" +#import "XPMomentsTooBarView.h" +#import "XPMomentsTopicView.h" +#import "XPMomentsContentView.h" +#import "XPMomentsLayoutConfig.h" +#import "XPMomentTopicContainerViewController.h" #import "XPMineUserInfoViewController.h" #import "XPRoomViewController.h" -@interface XPMonentsTableViewCell () +@interface XPMomentsTableViewCell () ///显示颜色的 有的时候stackView 不能显示颜色 @property (nonatomic,strong) UIView * backView; ///容器 @property (nonatomic,strong) UIStackView *stackView; ///用户信息 -@property (nonatomic,strong) XPMonentsUserInfoView * userInfoView; +@property (nonatomic,strong) XPMomentsUserInfoView * userInfoView; ///显示内容的 -@property (nonatomic,strong) XPMonentsContentView *textView; +@property (nonatomic,strong) XPMomentsContentView *textView; ///图片 -@property (nonatomic,strong) XPMonentsPhotoView *photoView; +@property (nonatomic,strong) XPMomentsPhotoView *photoView; ///显示底部的操作栏 -@property (nonatomic,strong) XPMonentsTooBarView *toolBarView; +@property (nonatomic,strong) XPMomentsTooBarView *toolBarView; ///话题 -@property (nonatomic,strong) XPMoentsTopicView *topicView; +@property (nonatomic,strong) XPMomentsTopicView *topicView; @property (nonatomic,strong) UIView *lineView; @end -@implementation XPMonentsTableViewCell +@implementation XPMomentsTableViewCell - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - if ([reuseIdentifier isEqualToString:@"XPMonentsDynamicTableViewCell"]) { + if ([reuseIdentifier isEqualToString:@"XPMomentsDynamicTableViewCell"]) { [self initDynamicSubViews]; [self initDynamicSubViewConstraints]; - }else{ [self initSubViews]; [self initSubViewConstraints]; @@ -68,7 +67,6 @@ self.backgroundColor = [UIColor clearColor]; self.selectionStyle = UITableViewCellSelectionStyleNone; [self.contentView addSubview:self.backView]; - [self.backView addSubview:self.stackView]; [self.backView addSubview:self.toolBarView]; @@ -86,8 +84,6 @@ make.trailing.mas_equalTo(-15); make.top.bottom.equalTo(self.contentView); }]; - - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(20); @@ -100,7 +96,7 @@ }]; [self.topicView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMONENTS_TEXT_TOPIC_HEIGHT); + make.height.mas_equalTo(kMOMENTS_TEXT_TOPIC_HEIGHT); }]; [self.photoView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(KScreenWidth-30); @@ -149,71 +145,71 @@ [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(self.backView).offset(kMONENTS_CONTENT_LEFT_PADDING); make.trailing.mas_equalTo(self.backView).offset(-kMONENTS_CONTENT_RIGHT_PADDING); - make.top.mas_equalTo(self.userInfoView.mas_bottom).offset(kMONENTS_CONTENT_SPACAE_HEIGHT); + make.top.mas_equalTo(self.userInfoView.mas_bottom).offset(kMOMENTS_CONTENT_SPACAE_HEIGHT); }]; [self.topicView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMONENTS_TEXT_TOPIC_HEIGHT); + make.height.mas_equalTo(kMOMENTS_TEXT_TOPIC_HEIGHT); }]; [self.toolBarView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.stackView.mas_bottom); - make.height.mas_equalTo(kMONENTS_TOOL_BAR_HEIGHT); + make.height.mas_equalTo(kMOMENTS_TOOL_BAR_HEIGHT); }]; } #pragma mark - XPMonentsUserInfoViewDelegate -- (void)xPMonentsUserInfoView:(XPMonentsUserInfoView *)view didClickEnterRoom:(MonentsInfoModel *)monents { +- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickEnterRoom:(MomentsInfoModel *)monents { if (monents.inRoomUid.integerValue > 0) { [XPRoomViewController openRoom:monents.inRoomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; } } -- (void)xPMonentsUserInfoView:(XPMonentsUserInfoView *)view didClickAvatar:(MonentsInfoModel *)monents { +- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickAvatar:(MomentsInfoModel *)monents { XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; userInfoVC.uid = monents.uid.integerValue; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES]; } -- (void)xPMonentsTooBarView:(XPMonentsUserInfoView *)view didClickDelete:(MonentsInfoModel *)monentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTableViewCell:didClicDelete:)]) { - [self.delegate xPMonentsTableViewCell:self didClicDelete:monentsInfo]; +- (void)XPMomentsTooBarView:(XPMomentsUserInfoView *)view didClickDelete:(MomentsInfoModel *)monentsInfo { + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicDelete:)]) { + [self.delegate XPMomentsTableViewCell:self didClicDelete:monentsInfo]; } } #pragma mark - XPMonentsTooBarViewDelegate -- (void)xPMonentsTooBarView:(XPMonentsTooBarView *)view didClickLike:(MonentsInfoModel *)monentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTableViewCell:didClickLike:)]) { - [self.delegate xPMonentsTableViewCell:self didClickLike:monentsInfo]; +- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickLike:(MomentsInfoModel *)monentsInfo { + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClickLike:)]) { + [self.delegate XPMomentsTableViewCell:self didClickLike:monentsInfo]; } } -- (void)xPMonentsTooBarView:(XPMonentsTooBarView *)view didClickCommon:(MonentsInfoModel *)monentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTableViewCell:didClicCommon:)]) { - [self.delegate xPMonentsTableViewCell:self didClicCommon:monentsInfo]; +- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickCommon:(MomentsInfoModel *)monentsInfo { + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicCommon:)]) { + [self.delegate XPMomentsTableViewCell:self didClicCommon:monentsInfo]; } } -- (void)xPMonentsTooBarView:(XPMonentsTooBarView *)view didClickShielding:(MonentsInfoModel *)monentsInfo{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTableViewCell:didClicShielding:)]) { - [self.delegate xPMonentsTableViewCell:self didClicShielding:monentsInfo]; +- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickShielding:(MomentsInfoModel *)monentsInfo{ + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicShielding:)]) { + [self.delegate XPMomentsTableViewCell:self didClicShielding:monentsInfo]; } } #pragma mark - XPMonentsContentViewDelegate -- (void)xPMonentsContentView:(XPMonentsContentView *)view didClickFold:(MonentsInfoModel *)monentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTableViewCell:didClicFold:)]) { - [self.delegate xPMonentsTableViewCell:self didClicFold:monentsInfo]; +- (void)xPMonentsContentView:(XPMomentsContentView *)view didClickFold:(MomentsInfoModel *)monentsInfo { + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicFold:)]) { + [self.delegate XPMomentsTableViewCell:self didClicFold:monentsInfo]; } } #pragma mark - SDPhotoBrowserDelegate - (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index { - NSArray *list = self.monentsInfo != nil ? self.monentsInfo.dynamicResList : self.mineMonentsInfo.dynamicResList; + NSArray *list = self.momentsInfo != nil ? self.momentsInfo.dynamicResList : self.mineMomentsInfo.dynamicResList; if(index < list.count){ - MonentsPicInfoModel *picinfo = [list xpSafeObjectAtIndex:index]; - return [NSURL URLWithString:picinfo.resUrl]; + MomentsPicInfoModel *picInfo = [list xpSafeObjectAtIndex:index]; + return [NSURL URLWithString:picInfo.resUrl]; } return [NSURL URLWithString:@""];; } @@ -223,8 +219,8 @@ } #pragma mark - XPMonentsPhotoViewDelegate -- (void)xPMonentsPhotoView:(XPMonentsPhotoView *)view didClickImage:(NSInteger)index { - NSInteger count = self.monentsInfo != nil ? self.monentsInfo.dynamicResList.count : self.mineMonentsInfo.dynamicResList.count; +- (void)xPMonentsPhotoView:(XPMomentsPhotoView *)view didClickImage:(NSInteger)index { + NSInteger count = self.momentsInfo != nil ? self.momentsInfo.dynamicResList.count : self.mineMomentsInfo.dynamicResList.count; SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; browser.sourceImagesContainerView = self; browser.delegate = self; @@ -236,9 +232,9 @@ #pragma mark - Event Response - (void)didTapTopicRecognizer { - long worldId = self.monentsInfo != nil ? self.monentsInfo.worldId : self.mineMonentsInfo.worldId; + long worldId = self.momentsInfo != nil ? self.momentsInfo.worldId : self.mineMomentsInfo.worldId; if (worldId > 0) { - XPMonentTopicContainerViewController * topicListVC = [[XPMonentTopicContainerViewController alloc] init]; + XPMomentTopicContainerViewController * topicListVC = [[XPMomentTopicContainerViewController alloc] init]; topicListVC.worldId = [NSString stringWithFormat:@"%ld", worldId]; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:topicListVC animated:YES]; @@ -263,17 +259,17 @@ } } --(void)setMineMonentsInfo:(MonentsInfoModel *)mineMonentsInfo{ - _mineMonentsInfo = mineMonentsInfo; - if (_mineMonentsInfo) { - self.userInfoView.monentsInfo = _mineMonentsInfo; - self.textView.monentsInfo = _mineMonentsInfo; - self.photoView.mineDynamicResList = _mineMonentsInfo.dynamicResList; - self.topicView.monentsInfo = _mineMonentsInfo; - self.toolBarView.monentsInfo = _mineMonentsInfo; - if (_mineMonentsInfo.type == MonentsContentType_Picture) { +-(void)setMineMomentsInfo:(MomentsInfoModel *)mineMonentsInfo{ + _mineMomentsInfo = mineMonentsInfo; + if (_mineMomentsInfo) { + self.userInfoView.momentsInfo = _mineMomentsInfo; + self.textView.monentsInfo = _mineMomentsInfo; + self.photoView.mineDynamicResList = _mineMomentsInfo.dynamicResList; + self.topicView.monentsInfo = _mineMomentsInfo; + self.toolBarView.momentsInfo = _mineMomentsInfo; + if (_mineMomentsInfo.type == MomentsContentType_Picture) { self.photoView.hidden = NO; - CGFloat picHeight = _mineMonentsInfo.picHeight <=0 ? [XPMonentsLayoutConfig monentsPicHeight:_mineMonentsInfo] : _mineMonentsInfo.picHeight; + CGFloat picHeight = _mineMomentsInfo.picHeight <=0 ? [XPMomentsLayoutConfig momentsPicHeight:_mineMomentsInfo] : _mineMomentsInfo.picHeight; [self.photoView mas_updateConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(picHeight); }]; @@ -284,11 +280,11 @@ }]; } - CGFloat contentHeight = [XPMonentsLayoutConfig monentsContentHeight:_mineMonentsInfo] + 24; + CGFloat contentHeight = [XPMomentsLayoutConfig momentsContentHeight:_mineMomentsInfo] + 24; - self.topicView.hidden = _mineMonentsInfo.worldId <= 0; + self.topicView.hidden = _mineMomentsInfo.worldId <= 0; - if(_mineMonentsInfo.squareTop && _mineMonentsInfo.content.length == 0){ + if(_mineMomentsInfo.squareTop && _mineMomentsInfo.content.length == 0){ [self.textView mas_updateConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(contentHeight + 20); }]; @@ -300,18 +296,18 @@ } } -- (void)setMonentsInfo:(MonentsInfoModel *)monentsInfo { - _monentsInfo = monentsInfo; - if (_monentsInfo) { - self.userInfoView.monentsInfo = _monentsInfo; +- (void)setMomentsInfo:(MomentsInfoModel *)monentsInfo { + _momentsInfo = monentsInfo; + if (_momentsInfo) { + self.userInfoView.momentsInfo = _momentsInfo; self.textView.isTopic = _isTopic; - self.textView.monentsInfo = _monentsInfo; - self.photoView.dynamicResList = _monentsInfo.dynamicResList; - self.topicView.monentsInfo = _monentsInfo; - self.toolBarView.monentsInfo = _monentsInfo; - if (_monentsInfo.type == MonentsContentType_Picture) { + self.textView.monentsInfo = _momentsInfo; + self.photoView.dynamicResList = _momentsInfo.dynamicResList; + self.topicView.monentsInfo = _momentsInfo; + self.toolBarView.momentsInfo = _momentsInfo; + if (_momentsInfo.type == MomentsContentType_Picture) { self.photoView.hidden = NO; - CGFloat picHeight = _monentsInfo.picHeight <=0 ? [XPMonentsLayoutConfig monentsPicHeight:_monentsInfo] : _monentsInfo.picHeight; + CGFloat picHeight = _momentsInfo.picHeight <=0 ? [XPMomentsLayoutConfig momentsPicHeight:_momentsInfo] : _momentsInfo.picHeight; [self.photoView mas_updateConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(picHeight); }]; @@ -322,11 +318,11 @@ }]; } - CGFloat contentHeight = [XPMonentsLayoutConfig monentsContentHeight:_monentsInfo] + 24; + CGFloat contentHeight = [XPMomentsLayoutConfig momentsContentHeight:_momentsInfo] + 24; self.topicView.hidden = monentsInfo.worldId <= 0; - if(_monentsInfo.topicTop && _monentsInfo.content.length == 0){ + if(_momentsInfo.topicTop && _momentsInfo.content.length == 0){ [self.textView mas_updateConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(contentHeight + 20); }]; @@ -347,17 +343,17 @@ return _backView; } -- (XPMonentsUserInfoView *)userInfoView { +- (XPMomentsUserInfoView *)userInfoView { if (!_userInfoView) { - _userInfoView = [[XPMonentsUserInfoView alloc] init]; + _userInfoView = [[XPMomentsUserInfoView alloc] init]; _userInfoView.delegate = self; } return _userInfoView; } -- (XPMonentsPhotoView *)photoView { +- (XPMomentsPhotoView *)photoView { if (!_photoView) { - _photoView = [[XPMonentsPhotoView alloc] init]; + _photoView = [[XPMomentsPhotoView alloc] init]; _photoView.delegate = self; } return _photoView; @@ -374,29 +370,29 @@ return _stackView; } -- (XPMonentsContentView *)textView { +- (XPMomentsContentView *)textView { if (!_textView) { - _textView = [[XPMonentsContentView alloc] init]; + _textView = [[XPMomentsContentView alloc] init]; _textView.delegate = self; } return _textView; } -- (XPMoentsTopicView *)topicView { +- (XPMomentsTopicView *)topicView { if (!_topicView) { - _topicView = [[XPMoentsTopicView alloc] initWithFrame:CGRectZero]; + _topicView = [[XPMomentsTopicView alloc] initWithFrame:CGRectZero]; UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapTopicRecognizer)]; [_topicView addGestureRecognizer:tap]; } return _topicView; } -- (XPMonentsTooBarView *)toolBarView { +- (XPMomentsTooBarView *)toolBarView { if (!_toolBarView) { - if ([self.reuseIdentifier isEqualToString:@"XPMonentsDynamicTableViewCell"]){ - _toolBarView = [[XPMonentsTooBarView alloc]initDynamicWithFrame:CGRectZero]; + if ([self.reuseIdentifier isEqualToString:@"XPMomentsDynamicTableViewCell"]){ + _toolBarView = [[XPMomentsTooBarView alloc]initDynamicWithFrame:CGRectZero]; }else{ - _toolBarView = [[XPMonentsTooBarView alloc] init]; + _toolBarView = [[XPMomentsTooBarView alloc] init]; } _toolBarView.delegate = self; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m index 5e5471d9..d87fa577 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m @@ -12,7 +12,7 @@ ///Tool #import "NetImageView.h" #import "DJDKMIMOMColor.h" -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "NSString+Utils.h" #import "QEmotionHelper.h" #import "AccountInfoStorage.h" diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m index 2aa93095..f2696fb0 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m @@ -10,7 +10,7 @@ #import ///Tool #import "DJDKMIMOMColor.h" -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" @interface XPMonentsReplyMoreTableViewCell () ///查看更多 diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m index f11ab575..340557c6 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m @@ -13,7 +13,7 @@ #import "DJDKMIMOMColor.h" #import "NetImageView.h" #import "YUMIMacroUitls.h" -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "NSString+Utils.h" #import "QEmotionHelper.h" ///Model @@ -147,7 +147,7 @@ - (YYLabel *)contentLabel { if (!_contentLabel) { _contentLabel = [[YYLabel alloc] init]; - _contentLabel.preferredMaxLayoutWidth = KMONENTS_COMMENT_REPLY_MAX_WIDTH; + _contentLabel.preferredMaxLayoutWidth = kMOMENTS_COMMENT_REPLY_MAX_WIDTH; _contentLabel.numberOfLines = 0; } return _contentLabel; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTableViewCell.h deleted file mode 100644 index 70482e14..00000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTableViewCell.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPMonentsTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel, XPMonentsTableViewCell; - -@protocol XPMonentsTableViewCellDelegate -///点击了点赞 -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo; -///点击了删除 -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo; -@optional -///点击了评论 -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicCommon:(MonentsInfoModel *)monentsInfo; -///点击了展开 -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo; -///屏蔽 -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(MonentsInfoModel *)monentsInfo; - - -@end - -@interface XPMonentsTableViewCell : UITableViewCell -@property (nonatomic,strong) MonentsInfoModel *mineMonentsInfo; -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; -@property (nonatomic,assign) BOOL isFillet; -@property (nonatomic,assign) BOOL isTopic;///是否是话题页 -///代理 -@property (nonatomic,weak) id delegate; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h index a9017295..63d7d732 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h @@ -8,9 +8,9 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsTopicModel; +@class MomentsTopicModel; @interface XPMonentsTopicCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) MonentsTopicModel *topicInfo; +@property (nonatomic,strong) MomentsTopicModel *topicInfo; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m index d0d969e5..537d073a 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m @@ -12,7 +12,7 @@ #import "UIImage+Utils.h" ///Model -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" @interface XPMonentsTopicCollectionViewCell () @@ -76,7 +76,7 @@ } #pragma mark - Getters And Setters -- (void)setTopicInfo:(MonentsTopicModel *)topicInfo { +- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { _topicInfo = topicInfo; if (_topicInfo) { self.topicLabel.text = _topicInfo.name; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h index 07394659..d85b3090 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h @@ -8,10 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN -@class XPMoentsTopicListView, MonentsTopicModel; +@class XPMoentsTopicListView, MomentsTopicModel; @protocol XPMoentsTopicListViewDelegate -- (void)xPMoentsTopicListView:(XPMoentsTopicListView *)view didSelectItem:(MonentsTopicModel *)topicInfo; +- (void)xPMoentsTopicListView:(XPMoentsTopicListView *)view didSelectItem:(MomentsTopicModel *)topicInfo; @end @interface XPMoentsTopicListView : UIView diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m index d8c9e9fb..54712ddd 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m @@ -11,11 +11,11 @@ #import ///Tool #import "DJDKMIMOMColor.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "NetImageView.h" #import "XNDJTDDLoadingTool.h" #import "AccountInfoStorage.h" -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" #import "YUMIMacroUitls.h" #import "NSArray+Safe.h" @@ -26,7 +26,7 @@ @property (nonatomic,strong) UILabel *nameLabel; ///描述 @property (nonatomic,strong) UILabel *desLabel; -@property (nonatomic,strong) MonentsTopicModel *topicInfo; +@property (nonatomic,strong) MomentsTopicModel *topicInfo; @end @implementation XPMoentsTopicListTableViewCell @@ -68,7 +68,7 @@ } #pragma mark - Getters And Setters -- (void)setTopicInfo:(MonentsTopicModel *)topicInfo { +- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { _topicInfo= topicInfo; if (_topicInfo) { self.avatarImageView.imageUrl = _topicInfo.icon; @@ -151,11 +151,11 @@ self.page = 1; NSString * pageStr = [NSString stringWithFormat:@"%d", self.page]; NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsTopicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsTopicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [self.tableView.mj_header endRefreshing]; if (code == 200) { [self.datasource removeAllObjects]; - NSArray * array = [MonentsTopicModel modelsWithArray:data.data]; + NSArray * array = [MomentsTopicModel modelsWithArray:data.data]; [self.datasource addObjectsFromArray:array]; [self.tableView reloadData]; } else { @@ -168,10 +168,10 @@ self.page++; NSString * pageStr = [NSString stringWithFormat:@"%d", self.page]; NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsTopicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsTopicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [self.tableView.mj_footer endRefreshing]; if (code == 200) { - NSArray * array = [MonentsTopicModel modelsWithArray:data.data]; + NSArray * array = [MomentsTopicModel modelsWithArray:data.data]; if (array.count > 0) { [self.datasource addObjectsFromArray:array]; [self.tableView reloadData]; @@ -228,7 +228,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - MonentsTopicModel * infor = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + MomentsTopicModel * infor = [self.datasource xpSafeObjectAtIndex:indexPath.row]; if (self.delegate && [self.delegate respondsToSelector:@selector(xPMoentsTopicListView:didSelectItem:)]) { [self.delegate xPMoentsTopicListView:self didSelectItem:infor]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h new file mode 100644 index 00000000..e50f3ff1 --- /dev/null +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h @@ -0,0 +1,28 @@ +// +// XPMonentsContentView.h +// xplan-ios +// +// Created by 冯硕 on 2022/5/13. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@class MomentsInfoModel, XPMomentsContentView; + +@protocol XPMomentsContentViewDelegate + +///点击这折叠 +- (void)xPMonentsContentView:(XPMomentsContentView *)view didClickFold:(MomentsInfoModel *)monentsInfo; + +@end + +@interface XPMomentsContentView : UIView +/// +@property (nonatomic,assign) BOOL isTopic; +@property (nonatomic,strong) MomentsInfoModel *monentsInfo; +///代理 +@property (nonatomic,weak) id delegate; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsContentView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.m similarity index 94% rename from YuMi/Modules/YMMonents/View/SubViews/XPMonentsContentView.m rename to YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.m index 81dff60e..a0ed097d 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsContentView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.m @@ -5,17 +5,17 @@ // Created by 冯硕 on 2022/5/13. // -#import "XPMonentsContentView.h" +#import "XPMomentsContentView.h" ///Third #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "UIButton+EnlargeTouchArea.h" ///Model -#import "MonentsInfoModel.h" -@interface XPMonentsContentView () +#import "MomentsInfoModel.h" +@interface XPMomentsContentView () ///容器 @property (nonatomic,strong) UIStackView *stackView; ///显示内容 @@ -27,7 +27,7 @@ @end -@implementation XPMonentsContentView +@implementation XPMomentsContentView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; @@ -56,7 +56,7 @@ make.height.mas_equalTo(14); }]; [self.foldButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMONENTS_FOLD_HEIGHT); + make.height.mas_equalTo(kMOMENTS_FOLD_HEIGHT); }]; } @@ -107,7 +107,7 @@ } #pragma mark - Getters And Setters -- (void)setMonentsInfo:(MonentsInfoModel *)monentsInfo { +- (void)setMonentsInfo:(MomentsInfoModel *)monentsInfo { _monentsInfo = monentsInfo; if (_monentsInfo) { self.timeLabel.text = [NSString stringWithTimeStamp:_monentsInfo.publishTime]; @@ -121,7 +121,7 @@ if (layout.rowCount > 6) { self.foldButton.hidden = NO; [self.foldButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMONENTS_FOLD_HEIGHT); + make.height.mas_equalTo(kMOMENTS_FOLD_HEIGHT); }]; } else { self.foldButton.hidden = YES; @@ -133,7 +133,7 @@ if (monentsInfo.numberOfText > 6) { self.foldButton.hidden = NO; [self.foldButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMONENTS_FOLD_HEIGHT); + make.height.mas_equalTo(kMOMENTS_FOLD_HEIGHT); }]; } else { self.foldButton.hidden = YES; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h new file mode 100644 index 00000000..9be6bb8d --- /dev/null +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h @@ -0,0 +1,26 @@ +// +// YMMonentsPhotoView.h +// YUMI +// +// Created by YUMI on 2022/5/12. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@class MomentsPicInfoModel, XPMomentsPhotoView; +@protocol XPMomentsPhotoViewDelegate + +- (void)xPMonentsPhotoView:(XPMomentsPhotoView *)view didClickImage:(NSInteger)index; + +@end + +@interface XPMomentsPhotoView : UIView +///发布的内容 +@property (nonatomic,copy) NSArray *dynamicResList; +@property (nonatomic,copy) NSArray *mineDynamicResList; +///代理 +@property (nonatomic,weak) id delegate; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m similarity index 91% rename from YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.m rename to YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m index 92393818..26a2b191 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m @@ -5,16 +5,16 @@ // Created by 冯硕 on 2022/5/12. // -#import "XPMonentsPhotoView.h" +#import "XPMomentsPhotoView.h" ///Third #import ///Tool #import "NetImageView.h" -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" -@interface XPMonentsPhotoView () +@interface XPMomentsPhotoView () ///第一个 @property (nonatomic,strong) NetImageView *firstImageView; ///第二个 @@ -37,7 +37,7 @@ @end -@implementation XPMonentsPhotoView +@implementation XPMomentsPhotoView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; @@ -76,7 +76,7 @@ #pragma mark - Getters And Setters --(void)setMineDynamicResList:(NSArray *)mineDynamicResList{ +-(void)setMineDynamicResList:(NSArray *)mineDynamicResList{ _mineDynamicResList = mineDynamicResList; [self hiddenAllImageView]; if ( _mineDynamicResList.count == 0) { @@ -87,19 +87,19 @@ make.size.mas_equalTo(CGSizeMake(KScreenWidth-27*2, KScreenWidth-27*2)); make.leading.top.mas_equalTo(self); }]; - MonentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:0]; + MomentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:0]; if(picInfo != nil){ self.firstImageView.imageUrl = picInfo.resUrl; } } else if( _mineDynamicResList.count == 2) { self.firstImageView.hidden = NO; - CGFloat itemWidth = (KScreenWidth-27*2 - kMONENTS_PIC_SPACE) / 2; + CGFloat itemWidth = (KScreenWidth-27*2 - kMOMENTS_PIC_SPACE) / 2; [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); make.leading.top.mas_equalTo(self); }]; - MonentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:0]; + MomentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:0]; if(picInfo != nil){ self.firstImageView.imageUrl = picInfo.resUrl; @@ -107,10 +107,10 @@ [self.secondImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); make.top.mas_equalTo(self); - make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMONENTS_PIC_SPACE); + make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMOMENTS_PIC_SPACE); }]; } - MonentsPicInfoModel * secondPicInfo = [ _mineDynamicResList xpSafeObjectAtIndex:1]; + MomentsPicInfoModel * secondPicInfo = [ _mineDynamicResList xpSafeObjectAtIndex:1]; if(secondPicInfo != nil){ self.secondImageView.imageUrl = secondPicInfo.resUrl; @@ -118,7 +118,7 @@ } else{ for (int i = 0; i < _mineDynamicResList.count; i++) { - MonentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:i]; + MomentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:i]; if (i < self.subViewArray.count) { NetImageView * imageView = [self.subViewArray xpSafeObjectAtIndex:i]; imageView.hidden = NO; @@ -126,7 +126,7 @@ } } - CGFloat itemWidth = (KScreenWidth-27*2 - kMONENTS_PIC_SPACE * 2) / 3; + CGFloat itemWidth = (KScreenWidth-27*2 - kMOMENTS_PIC_SPACE * 2) / 3; for (int i = 0; i < self.subViewArray.count; i++) { NSInteger page = i % 3; NSInteger line = i / 3; @@ -134,8 +134,8 @@ if(imageView == nil)return; [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.leading.mas_equalTo(page * (itemWidth + kMONENTS_PIC_SPACE)); - make.top.mas_equalTo(line * (itemWidth + kMONENTS_PIC_SPACE)); + make.leading.mas_equalTo(page * (itemWidth + kMOMENTS_PIC_SPACE)); + make.top.mas_equalTo(line * (itemWidth + kMOMENTS_PIC_SPACE)); }]; } @@ -144,7 +144,7 @@ -- (void)setDynamicResList:(NSArray *)dynamicResList { +- (void)setDynamicResList:(NSArray *)dynamicResList { _dynamicResList = dynamicResList; [self hiddenAllImageView]; if (_dynamicResList.count == 0) { @@ -152,35 +152,35 @@ } else if (_dynamicResList.count == 1) { self.firstImageView.hidden = NO; [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kMONENTS_PIC_ONE_WIDTH, kMONENTS_PIC_ONE_WIDTH)); + make.size.mas_equalTo(CGSizeMake(kMOMENTS_PIC_ONE_WIDTH, kMOMENTS_PIC_ONE_WIDTH)); make.leading.top.mas_equalTo(self); }]; - MonentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:0]; + MomentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:0]; self.firstImageView.imageUrl = picInfo.resUrl; } else if(_dynamicResList.count == 2) { self.firstImageView.hidden = NO; - CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMONENTS_PIC_SPACE) / 2; + CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE) / 2; [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); make.leading.top.mas_equalTo(self); }]; - MonentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:0]; + MomentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:0]; self.firstImageView.imageUrl = picInfo.resUrl; self.secondImageView.hidden = NO; [self.secondImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); make.top.mas_equalTo(self); - make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMONENTS_PIC_SPACE); + make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMOMENTS_PIC_SPACE); }]; - MonentsPicInfoModel * secondPicInfo = [_dynamicResList xpSafeObjectAtIndex:1]; + MomentsPicInfoModel * secondPicInfo = [_dynamicResList xpSafeObjectAtIndex:1]; self.secondImageView.imageUrl = secondPicInfo.resUrl; } else{ for (int i = 0; i < _dynamicResList.count; i++) { - MonentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:i]; + MomentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:i]; if (i < self.subViewArray.count) { NetImageView * imageView = [self.subViewArray xpSafeObjectAtIndex:i]; imageView.hidden = NO; @@ -188,7 +188,7 @@ } } - CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMONENTS_PIC_SPACE * 2) / 3; + CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE * 2) / 3; for (int i = 0; i < self.subViewArray.count; i++) { NSInteger page = i % 3; NSInteger line = i / 3; @@ -196,8 +196,8 @@ if(imageView == nil)return; [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.leading.mas_equalTo(page * (itemWidth + kMONENTS_PIC_SPACE)); - make.top.mas_equalTo(line * (itemWidth + kMONENTS_PIC_SPACE)); + make.leading.mas_equalTo(page * (itemWidth + kMOMENTS_PIC_SPACE)); + make.top.mas_equalTo(line * (itemWidth + kMOMENTS_PIC_SPACE)); }]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h new file mode 100644 index 00000000..1e9b9813 --- /dev/null +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h @@ -0,0 +1,28 @@ +// +// YMMonentsRecommendHeaderView.h +// YUMI +// +// Created by YUMI on 2022/5/18. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@class MomentsTopicModel,XPMomentsRecommendHeaderView ; +@protocol XPMomentsRecommendHeaderViewDelegate + +///选中了某个item +- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didSelectItem:(MomentsTopicModel *)info; + +///查看更多 +- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didClickMoreTopic:(UIButton *)sender; + +@end + +@interface XPMomentsRecommendHeaderView : UIView +@property (nonatomic,strong) NSArray *topicList; +///代理 +@property (nonatomic,weak) id delegate; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.m similarity index 93% rename from YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.m rename to YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.m index 1ce6d9ff..f12d3394 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.m @@ -5,16 +5,16 @@ // Created by 冯硕 on 2022/5/18. // -#import "XPMonentsRecommendHeaderView.h" +#import "XPMomentsRecommendHeaderView.h" ///Third #import ///Model -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" ///View #import "XPMonentsTopicCollectionViewCell.h" -@interface XPMonentsRecommendHeaderView () +@interface XPMomentsRecommendHeaderView () ///背景图 @property (nonatomic,strong) UIImageView *bgView; @@ -32,7 +32,7 @@ @end -@implementation XPMonentsRecommendHeaderView +@implementation XPMomentsRecommendHeaderView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; @@ -113,23 +113,23 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { [collectionView deselectItemAtIndexPath:indexPath animated:YES]; if (self.topicList.count > 0) { - MonentsTopicModel * topicInfo = [self.topicList xpSafeObjectAtIndex:indexPath.row]; + MomentsTopicModel * topicInfo = [self.topicList xpSafeObjectAtIndex:indexPath.row]; if(topicInfo == nil)return; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsRecommendHeaderView:didSelectItem:)]) { - [self.delegate xPMonentsRecommendHeaderView:self didSelectItem:topicInfo]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsRecommendHeaderView:didSelectItem:)]) { + [self.delegate XPMomentsRecommendHeaderView:self didSelectItem:topicInfo]; } } } #pragma mark - Event Response - (void)arrowButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsRecommendHeaderView:didClickMoreTopic:)]) { - [self.delegate xPMonentsRecommendHeaderView:self didClickMoreTopic:sender]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsRecommendHeaderView:didClickMoreTopic:)]) { + [self.delegate XPMomentsRecommendHeaderView:self didClickMoreTopic:sender]; } } #pragma mark - Getters And Setters -- (void)setTopicList:(NSArray *)topicList { +- (void)setTopicList:(NSArray *)topicList { _topicList = topicList; [self.collectionView reloadData]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h new file mode 100644 index 00000000..fbeecbef --- /dev/null +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h @@ -0,0 +1,32 @@ +// +// XPMonentsTooBarView.h +// xplan-ios +// +// Created by 冯硕 on 2022/5/12. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@class MomentsInfoModel, XPMomentsTooBarView; +@protocol XPMomentsTooBarViewDelegate +///点赞 +- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickLike:(MomentsInfoModel *)momentsInfo; +///评论 +- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickCommon:(MomentsInfoModel *)momentsInfo; +///删除 +- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickDelete:(MomentsInfoModel *)momentsInfo; +///屏蔽 +- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickShielding:(MomentsInfoModel *)momentsInfo; + +@end + +@interface XPMomentsTooBarView : UIView +@property (nonatomic,strong) MomentsInfoModel *momentsInfo; +///代理 +@property (nonatomic,weak) id delegate; +///从进入主态时初始化 +- (instancetype)initDynamicWithFrame:(CGRect)frame; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m similarity index 87% rename from YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.m rename to YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m index 3e78c1d1..4ddb3628 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m @@ -5,7 +5,7 @@ // Created by 冯硕 on 2022/5/12. // -#import "XPMonentsTooBarView.h" +#import "XPMomentsTooBarView.h" ///Third #import #import @@ -13,14 +13,14 @@ #import "TTPopup.h" #import "XPShareView.h" #import "AccountInfoStorage.h" -#import "Api+Monents.h" +#import "Api+Moments.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" ///View #import "XPWebViewController.h" #import "XCCurrentVCStackManager.h" -@interface XPMonentsTooBarView () +@interface XPMomentsTooBarView () ///喜欢的容器 @property (nonatomic,strong) UIView * likeView; ///喜欢 @@ -43,7 +43,7 @@ @property (nonatomic,assign) BOOL isMyMonents; @end -@implementation XPMonentsTooBarView +@implementation XPMomentsTooBarView - (instancetype)initDynamicWithFrame:(CGRect)frame{ self = [super initWithFrame:frame]; @@ -184,32 +184,32 @@ NSMutableArray *array = [NSMutableArray array]; TTActionSheetConfig *action1; - if (self.monentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { + if (self.momentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { action1 = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsTooBarView0") clickAction:^{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTooBarView:didClickDelete:)]) { - [self.delegate xPMonentsTooBarView:self didClickDelete:self.monentsInfo]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickDelete:)]) { + [self.delegate XPMomentsTooBarView:self didClickDelete:self.momentsInfo]; } }]; [TTPopup actionSheetWithItems:@[action1]]; } else { TTActionSheetConfig *action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsTooBarView8") clickAction:^{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTooBarView:didClickShielding:)]) { - [self.delegate xPMonentsTooBarView:self didClickShielding:self.monentsInfo]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickShielding:)]) { + [self.delegate XPMomentsTooBarView:self didClickShielding:self.momentsInfo]; } }]; TTActionSheetConfig *black = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoViewController1") clickAction:^{ - [self addOrRemoveBlack:NO uid:self.monentsInfo.uid]; + [self addOrRemoveBlack:NO uid:self.momentsInfo.uid]; }]; [array addObjectsFromArray:@[action, black]]; - BOOL isInBlackList = [[NIMSDK sharedSDK]. userManager isUserInBlackList:self.monentsInfo.uid] || [self isSystemAccount]; + BOOL isInBlackList = [[NIMSDK sharedSDK]. userManager isUserInBlackList:self.momentsInfo.uid] || [self isSystemAccount]; if (isInBlackList) { [array removeObject:black]; } action1 = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsTooBarView1") clickAction:^{ - NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.monentsInfo.uid, @"WORLDDYNAMIC"]; + NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.momentsInfo.uid, @"WORLDDYNAMIC"]; XPWebViewController * webVC = [[XPWebViewController alloc] init]; webVC.url = url; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; @@ -220,7 +220,7 @@ } - (BOOL)isSystemAccount { - return [KeyWithType(KeyType_SecretaryUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.monentsInfo.uid]] || [KeyWithType(KeyType_SystemNotifiUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.monentsInfo.uid]] || [KeyWithType(KeyType_GuildUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.monentsInfo.uid]]; + return [KeyWithType(KeyType_SecretaryUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.momentsInfo.uid]] || [KeyWithType(KeyType_SystemNotifiUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.momentsInfo.uid]] || [KeyWithType(KeyType_GuildUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.momentsInfo.uid]]; } //加入黑名单 @@ -263,17 +263,17 @@ } - (void)commonButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTooBarView:didClickCommon:)]) { + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickCommon:)]) { self.commentButton.userInteractionEnabled = YES; - [self.delegate xPMonentsTooBarView:self didClickCommon:self.monentsInfo]; + [self.delegate XPMomentsTooBarView:self didClickCommon:self.momentsInfo]; } else { self.commentButton.userInteractionEnabled = NO; } } - (void)likeButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTooBarView:didClickLike:)]) { - [self.delegate xPMonentsTooBarView:self didClickLike:self.monentsInfo]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickLike:)]) { + [self.delegate XPMomentsTooBarView:self didClickLike:self.momentsInfo]; } } @@ -285,22 +285,22 @@ CGFloat margin = 15; CGSize itemSize = CGSizeMake((KScreenWidth-2*margin)/4, 65); XPShareInfoModel * shareInfo = [[XPShareInfoModel alloc] init]; - NSString * title= self.monentsInfo.nick; - if (self.monentsInfo.nick.length > 6) { + NSString * title= self.momentsInfo.nick; + if (self.momentsInfo.nick.length > 6) { title = [title substringToIndex:6]; } shareInfo.nick = title; - shareInfo.content = self.monentsInfo.content; - shareInfo.imageUrl = self.monentsInfo.avatar; + shareInfo.content = self.momentsInfo.content; + shareInfo.imageUrl = self.momentsInfo.avatar; shareInfo.shareTitle = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsTooBarView7"), title]; - shareInfo.shareContent = self.monentsInfo.content; - shareInfo.shareImageUrl = self.monentsInfo.avatar; + shareInfo.shareContent = self.momentsInfo.content; + shareInfo.shareImageUrl = self.momentsInfo.avatar; NSString * uid = [AccountInfoStorage instance].getUid; - NSString *urlStr = [NSString stringWithFormat:@"%@/%@?uid=%@&dynamicId=%@&worldId=%ld",[HttpRequestHelper getHostUrl], URLWithType(kMonentsShareURL), uid, self.monentsInfo.dynamicId, self.monentsInfo.worldId]; + NSString *urlStr = [NSString stringWithFormat:@"%@/%@?uid=%@&dynamicId=%@&worldId=%ld",[HttpRequestHelper getHostUrl], URLWithType(kMonentsShareURL), uid, self.momentsInfo.dynamicId, self.momentsInfo.worldId]; shareInfo.shareUrl = urlStr; - shareInfo.dynamicId = self.monentsInfo.dynamicId; - shareInfo.uid = self.monentsInfo.uid; - shareInfo.worldId = [NSString stringWithFormat:@"%ld", self.monentsInfo.worldId]; + shareInfo.dynamicId = self.momentsInfo.dynamicId; + shareInfo.uid = self.momentsInfo.uid; + shareInfo.worldId = [NSString stringWithFormat:@"%ld", self.momentsInfo.worldId]; XPShareView *shareView = [[XPShareView alloc] initWithItems:items itemSize:itemSize shareInfo:shareInfo]; shareView.delegate = self; [TTPopup popupView:shareView style:TTPopupStyleActionSheet]; @@ -315,7 +315,7 @@ } - (void)shareView:(XPShareView *)shareView didSuccess:(XPShareInfoModel *)shareInfo{ - [Api userShareMonents:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api userShareMoments:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { } dynamicId:shareInfo.dynamicId uid:shareInfo.uid worldId:shareInfo.worldId shareUid:[AccountInfoStorage instance].getUid]; [TTPopup dismiss]; @@ -326,13 +326,13 @@ } #pragma mark - Getters And Setters -- (void)setMonentsInfo:(MonentsInfoModel *)monentsInfo { - _monentsInfo = monentsInfo; - if (_monentsInfo) { - self.likeButton.selected = _monentsInfo.isLike; - self.likeLabel.text = _monentsInfo.likeCount.length > 0 ? _monentsInfo.likeCount : @"0"; - self.commentLabel.text = _monentsInfo.commentCount.length > 0 ? _monentsInfo.commentCount : @"0"; - self.reportButton.hidden = _monentsInfo.dynamicId == nil; +- (void)setMomentsInfo:(MomentsInfoModel *)monentsInfo { + _momentsInfo = monentsInfo; + if (_momentsInfo) { + self.likeButton.selected = _momentsInfo.isLike; + self.likeLabel.text = _momentsInfo.likeCount.length > 0 ? _momentsInfo.likeCount : @"0"; + self.commentLabel.text = _momentsInfo.commentCount.length > 0 ? _momentsInfo.commentCount : @"0"; + self.reportButton.hidden = _momentsInfo.dynamicId == nil; } } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.h similarity index 55% rename from YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.h rename to YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.h index 2e4d6295..309e9800 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.h +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.h @@ -8,9 +8,9 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel; -@interface XPMoentsTopicView : UIView -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; +@class MomentsInfoModel; +@interface XPMomentsTopicView : UIView +@property (nonatomic,strong) MomentsInfoModel *monentsInfo; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.m similarity index 94% rename from YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.m rename to YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.m index ab263e74..7c21fa59 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.m @@ -5,7 +5,7 @@ // Created by 冯硕 on 2022/5/12. // -#import "XPMoentsTopicView.h" +#import "XPMomentsTopicView.h" ///Third #import ///Tool @@ -13,9 +13,9 @@ #import "UIImage+Utils.h" #import "NSString+Utils.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" -@interface XPMoentsTopicView () +@interface XPMomentsTopicView () ///容器 @property (nonatomic,strong) UIStackView *stackView; ///背景 @@ -27,7 +27,7 @@ @end -@implementation XPMoentsTopicView +@implementation XPMomentsTopicView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { @@ -66,7 +66,7 @@ }]; } #pragma mark - Getters And Setters -- (void)setMonentsInfo:(MonentsInfoModel *)monentsInfo { +- (void)setMonentsInfo:(MomentsInfoModel *)monentsInfo { _monentsInfo = monentsInfo; if (_monentsInfo) { if (_monentsInfo.worldId > 0) { diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h new file mode 100644 index 00000000..a4bbfdbb --- /dev/null +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h @@ -0,0 +1,32 @@ +// +// XPMonentsUserInfoView.h +// xplan-ios +// +// Created by 冯硕 on 2022/5/12. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@class MomentsInfoModel, XPMomentsUserInfoView; +@protocol XPMomentsUserInfoViewDelegate + +///点击了头像 +- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickAvatar:(MomentsInfoModel *)moments; + +///点击了跟随进房 +- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickEnterRoom:(MomentsInfoModel *)moments; + +///删除 +- (void)XPMomentsTooBarView:(XPMomentsUserInfoView *)view didClickDelete:(MomentsInfoModel *)momentsInfo; + +@end +@interface XPMomentsUserInfoView : UIView +///动态信息 +@property (nonatomic,strong) MomentsInfoModel *momentsInfo; + +///代理 +@property (nonatomic,weak) id delegate; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m similarity index 82% rename from YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m rename to YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m index 232d2705..a0894038 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m @@ -5,7 +5,7 @@ // Created by 冯硕 on 2022/5/12. // -#import "XPMonentsUserInfoView.h" +#import "XPMomentsUserInfoView.h" ///Third #import #import @@ -19,9 +19,9 @@ #import "AccountInfoStorage.h" #import "UIButton+EnlargeTouchArea.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" -@interface XPMonentsUserInfoView () +@interface XPMomentsUserInfoView () /// @property (nonatomic,strong) UIStackView *nickStackView; ///头像 @@ -35,7 +35,7 @@ ///新用户 @property (nonatomic,strong) UIImageView *newsUserImageView; ///官方的 -@property (nonatomic,strong) UIImageView *officalImageView; +@property (nonatomic,strong) UIImageView *officialImageView; ///头饰 @property (nonatomic,strong) YYAnimatedImageView *headWearImageView; @property (nonatomic,strong) SVGAImageView *headWearSVGAImageView; @@ -46,7 +46,7 @@ ///魅力等级 @property (nonatomic,strong) NetImageView *charmImageView; ///等级 -@property (nonatomic,strong) NetImageView *experImageView; +@property (nonatomic,strong) NetImageView *levelImageView; ///铭牌的容器 @property (nonatomic,strong) UIView * namePlateView; ///铭牌图片 @@ -65,7 +65,7 @@ @property (nonatomic,strong) UIButton *onlineButton; @end -@implementation XPMonentsUserInfoView +@implementation XPMomentsUserInfoView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { @@ -91,14 +91,13 @@ [self.levelStackView addArrangedSubview:self.nobleImageView]; [self.levelStackView addArrangedSubview:self.newsUserImageView]; - [self.levelStackView addArrangedSubview:self.officalImageView]; - [self.levelStackView addArrangedSubview:self.experImageView]; + [self.levelStackView addArrangedSubview:self.officialImageView]; + [self.levelStackView addArrangedSubview:self.levelImageView]; [self.levelStackView addArrangedSubview:self.charmImageView]; [self.levelStackView addArrangedSubview:self.namePlateView]; ///铭牌 [self.namePlateView addSubview:self.nameplateImageView]; [self.namePlateView addSubview:self.nameplateLabel]; - } - (void)initSubViewConstraints { @@ -121,7 +120,7 @@ make.height.mas_equalTo(70); }]; - + [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); @@ -147,11 +146,11 @@ make.width.mas_equalTo(20); }]; - [self.officalImageView mas_makeConstraints:^(MASConstraintMaker *make) { + [self.officialImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(20); }]; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { + [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(34); }]; @@ -201,28 +200,28 @@ #pragma mark - Event Response - (void)onlineButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsUserInfoView:didClickEnterRoom:)]) { - [self.delegate xPMonentsUserInfoView:self didClickEnterRoom:self.monentsInfo]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsUserInfoView:didClickEnterRoom:)]) { + [self.delegate XPMomentsUserInfoView:self didClickEnterRoom:self.momentsInfo]; } } - (void)didTapAvatarGuest { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsUserInfoView:didClickAvatar:)]) { - [self.delegate xPMonentsUserInfoView:self didClickAvatar:self.monentsInfo]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsUserInfoView:didClickAvatar:)]) { + [self.delegate XPMomentsUserInfoView:self didClickAvatar:self.momentsInfo]; } } - (void)reportButtonAction:(UIButton *)sender { TTActionSheetConfig *action; - if (self.monentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { + if (self.momentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsUserInfoView0") clickAction:^{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsTooBarView:didClickDelete:)]) { - [self.delegate xPMonentsTooBarView:self didClickDelete:self.monentsInfo]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickDelete:)]) { + [self.delegate XPMomentsTooBarView:self didClickDelete:self.momentsInfo]; } }]; } else { action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsUserInfoView1") clickAction:^{ - NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.monentsInfo.uid, @"WORLDDYNAMIC"]; + NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.momentsInfo.uid, @"WORLDDYNAMIC"]; XPWebViewController * webVC = [[XPWebViewController alloc] init]; webVC.url = url; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; @@ -231,59 +230,59 @@ [TTPopup actionSheetWithItems:@[action]]; } #pragma mark - Getters And Setters -- (void)setMonentsInfo:(MonentsInfoModel *)monentsInfo { - _monentsInfo = monentsInfo; - if (_monentsInfo) { - self.avatarImageView.imageUrl = _monentsInfo.avatar; - NSString * nick = _monentsInfo.nick; +- (void)setMomentsInfo:(MomentsInfoModel *)monentsInfo { + _momentsInfo = monentsInfo; + if (_momentsInfo) { + self.avatarImageView.imageUrl = _momentsInfo.avatar; + NSString * nick = _momentsInfo.nick; if (nick.length > 8) { nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:8]]; } self.nickLabel.text = nick.length > 0 ? nick : @""; - [self.sexImageView setTitle:[NSString stringWithFormat:@"%d",_monentsInfo.age] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = _monentsInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = _monentsInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = _monentsInfo.gender != GenderType_Male; - self.officalImageView.hidden = _monentsInfo.defUser != 2; - self.newsUserImageView.hidden = !_monentsInfo.newUser; - self.nobleImageView.hidden = !_monentsInfo.userVipInfoVO; - if (_monentsInfo.experLevelPic) { - self.experImageView.imageUrl = _monentsInfo.experLevelPic; + [self.sexImageView setTitle:[NSString stringWithFormat:@"%d",_momentsInfo.age] forState:UIControlStateNormal]; + self.sexImageView.backgroundColor = _momentsInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = _momentsInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); + self.sexImageView.selected = _momentsInfo.gender != GenderType_Male; + self.officialImageView.hidden = _momentsInfo.defUser != 2; + self.newsUserImageView.hidden = !_momentsInfo.newUser; + self.nobleImageView.hidden = !_momentsInfo.userVipInfoVO; + if (_momentsInfo.expertLevelPic) { + self.levelImageView.imageUrl = _momentsInfo.expertLevelPic; } - self.experImageView.hidden = _monentsInfo.experLevelPic.length <= 0; + self.levelImageView.hidden = _momentsInfo.expertLevelPic.length <= 0; - if (_monentsInfo.charmLevelPic) { - self.charmImageView.imageUrl = _monentsInfo.charmLevelPic; + if (_momentsInfo.charmLevelPic) { + self.charmImageView.imageUrl = _momentsInfo.charmLevelPic; } - if (_monentsInfo.userVipInfoVO) { - self.nobleImageView.imageUrl = _monentsInfo.userVipInfoVO.vipIcon; + if (_momentsInfo.userVipInfoVO) { + self.nobleImageView.imageUrl = _momentsInfo.userVipInfoVO.vipIcon; } - self.charmImageView.hidden = _monentsInfo.charmLevelPic.length <= 0; - if(_monentsInfo.isCustomWord == YES){ - if (_monentsInfo.nameplateWord.length>0) { - self.nameplateImageView.imageUrl = _monentsInfo.nameplatePic; + self.charmImageView.hidden = _momentsInfo.charmLevelPic.length <= 0; + if(_momentsInfo.isCustomWord == YES){ + if (_momentsInfo.nameplateWord.length>0) { + self.nameplateImageView.imageUrl = _momentsInfo.nameplatePic; self.namePlateView.hidden = NO; } else { self.namePlateView.hidden = YES; } }else{ - if (_monentsInfo.nameplateWord.length>0 && _monentsInfo.nameplatePic.length>0) { - self.nameplateImageView.imageUrl = _monentsInfo.nameplatePic; - self.nameplateLabel.text = _monentsInfo.nameplateWord; + if (_momentsInfo.nameplateWord.length>0 && _momentsInfo.nameplatePic.length>0) { + self.nameplateImageView.imageUrl = _momentsInfo.nameplatePic; + self.nameplateLabel.text = _momentsInfo.nameplateWord; self.namePlateView.hidden = NO; } else { self.namePlateView.hidden = YES; } } - NSString * headwearUrl= _monentsInfo.headwearEffect.length > 0 ? _monentsInfo.headwearEffect : _monentsInfo.headwearPic; + NSString * headwearUrl= _momentsInfo.headwearEffect.length > 0 ? _momentsInfo.headwearEffect : _momentsInfo.headwearPic; self.headWearImageView.hidden = headwearUrl.length <= 0; self.headWearSVGAImageView.hidden = headwearUrl.length <= 0; if (headwearUrl.length > 0) { - if (_monentsInfo.headwearType == 1) { + if (_momentsInfo.headwearType == 1) { [self.headWearSVGAImageView setImageName:headwearUrl]; } else { NSURL *url = [NSURL URLWithString:headwearUrl]; @@ -298,8 +297,8 @@ self.firstTagImageView.hidden = YES; self.secondTagImageView.hidden = YES; self.thirdTagImageView.hidden = YES; - for (int i = 0; i< _monentsInfo.labelList.count; i++) { - NSString * imageUrl = [_monentsInfo.labelList xpSafeObjectAtIndex:i]; + for (int i = 0; i< _momentsInfo.labelList.count; i++) { + NSString * imageUrl = [_momentsInfo.labelList xpSafeObjectAtIndex:i]; if (i < self.tagStackView.subviews.count) { NetImageView * image = [self.tagStackView.subviews xpSafeObjectAtIndex:i]; if(image != nil){ @@ -308,7 +307,7 @@ } } } - self.onlineButton.hidden = _monentsInfo.inRoomUid.length <= 0; + self.onlineButton.hidden = _momentsInfo.inRoomUid.length <= 0; } } @@ -377,17 +376,17 @@ } return _levelStackView; } -- (NetImageView *)experImageView { - if (!_experImageView) { +- (NetImageView *)levelImageView { + if (!_levelImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; config.imageType = ImageTypeUserCardLevel; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.userInteractionEnabled = YES; - _experImageView.hidden = YES; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; + _levelImageView = [[NetImageView alloc] initWithConfig:config]; + _levelImageView.userInteractionEnabled = YES; + _levelImageView.hidden = YES; + _levelImageView.contentMode = UIViewContentModeScaleAspectFit; } - return _experImageView; + return _levelImageView; } - (NetImageView *)charmImageView { @@ -457,14 +456,14 @@ return _newsUserImageView; } -- (UIImageView *)officalImageView { - if (!_officalImageView) { - _officalImageView = [[UIImageView alloc] init]; - _officalImageView.userInteractionEnabled = YES; - _officalImageView.image = [UIImage imageNamed:@"common_offical"]; - _officalImageView.hidden = YES; +- (UIImageView *)officialImageView { + if (!_officialImageView) { + _officialImageView = [[UIImageView alloc] init]; + _officialImageView.userInteractionEnabled = YES; + _officialImageView.image = [UIImage imageNamed:@"common_offical"]; + _officialImageView.hidden = YES; } - return _officalImageView; + return _officialImageView; } - (UIStackView *)tagStackView { diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsContentView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsContentView.h deleted file mode 100644 index 982feb03..00000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsContentView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPMonentsContentView.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel, XPMonentsContentView; - -@protocol XPMonentsContentViewDelegate - -///点击这折叠 -- (void)xPMonentsContentView:(XPMonentsContentView *)view didClickFold:(MonentsInfoModel *)monentsInfo; - -@end - -@interface XPMonentsContentView : UIView -/// -@property (nonatomic,assign) BOOL isTopic; -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.h deleted file mode 100644 index 0639cae0..00000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMMonentsPhotoView.h -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsPicInfoModel, XPMonentsPhotoView; -@protocol XPMonentsPhotoViewDelegate - -- (void)xPMonentsPhotoView:(XPMonentsPhotoView *)view didClickImage:(NSInteger)index; - -@end - -@interface XPMonentsPhotoView : UIView -///发布的内容 -@property (nonatomic,copy) NSArray *dynamicResList; -@property (nonatomic,copy) NSArray *mineDynamicResList; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h index 2839980c..8af7ff34 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h @@ -8,7 +8,7 @@ #import NS_ASSUME_NONNULL_BEGIN -@class XPMonentsPublishTopicView, MonentsTopicModel; +@class XPMonentsPublishTopicView, MomentsTopicModel; @protocol XPMonentsPublishTopicViewDelegate ///选择了关闭按钮 @@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN @interface XPMonentsPublishTopicView : UIView ///代理 @property (nonatomic,weak) id delegate; -@property (nonatomic,strong) MonentsTopicModel *topicInfo; +@property (nonatomic,strong) MomentsTopicModel *topicInfo; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m index 3e73c648..de7eb286 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m @@ -13,7 +13,7 @@ #import "UIView+Corner.h" #import "UIButton+EnlargeTouchArea.h" ///Model -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" @interface XPMonentsPublishTopicView () ///容器 @@ -99,7 +99,7 @@ } #pragma mark - Getters And Setters -- (void)setTopicInfo:(MonentsTopicModel *)topicInfo { +- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { _topicInfo = topicInfo; if (_topicInfo) { self.addTopicButton.hidden = YES; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.h deleted file mode 100644 index f8e177d4..00000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMMonentsRecommendHeaderView.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsTopicModel,XPMonentsRecommendHeaderView ; -@protocol XPMonentsRecommendHeaderViewDelegate - -///选中了某个item -- (void)xPMonentsRecommendHeaderView:(XPMonentsRecommendHeaderView *)view didSelectItem:(MonentsTopicModel *)info; - -///查看更多 -- (void)xPMonentsRecommendHeaderView:(XPMonentsRecommendHeaderView *)view didClickMoreTopic:(UIButton *)sender; - -@end - -@interface XPMonentsRecommendHeaderView : UIView -@property (nonatomic,strong) NSArray *topicList; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.h deleted file mode 100644 index fec6c112..00000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// XPMonentsTooBarView.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel, XPMonentsTooBarView; -@protocol XPMonentsTooBarViewDelegate -///点赞 -- (void)xPMonentsTooBarView:(XPMonentsTooBarView *)view didClickLike:(MonentsInfoModel *)monentsInfo; -///评论 -- (void)xPMonentsTooBarView:(XPMonentsTooBarView *)view didClickCommon:(MonentsInfoModel *)monentsInfo; -///删除 -- (void)xPMonentsTooBarView:(XPMonentsTooBarView *)view didClickDelete:(MonentsInfoModel *)monentsInfo; -///屏蔽 -- (void)xPMonentsTooBarView:(XPMonentsTooBarView *)view didClickShielding:(MonentsInfoModel *)monentsInfo; - -@end - -@interface XPMonentsTooBarView : UIView -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; -///代理 -@property (nonatomic,weak) id delegate; -///从进入主态时初始化 -- (instancetype)initDynamicWithFrame:(CGRect)frame; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h index 5a0a2781..490cc18f 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h @@ -8,10 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN -@class MonentsTopicModel; +@class MomentsTopicModel; @interface XPMonentsTopicHeaderView : UIView /// -@property (nonatomic,strong) MonentsTopicModel *topicInfo; +@property (nonatomic,strong) MomentsTopicModel *topicInfo; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m index fac1a1ea..56f2916f 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m @@ -13,7 +13,7 @@ #import "YUMIMacroUitls.h" #import "NetImageView.h" ///Model -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" @interface XPMonentsTopicHeaderView () @@ -66,7 +66,7 @@ } #pragma mark - Getters And Setters -- (void)setTopicInfo:(MonentsTopicModel *)topicInfo { +- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { _topicInfo = topicInfo; if (_topicInfo) { self.logoImageView.imageUrl = _topicInfo.icon; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.h deleted file mode 100644 index 73ec6f04..00000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// XPMonentsUserInfoView.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel, XPMonentsUserInfoView; -@protocol XPMonentsUserInfoViewDelegate - -///点击了头像 -- (void)xPMonentsUserInfoView:(XPMonentsUserInfoView *)view didClickAvatar:(MonentsInfoModel *)monents; - -///点击了跟随进房 -- (void)xPMonentsUserInfoView:(XPMonentsUserInfoView *)view didClickEnterRoom:(MonentsInfoModel *)monents; - -///删除 -- (void)xPMonentsTooBarView:(XPMonentsUserInfoView *)view didClickDelete:(MonentsInfoModel *)monentsInfo; - -@end -@interface XPMonentsUserInfoView : UIView -///动态信息 -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; - -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.h b/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.h similarity index 78% rename from YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.h rename to YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.h index 7f39c0bf..77ea5771 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.h +++ b/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPMonentTopicContainerViewController : BaseViewController +@interface XPMomentTopicContainerViewController : BaseViewController @property (nonatomic,copy) NSString *worldId; @end diff --git a/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m b/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.m similarity index 94% rename from YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m rename to YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.m index 5383029d..fe0062fb 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.m @@ -5,7 +5,7 @@ // Created by YUMI on 2022/8/18. // -#import "XPMonentTopicContainerViewController.h" +#import "XPMomentTopicContainerViewController.h" ///Third #import #import @@ -14,17 +14,17 @@ ///Tool #import "DJDKMIMOMColor.h" #import "YUMIMacroUitls.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "AccountInfoStorage.h" ///Model -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" ///View #import "XPMonentsTopicRecommondViewController.h" #import "XPMonentsTopicLatestViewController.h" #import "XPMonentsTopicHeaderView.h" #import "XPMonentsPublishViewController.h" -@interface XPMonentTopicContainerViewController () +@interface XPMomentTopicContainerViewController () @property (nonatomic,strong) JXCategoryTitleView *pi_categoryView; @property (nonatomic,strong) JXCategoryIndicatorLineView *lineView; @property (nonatomic,strong) JXPagerListRefreshView *pagerContentView; @@ -34,10 +34,10 @@ @property (nonatomic,strong) XPMonentsTopicHeaderView *headerView; @property (nonatomic,strong) UIButton *backButton; @property (nonatomic,strong) UIButton *enterTopicButton; -@property (nonatomic,strong) MonentsTopicModel *topicInfo; +@property (nonatomic,strong) MomentsTopicModel *topicInfo; @end -@implementation XPMonentTopicContainerViewController +@implementation XPMomentTopicContainerViewController - (BOOL)isHiddenNavBar { return YES; @@ -73,9 +73,9 @@ - (void)requestTopicDetail { NSString * uid = [AccountInfoStorage instance].getUid; - [Api monentsTopicDetailInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsTopicDetailInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { if (code == 200) { - MonentsTopicModel * info = [MonentsTopicModel modelWithDictionary:data.data]; + MomentsTopicModel * info = [MomentsTopicModel modelWithDictionary:data.data]; self.topicInfo = info; self.headerView.topicInfo = info; } else if(code == 7903) { diff --git a/YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.h similarity index 58% rename from YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.h rename to YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.h index 798e0431..58434d2f 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.h +++ b/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.h @@ -6,10 +6,10 @@ // #import "MvpViewController.h" -#import "XPMonentsDetailViewControllerDelegate.h" +#import "XPMomentsDetailViewControllerDelegate.h" NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel, XPMonentsDetailViewController; +@class MomentsInfoModel, XPMomentsDetailViewController; //@protocol XPMonentsDetailViewControllerDelegate // /////删除了动态 @@ -17,10 +17,10 @@ NS_ASSUME_NONNULL_BEGIN // //@end -@interface XPMonentsDetailViewController : MvpViewController -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; +@interface XPMomentsDetailViewController : MvpViewController +@property (nonatomic,strong) MomentsInfoModel *momentsInfo; ///代理 -@property (nonatomic,weak) id delegate; +@property (nonatomic,weak) id delegate; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.m similarity index 85% rename from YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.m rename to YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.m index ae3dd981..974eb286 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.m @@ -5,23 +5,23 @@ // Created by 冯硕 on 2022/6/22. // -#import "XPMonentsDetailViewController.h" +#import "XPMomentsDetailViewController.h" ///Third #import #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "QEmotionHelper.h" #import "QKeyboardManager.h" #import "TTPopup.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "MonentsCommentModel.h" #import "MonentsCommentReplyModel.h" ///View -#import "XPMonentsTableViewCell.h" +#import "XPMomentsTableViewCell.h" #import "XPMonentsCommentTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" #import "QInputBarView.h" #import "QKeyboardManager.h" #import "QEmotionBoardView.h" @@ -30,7 +30,7 @@ #import "XPMonentDetailPresenter.h" #import "XPMonentsDetailProtocol.h" -@interface XPMonentsDetailViewController () +@interface XPMomentsDetailViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; ///数据源 @@ -45,7 +45,7 @@ @property (nonatomic,strong) NSString *commentId; @end -@implementation XPMonentsDetailViewController +@implementation XPMomentsDetailViewController -(void)dealloc{ [[NSNotificationCenter defaultCenter]removeObserver:self]; } @@ -70,16 +70,16 @@ { BOOL status = [refreshData[@"status"] boolValue]; - NSInteger count = self.monentsInfo.likeCount.integerValue; + NSInteger count = self.momentsInfo.likeCount.integerValue; NSString *dynamicId = refreshData[@"dynamicId"]; - if([self.monentsInfo.dynamicId isEqualToString:dynamicId]){ - self.monentsInfo.isLike = status; + if([self.momentsInfo.dynamicId isEqualToString:dynamicId]){ + self.momentsInfo.isLike = status; if (status) { count += 1; } else { count -= 1; } - self.monentsInfo.likeCount = [NSString stringWithFormat:@"%ld", count]; + self.momentsInfo.likeCount = [NSString stringWithFormat:@"%ld", count]; [self.tableView reloadData]; } break; @@ -98,8 +98,8 @@ default: { NSString *dynamicId = refreshData[@"dynamicId"]; - if([self.monentsInfo.dynamicId isEqualToString:dynamicId]){ - self.monentsInfo.commentCount = [NSString stringWithFormat:@"%ld",self.monentsInfo.commentCount.integerValue + 1]; + if([self.momentsInfo.dynamicId isEqualToString:dynamicId]){ + self.momentsInfo.commentCount = [NSString stringWithFormat:@"%ld",self.momentsInfo.commentCount.integerValue + 1]; [self.tableView reloadData]; @@ -127,8 +127,8 @@ } - (void)headerRefresh { - [self.presenter getMonentsDetail:self.monentsInfo.dynamicId]; - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:@"" status:0]; + [self.presenter getMonentsDetail:self.momentsInfo.dynamicId]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; } - (void)footerRefresh { @@ -137,7 +137,7 @@ MonentsCommentModel * commentInfo = [self.datasource lastObject]; timestamp = commentInfo.publishTime; } - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:timestamp status:1]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:timestamp status:1]; } @@ -167,9 +167,9 @@ if (inputText.length > 0) { [_keyboardManager hideAllBoardView]; if (self.commentId && self.commentId.length > 0) { - [self.presenter replayCommon:self.commentId dynamicId:self.monentsInfo.dynamicId content:inputText]; + [self.presenter replayCommon:self.commentId dynamicId:self.momentsInfo.dynamicId content:inputText]; } else { - [self.presenter commontMonents:self.monentsInfo.dynamicId content:inputText]; + [self.presenter commontMonents:self.momentsInfo.dynamicId content:inputText]; } self.inputBarView.inputTextView.text = nil; } else { @@ -210,17 +210,17 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section == 0) { - [XPMonentsLayoutConfig layoutMonentsModel:self.monentsInfo]; + [XPMomentsLayoutConfig layoutMomentsModel:self.momentsInfo]; - if(self.monentsInfo.squareTop && self.monentsInfo.content.length == 0){ - return self.monentsInfo.rowHeight + 20 ; + if(self.momentsInfo.squareTop && self.momentsInfo.content.length == 0){ + return self.momentsInfo.rowHeight + 20 ; }else{ - return self.monentsInfo.rowHeight; + return self.momentsInfo.rowHeight; } } else if(indexPath.section == 1) { if (self.datasource.count > 0) { MonentsCommentModel * commentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return [XPMonentsLayoutConfig commentCommentRowHeight:commentInfo]; + return [XPMomentsLayoutConfig commentCommentRowHeight:commentInfo]; } else { return 400; } @@ -236,7 +236,7 @@ } - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - self.commentLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsDetailViewController2"), self.monentsInfo.commentCount]; + self.commentLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsDetailViewController2"), self.momentsInfo.commentCount]; return self.sectionView; } @@ -250,9 +250,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section ==0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; cell.delegate = self; - cell.monentsInfo = self.monentsInfo; + cell.momentsInfo = self.momentsInfo; return cell; } else { if (self.datasource.count > 0) { @@ -261,7 +261,7 @@ cell.delegate = self; return cell; } else { - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } } @@ -284,12 +284,12 @@ } #pragma mark - XPMonentsCommentTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(MonentsInfoModel *)monentsInfo{ +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ [self showLoading]; [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; } - (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickMoreReply:(MonentsCommentModel *)commentInfo { - [self.presenter getMonentsCommentReplyList:self.monentsInfo.dynamicId commentId:commentInfo.commentId timestamp:commentInfo.replyInfo.nextTimestamp]; + [self.presenter getMonentsCommentReplyList:self.momentsInfo.dynamicId commentId:commentInfo.commentId timestamp:commentInfo.replyInfo.nextTimestamp]; } - (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo { @@ -304,12 +304,12 @@ userInfoVC.uid = commentInfo.integerValue; [self.navigationController pushViewController:userInfoVC animated:YES]; } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsDetailViewController5") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ @@ -317,7 +317,7 @@ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicCommon:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo { if (monentsInfo) { self.commentId = nil; self.inputBarView.inputTextView.placeholder = YMLocalizedString(@"XPMonentsDetailViewController6"); @@ -325,8 +325,8 @@ } } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - self.monentsInfo = monentsInfo; +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + self.momentsInfo = monentsInfo; [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone]; } @@ -425,8 +425,8 @@ } #pragma mark - XPMonentsDetailProtocol -- (void)getMonentsDetailSuccess:(MonentsInfoModel *)commentInfo { - self.monentsInfo = commentInfo; +- (void)getMonentsDetailSuccess:(MomentsInfoModel *)commentInfo { + self.momentsInfo = commentInfo; [self.tableView reloadData]; } @@ -467,7 +467,7 @@ } - (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - if ([self.monentsInfo.dynamicId isEqualToString:dynamicId]) { + if ([self.momentsInfo.dynamicId isEqualToString:dynamicId]) { ///type,0=点赞，1=删除，2=屏蔽，3=评论 @@ -476,19 +476,19 @@ } - (void)replyMonentsSuccess { - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:@"" status:0]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":self.monentsInfo.dynamicId,@"type":@"3"}]; + [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":self.momentsInfo.dynamicId,@"type":@"3"}]; } - (void)commonMonentsSuccess { - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:@"" status:0]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":self.monentsInfo.dynamicId,@"type":@"3"}]; + [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":self.momentsInfo.dynamicId,@"type":@"3"}]; } -(void)requesstShieldingSuccess:(NSString *)monentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; ///type,0=点赞，1=删除，2=屏蔽，3=评论 [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":monentsInfo,@"type":@"2"}]; [self.navigationController popViewControllerAnimated:YES]; @@ -516,9 +516,9 @@ if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; [_tableView registerClass:[XPMonentsCommentTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsCommentTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsMineViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.h similarity index 67% rename from YuMi/Modules/YMMonents/View/XPMonentsMineViewController.h rename to YuMi/Modules/YMMonents/View/XPMomentsMineViewController.h index 729839f4..00854122 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsMineViewController.h +++ b/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.h @@ -8,9 +8,9 @@ #import "MvpViewController.h" #import NS_ASSUME_NONNULL_BEGIN -@class MonentsInfoModel; -@interface XPMonentsMineViewController : MvpViewController -@property (nonatomic,strong) NSArray*dynamicInfo; +@class MomentsInfoModel; +@interface XPMomentsMineViewController : MvpViewController +@property (nonatomic,strong) NSArray*dynamicInfo; @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); @end diff --git a/YuMi/Modules/YMMonents/View/XPMonentsMineViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.m similarity index 53% rename from YuMi/Modules/YMMonents/View/XPMonentsMineViewController.m rename to YuMi/Modules/YMMonents/View/XPMomentsMineViewController.m index 6ce94a33..b86008e6 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsMineViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.m @@ -5,43 +5,43 @@ // Created by YUMI on 2022/8/18. // -#import "XPMonentsMineViewController.h" +#import "XPMomentsMineViewController.h" ///Third #import #import ///Tool #import "DJDKMIMOMColor.h" #import "YUMIMacroUitls.h" -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "TTPopup.h" #import "NSArray+Safe.h" #import "ClientConfig.h" ///Model -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" ///P -#import "XPMonentMinePresenter.h" -#import "XPMonentsMineProtocol.h" +#import "XPMomentMinePresenter.h" +#import "XPMomentsMineProtocol.h" ///View -#import "XPMonentsTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsDetailViewController.h" +#import "XPMomentsTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsDetailViewController.h" #import "XPMomentsSimpleDetailViewController.h" -@interface XPMonentsMineViewController () +@interface XPMomentsMineViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; ///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; ///是否有更多的数据 @property (nonatomic,assign) BOOL hasNoMoreData; ///数据信息 -@property (nonatomic,strong) MonentsListInfoModel *listInfo; +@property (nonatomic,strong) MomentsListInfoModel *listInfo; @end -@implementation XPMonentsMineViewController +@implementation XPMomentsMineViewController - (__kindof id)createPresenter { - return [[XPMonentMinePresenter alloc] init]; + return [[XPMomentMinePresenter alloc] init]; } - (BOOL)isHiddenNavBar { @@ -72,83 +72,87 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - MonentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMonentsLayoutConfig layoutMonentsModel:monentInfo]; - return monentInfo.rowHeight; + MomentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; + [XPMomentsLayoutConfig layoutMomentsModel:momentInfo]; + return momentInfo.rowHeight; } return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + MomentsInfoModel * momentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; cell.delegate = self; - cell.monentsInfo = monentsInfo; + cell.momentsInfo = momentInfo; return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if(monentsInfo.dynamicId == nil) { + MomentsInfoModel * momentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + if(momentInfo.dynamicId == nil) { return; } - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + detailVC.momentsInfo = momentInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { - if(monentsInfo.dynamicId == nil){ +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentInfo { + if(momentInfo.dynamicId == nil){ [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController4")]; return; } - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; + [self.presenter likeMoment:momentInfo.dynamicId + status:!momentInfo.isLike + likedUid:momentInfo.uid + worldId:[NSString stringWithFormat:@"%ld", momentInfo.worldId]]; } ///点击了评论 -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicCommon:(MonentsInfoModel *)monentsInfo{ - if(monentsInfo.dynamicId == nil){ +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)momentInfo{ + if(momentInfo.dynamicId == nil){ [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController5")]; return; } - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + detailVC.momentsInfo = momentInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsMineViewController2") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentInfo { + [TTPopup alertWithMessage:YMLocalizedString(@"XPMomentsMineViewController2") confirmHandler:^{ + [self.presenter deleteMoments:momentInfo.dynamicId + worldId:[NSString stringWithFormat:@"%ld", momentInfo.worldId]]; } cancelHandler:^{ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { - monentsInfos = obj; +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo { + __block MomentsInfoModel * momentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if (obj.dynamicId.integerValue == momentsInfo.dynamicId.integerValue) { + momentsInfos = obj; *stop = YES; } }]; - if (monentsInfos) { - NSInteger row = [self.datasource indexOfObject:monentsInfo]; + if (momentsInfos) { + NSInteger row = [self.datasource indexOfObject:momentsInfos]; [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationNone]; } } -#pragma mark - XPMonentsDetailViewControllerDelegate -- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId { - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +#pragma mark - XPMomentsDetailViewControllerDelegate +- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; } @@ -160,9 +164,9 @@ } } -#pragma mark - XPMonentsMineProtocol -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +#pragma mark - XPMomentsMineProtocol +- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { if (status) { obj.isLike += 1; @@ -175,11 +179,11 @@ [self.tableView reloadData]; } -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController1")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { +- (void)deleteMomentsSuccess:(NSString *)momentsInfo { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController1")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if (obj.dynamicId.integerValue == momentsInfo.integerValue) { deleteInfo = obj; } }]; @@ -209,7 +213,7 @@ } #pragma mark - Getters And Setters -- (void)setDynamicInfo:(NSArray *)dynamicInfo { +- (void)setDynamicInfo:(NSArray *)dynamicInfo { [self.datasource removeAllObjects]; [self.datasource addObjectsFromArray:dynamicInfo]; [self.tableView reloadData]; @@ -226,14 +230,14 @@ if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsRecommendViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.h similarity index 80% rename from YuMi/Modules/YMMonents/View/XPMonentsRecommendViewController.h rename to YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.h index 8af2cc96..f8f7ff29 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsRecommendViewController.h +++ b/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.h @@ -9,7 +9,7 @@ #import NS_ASSUME_NONNULL_BEGIN -@interface XPMonentsRecommendViewController : MvpViewController +@interface XPMomentsRecommendViewController : MvpViewController @end diff --git a/YuMi/Modules/YMMonents/View/XPMonentsRecommendViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m similarity index 56% rename from YuMi/Modules/YMMonents/View/XPMonentsRecommendViewController.m rename to YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m index 5048cd32..ed0943ee 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsRecommendViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m @@ -1,48 +1,48 @@ // -// XPMonentsRecommendViewController.m +// XPMomentsRecommendViewController.m // xplan-ios // // Created by 冯硕 on 2022/5/11. // -#import "XPMonentsRecommendViewController.h" +#import "XPMomentsRecommendViewController.h" ///Third #import #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "TTPopup.h" ///Model -#import "MonentsInfoModel.h" -#import "MonentsTopicModel.h" +#import "MomentsInfoModel.h" +#import "MomentsTopicModel.h" ///P -#import "XPMonentsRecommendPresenter.h" -#import "XPMonentsRecommendProtocol.h" +#import "XPMomentsRecommendPresenter.h" +#import "XPMomentsRecommendProtocol.h" ///View -#import "XPMonentsTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsRecommendHeaderView.h" -#import "XPMonentsDetailViewController.h" -#import "XPMonentTopicContainerViewController.h" -#import "XPMoentsTopicListViewController.h" +#import "XPMomentsTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsRecommendHeaderView.h" +#import "XPMomentsDetailViewController.h" +#import "XPMomentTopicContainerViewController.h" +#import "XPMomentsTopicListViewController.h" -UIKIT_EXTERN NSString *kRequestRicket; -@interface XPMonentsRecommendViewController () +UIKIT_EXTERN NSString *kRequestTicket; +@interface XPMomentsRecommendViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; ///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; ///当前的页数 @property (nonatomic,assign) NSInteger page; ///是否有更多的数据 @property (nonatomic,assign) BOOL hasNoMoreData; ///顶部视图 -@property (nonatomic,strong) XPMonentsRecommendHeaderView *headerView; +@property (nonatomic,strong) XPMomentsRecommendHeaderView *headerView; @end -@implementation XPMonentsRecommendViewController +@implementation XPMomentsRecommendViewController -(void)dealloc{ [[NSNotificationCenter defaultCenter]removeObserver:self]; } @@ -51,14 +51,15 @@ UIKIT_EXTERN NSString *kRequestRicket; } - (__kindof id)createPresenter { - return [[XPMonentsRecommendPresenter alloc] init]; + return [[XPMomentsRecommendPresenter alloc] init]; } - (void)viewDidLoad { [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; + [self initSubViews]; [self initSubViewConstraints]; + [self initHeaderAndFooterRefresh]; } #pragma mark - Private Method @@ -71,13 +72,10 @@ UIKIT_EXTERN NSString *kRequestRicket; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.mas_equalTo(self.view); }]; - - } - #pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { +- (void)initHeaderAndFooterRefresh { MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; header.stateLabel.font = [UIFont systemFontOfSize:10.0]; header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; @@ -90,18 +88,19 @@ UIKIT_EXTERN NSString *kRequestRicket; footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; self.tableView.mj_footer = footer; [self.tableView.mj_header beginRefreshing]; + [self headerRefresh]; } -#pragma mark - 刷新的fangfa +#pragma mark - 刷新的 - (void)headerRefresh { - if([AccountInfoStorage instance].isRequestRicket == YES){ return; } + self.page = 1; - [self.presenter getMonentsRecommendList:self.page pageSize:20 state:0]; - [self.presenter getMonentsTopicList:self.page pageSize:20]; + [self.presenter getMomentsRecommendList:self.page pageSize:20 state:0]; + [self.presenter getMomentsTopicList:self.page pageSize:20]; } - (void)footerRefresh { @@ -112,7 +111,7 @@ UIKIT_EXTERN NSString *kRequestRicket; return; } self.page++; - [self.presenter getMonentsRecommendList:self.page pageSize:20 state:1]; + [self.presenter getMomentsRecommendList:self.page pageSize:20 state:1]; } #pragma mark - UITableViewDelegate And UITableViewDataSource @@ -122,13 +121,13 @@ UIKIT_EXTERN NSString *kRequestRicket; - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - MonentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMonentsLayoutConfig layoutMonentsModel:monentInfo]; + MomentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; + [XPMomentsLayoutConfig layoutMomentsModel:momentInfo]; - if(monentInfo.squareTop && monentInfo.content.length == 0){ - return monentInfo.rowHeight + 20 ; + if(momentInfo.squareTop && momentInfo.content.length == 0){ + return momentInfo.rowHeight + 20 ; }else{ - return monentInfo.rowHeight; + return momentInfo.rowHeight; } } @@ -137,30 +136,31 @@ UIKIT_EXTERN NSString *kRequestRicket; - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.monentsInfo = monentsInfo; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + cell.momentsInfo = momentsInfo; cell.delegate = self; return cell; + } else { + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; + return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; - return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + detailVC.momentsInfo = momentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsDetailViewControllerDelegate -- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId { - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +#pragma mark - XPMomentsDetailViewControllerDelegate +- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; } @@ -172,47 +172,47 @@ UIKIT_EXTERN NSString *kRequestRicket; } } -#pragma mark - XPMonentsTableViewCellDelegate +#pragma mark - XPMomentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(MonentsInfoModel *)monentsInfo{ +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)momentsInfo{ [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; + [self.presenter requestShieldingWithType:@"0" objId:momentsInfo.dynamicId]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentsInfo { + [self.presenter likeMoment:momentsInfo.dynamicId status:!momentsInfo.isLike likedUid:momentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsRecommendViewController1") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentsInfo { + [TTPopup alertWithMessage:YMLocalizedString(@"XPMomentsRecommendViewController1") confirmHandler:^{ + [self.presenter deleteMoments:momentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]]; } cancelHandler:^{ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { - monentsInfos = obj; +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo { + __block MomentsInfoModel * momentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if (obj.dynamicId.integerValue == momentsInfo.dynamicId.integerValue) { + momentsInfos = obj; *stop = YES; } }]; - if (monentsInfos) { - NSInteger row = [self.datasource indexOfObject:monentsInfo]; + if (momentsInfos) { + NSInteger row = [self.datasource indexOfObject:momentsInfo]; [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationNone]; } } -#pragma mark - XPMonentsRecommendHeaderViewDelegate -- (void)xPMonentsRecommendHeaderView:(XPMonentsRecommendHeaderView *)view didSelectItem:(MonentsTopicModel *)info { - XPMonentTopicContainerViewController * topicVC = [[XPMonentTopicContainerViewController alloc] init]; +#pragma mark - XPMomentsRecommendHeaderViewDelegate +- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didSelectItem:(MomentsTopicModel *)info { + XPMomentTopicContainerViewController * topicVC = [[XPMomentTopicContainerViewController alloc] init]; topicVC.worldId = info.tId; [self.navigationController pushViewController:topicVC animated:YES]; } -- (void)xPMonentsRecommendHeaderView:(XPMonentsRecommendHeaderView *)view didClickMoreTopic:(UIButton *)sender { - XPMoentsTopicListViewController * topicListVC = [[XPMoentsTopicListViewController alloc] init]; +- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didClickMoreTopic:(UIButton *)sender { + XPMomentsTopicListViewController * topicListVC = [[XPMomentsTopicListViewController alloc] init]; [self.navigationController pushViewController:topicListVC animated:YES]; } @@ -221,8 +221,8 @@ UIKIT_EXTERN NSString *kRequestRicket; return self.view; } -#pragma mark - XPMonentsRecommendProtocol -- (void)getMonentsRecommendListSuccess:(NSArray *)array state:(int)state { +#pragma mark - XPMomentsRecommendProtocol +- (void)getMomentsRecommendListSuccess:(NSArray *)array state:(int)state { if (state == 0) { [self.datasource removeAllObjects]; } @@ -244,7 +244,7 @@ UIKIT_EXTERN NSString *kRequestRicket; [self.tableView reloadData]; } -- (void)getMonentsRecommendListFail:(NSString *)msg state:(int)state { +- (void)getMomentsRecommendListFail:(NSString *)msg state:(int)state { [XNDJTDDLoadingTool hideOnlyView:self.tabBarController.view]; if (state == 0) { [self.tableView.mj_header endRefreshing]; @@ -253,12 +253,12 @@ UIKIT_EXTERN NSString *kRequestRicket; } } -- (void)monentsTopicListSuccess:(NSArray *)array { +- (void)momentsTopicListSuccess:(NSArray *)array { self.headerView.topicList = array; } -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { if (status) { obj.isLike += 1; @@ -270,12 +270,12 @@ UIKIT_EXTERN NSString *kRequestRicket; }]; [self.tableView reloadData]; } --(void)requesstShieldingSuccess:(NSString *)monentsInfo{ +-(void)requestShieldingSuccess:(NSString *)momentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if (obj.dynamicId.integerValue == momentsInfo.integerValue) { deleteInfo = obj; } }]; @@ -284,11 +284,11 @@ UIKIT_EXTERN NSString *kRequestRicket; [self.tableView reloadData]; } } -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsRecommendViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { +- (void)deleteMomentsSuccess:(NSString *)momentsInfo { + [self showSuccessToast:YMLocalizedString(@"XPMomentsRecommendViewController2")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if (obj.dynamicId.integerValue == momentsInfo.integerValue) { deleteInfo = obj; } }]; @@ -310,23 +310,23 @@ UIKIT_EXTERN NSString *kRequestRicket; if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } return _datasource; } -- (XPMonentsRecommendHeaderView *)headerView { +- (XPMomentsRecommendHeaderView *)headerView { if (!_headerView) { - _headerView = [[XPMonentsRecommendHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 145)]; + _headerView = [[XPMomentsRecommendHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 145)]; _headerView.delegate = self; } return _headerView; diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h index 9be27aca..735c0183 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h +++ b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h @@ -7,7 +7,7 @@ #import -@class MonentsInfoModel; +@class MomentsInfoModel; NS_ASSUME_NONNULL_BEGIN @protocol XPMomentsSimpleDetailNavDelegate @@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN @interface XPMomentsSimpleDetailNav : UIView -@property (strong, nonatomic) MonentsInfoModel *infoModel; +@property (strong, nonatomic) MomentsInfoModel *infoModel; @property (nonatomic, weak) id delegate; diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m index 7707e53c..b9bd499a 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m @@ -9,7 +9,7 @@ #import "NetImageView.h" #import "DJDKMIMOMColor.h" #import -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" @interface XPMomentsSimpleDetailNav() /// 返回 @@ -70,7 +70,7 @@ }]; } -- (void)setInfoModel:(MonentsInfoModel *)infoModel { +- (void)setInfoModel:(MomentsInfoModel *)infoModel { _infoModel = infoModel; if (_infoModel) { self.avatarImageView.imageUrl = infoModel.avatar; diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h index 27613869..0d549b8c 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h +++ b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h @@ -6,17 +6,17 @@ // #import "MvpViewController.h" -#import "XPMonentsDetailViewControllerDelegate.h" +#import "XPMomentsDetailViewControllerDelegate.h" -@class MonentsInfoModel; +@class MomentsInfoModel; NS_ASSUME_NONNULL_BEGIN @interface XPMomentsSimpleDetailViewController : MvpViewController -@property (nonatomic,strong) MonentsInfoModel *monentsInfo; +@property (nonatomic,strong) MomentsInfoModel *momentsInfo; ///代理 -@property (nonatomic,weak) id delegate; +@property (nonatomic,weak) id delegate; @end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m index fb32cc67..a652c50f 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m @@ -11,7 +11,7 @@ #import #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "DJDKMIMOMColor.h" #import "QEmotionHelper.h" #import "QKeyboardManager.h" @@ -22,13 +22,13 @@ #import "ClientConfig.h" #import "XNDJTDDLoadingTool.h" ///Model -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "MonentsCommentModel.h" #import "MonentsCommentReplyModel.h" ///View -#import "XPMonentsTableViewCell.h" +#import "XPMomentsTableViewCell.h" #import "XPMonentsCommentTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" #import "QInputBarView.h" #import "QKeyboardManager.h" #import "QEmotionBoardView.h" @@ -40,7 +40,7 @@ #import "XPMonentDetailPresenter.h" #import "XPMonentsDetailProtocol.h" -@interface XPMomentsSimpleDetailViewController () +@interface XPMomentsSimpleDetailViewController () ///导航栏 @property(nonatomic,strong) XPMomentsSimpleDetailNav *detailNav; @@ -95,8 +95,8 @@ } - (void)headerRefresh { - [self.presenter getMonentsDetail:self.monentsInfo.dynamicId]; - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:@"" status:0]; + [self.presenter getMonentsDetail:self.momentsInfo.dynamicId]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; } - (void)footerRefresh { @@ -105,7 +105,7 @@ MonentsCommentModel * commentInfo = [self.datasource lastObject]; timestamp = commentInfo.publishTime; } - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:timestamp status:1]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:timestamp status:1]; } @@ -144,9 +144,9 @@ if (inputText.length > 0) { [_keyboardManager hideAllBoardView]; if (self.commentId && self.commentId.length > 0) { - [self.presenter replayCommon:self.commentId dynamicId:self.monentsInfo.dynamicId content:inputText]; + [self.presenter replayCommon:self.commentId dynamicId:self.momentsInfo.dynamicId content:inputText]; } else { - [self.presenter commontMonents:self.monentsInfo.dynamicId content:inputText]; + [self.presenter commontMonents:self.momentsInfo.dynamicId content:inputText]; } self.inputBarView.inputTextView.text = nil; } else { @@ -194,12 +194,12 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section == 0) { - [XPMonentsLayoutConfig layoutSimpleMonentsModel:self.monentsInfo]; - return self.monentsInfo.rowHeight+20; + [XPMomentsLayoutConfig layoutSimpleMomentsModel:self.momentsInfo]; + return self.momentsInfo.rowHeight+20; } else if(indexPath.section == 1) { if (self.datasource.count > 0) { MonentsCommentModel * commentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return [XPMonentsLayoutConfig commentCommentRowHeight:commentInfo]; + return [XPMomentsLayoutConfig commentCommentRowHeight:commentInfo]; } else { return 400; } @@ -216,7 +216,7 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { NSString *commentText = YMLocalizedString(@"XPMomentsSimpleDetailViewController2"); - NSMutableAttributedString *commentStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@",commentText,self.monentsInfo.commentCount]]; + NSMutableAttributedString *commentStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@",commentText,self.momentsInfo.commentCount]]; [commentStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12 weight:UIFontWeightMedium] range:NSMakeRange(commentText.length, commentStr.length-commentText.length)]; [commentStr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor textThirdColor] range:NSMakeRange(commentText.length, commentStr.length-commentText.length)]; self.commentLabel.attributedText = commentStr; @@ -233,10 +233,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section ==0) { - NSString *identifier = [NSString stringWithFormat:@"%@_Simple",NSStringFromClass([XPMonentsTableViewCell class])]; - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier]; + NSString *identifier = [NSString stringWithFormat:@"%@_Simple",NSStringFromClass([XPMomentsTableViewCell class])]; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier]; cell.delegate = self; - cell.monentsInfo = self.monentsInfo; + cell.momentsInfo = self.momentsInfo; return cell; } else { if (self.datasource.count > 0) { @@ -245,7 +245,7 @@ cell.delegate = self; return cell; } else { - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } } @@ -269,7 +269,7 @@ // 点赞 - (void)likeBtnAction { - [self.presenter likeMonent:self.monentsInfo.dynamicId status:!self.monentsInfo.isLike likedUid:self.monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", self.monentsInfo.worldId]]; + [self.presenter likeMonent:self.momentsInfo.dynamicId status:!self.momentsInfo.isLike likedUid:self.momentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", self.momentsInfo.worldId]]; } #pragma mark - XPMomentsSimpleDetailNavDelegate @@ -281,7 +281,7 @@ /// 点击头像 - (void)momentsSimpleDetailNavAvatarAction { XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = self.monentsInfo.uid.integerValue; + userInfoVC.uid = self.momentsInfo.uid.integerValue; [self.navigationController pushViewController:userInfoVC animated:YES]; } @@ -289,17 +289,17 @@ - (void)momentsSimpleDetailNavMoreAction { TTActionSheetConfig *action; @kWeakify(self); - if (self.monentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { + if (self.momentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMomentsSimpleDetailViewController4") clickAction:^{ [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{ @kStrongify(self); - [self.presenter deleteMonents:self.monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", self.monentsInfo.worldId]]; + [self.presenter deleteMonents:self.momentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", self.momentsInfo.worldId]]; } cancelHandler:^{}]; }]; } else { action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMomentsSimpleDetailViewController6") clickAction:^{ @kStrongify(self); - NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.monentsInfo.uid, @"WORLDDYNAMIC"]; + NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.momentsInfo.uid, @"WORLDDYNAMIC"]; XPWebViewController * webVC = [[XPWebViewController alloc] init]; webVC.url = url; [self.navigationController pushViewController:webVC animated:YES]; @@ -310,7 +310,7 @@ #pragma mark - XPMonentsCommentTableViewCellDelegate - (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickMoreReply:(MonentsCommentModel *)commentInfo { - [self.presenter getMonentsCommentReplyList:self.monentsInfo.dynamicId commentId:commentInfo.commentId timestamp:commentInfo.replyInfo.nextTimestamp]; + [self.presenter getMonentsCommentReplyList:self.momentsInfo.dynamicId commentId:commentInfo.commentId timestamp:commentInfo.replyInfo.nextTimestamp]; } - (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo { @@ -325,12 +325,12 @@ userInfoVC.uid = commentInfo.integerValue; [self.navigationController pushViewController:userInfoVC animated:YES]; } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ @@ -338,7 +338,7 @@ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicCommon:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo { if (monentsInfo) { self.commentId = nil; self.inputBarView.inputTextView.placeholder = YMLocalizedString(@"XPMomentsSimpleDetailViewController10"); @@ -346,8 +346,8 @@ } } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - self.monentsInfo = monentsInfo; +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + self.momentsInfo = monentsInfo; [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone]; } @@ -446,10 +446,10 @@ } #pragma mark - XPMonentsDetailProtocol -- (void)getMonentsDetailSuccess:(MonentsInfoModel *)commentInfo { - self.monentsInfo = commentInfo; - [self.likeBtn setTitle:self.monentsInfo.likeCount forState:UIControlStateNormal]; - self.likeBtn.selected = self.monentsInfo.isLike; +- (void)getMonentsDetailSuccess:(MomentsInfoModel *)commentInfo { + self.momentsInfo = commentInfo; + [self.likeBtn setTitle:self.momentsInfo.likeCount forState:UIControlStateNormal]; + self.likeBtn.selected = self.momentsInfo.isLike; [self.tableView reloadData]; } @@ -490,33 +490,33 @@ } - (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - if ([self.monentsInfo.dynamicId isEqualToString:dynamicId]) { - NSInteger count = self.monentsInfo.likeCount.integerValue; - self.monentsInfo.isLike = status; + if ([self.momentsInfo.dynamicId isEqualToString:dynamicId]) { + NSInteger count = self.momentsInfo.likeCount.integerValue; + self.momentsInfo.isLike = status; if (status) { count += 1; } else { count -= 1; } - self.monentsInfo.likeCount = [NSString stringWithFormat:@"%ld", count]; - [self.likeBtn setTitle:self.monentsInfo.likeCount forState:UIControlStateNormal]; - self.likeBtn.selected = self.monentsInfo.isLike; + self.momentsInfo.likeCount = [NSString stringWithFormat:@"%ld", count]; + [self.likeBtn setTitle:self.momentsInfo.likeCount forState:UIControlStateNormal]; + self.likeBtn.selected = self.momentsInfo.isLike; } } - (void)replyMonentsSuccess { - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:@"" status:0]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; } - (void)commonMonentsSuccess { - [self.presenter getMonentsCommentList:self.monentsInfo.dynamicId timestamp:@"" status:0]; + [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; } -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { +- (void)deleteMonentsSuccess:(NSString *)momentsInfo { [self showSuccessToast:YMLocalizedString(@"XPMomentsSimpleDetailViewController12")]; [self.navigationController popViewControllerAnimated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsDetailViewController:deleteMonents:)]) { - [self.delegate xPMonentsDetailViewController:self deleteMonents:self.monentsInfo.dynamicId]; + if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsDetailViewController:deleteMoments:)]) { + [self.delegate XPMomentsDetailViewController:self deleteMoments:self.momentsInfo.dynamicId]; } } @@ -527,7 +527,7 @@ if (!_detailNav) { _detailNav = [[XPMomentsSimpleDetailNav alloc] init]; _detailNav.delegate = self; - _detailNav.infoModel = self.monentsInfo; + _detailNav.infoModel = self.momentsInfo; } return _detailNav; } @@ -544,10 +544,10 @@ if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - NSString *identifier = [NSString stringWithFormat:@"%@_Simple",NSStringFromClass([XPMonentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:identifier]; + NSString *identifier = [NSString stringWithFormat:@"%@_Simple",NSStringFromClass([XPMomentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:identifier]; [_tableView registerClass:[XPMonentsCommentTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsCommentTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } diff --git a/YuMi/Modules/YMMonents/View/XPMoentsTopicListViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.h similarity index 73% rename from YuMi/Modules/YMMonents/View/XPMoentsTopicListViewController.h rename to YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.h index 398a417c..f55ae02a 100644 --- a/YuMi/Modules/YMMonents/View/XPMoentsTopicListViewController.h +++ b/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPMoentsTopicListViewController : MvpViewController +@interface XPMomentsTopicListViewController : MvpViewController @end diff --git a/YuMi/Modules/YMMonents/View/XPMoentsTopicListViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.m similarity index 84% rename from YuMi/Modules/YMMonents/View/XPMoentsTopicListViewController.m rename to YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.m index 149d1cf3..2075eabb 100644 --- a/YuMi/Modules/YMMonents/View/XPMoentsTopicListViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.m @@ -5,7 +5,7 @@ // Created by YUMI on 2022/8/18. // -#import "XPMoentsTopicListViewController.h" +#import "XPMomentsTopicListViewController.h" ///Third #import #import @@ -13,34 +13,34 @@ #import "DJDKMIMOMColor.h" #import "NSArray+Safe.h" ///Model -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" ///View -#import "XPMonentTopicContainerViewController.h" +#import "XPMomentTopicContainerViewController.h" ///P -#import "XPMonentsTopicListPresenter.h" -#import "XPMonentsTopicListProtocol.h" +#import "XPMomentsTopicListPresenter.h" +#import "XPMomentsTopicListProtocol.h" -@interface XPMoentsTopicListViewController () +@interface XPMomentsTopicListViewController () @property (nonatomic,strong) UITableView *tableView; @property (nonatomic,strong) NSMutableArray *datasource; @property (nonatomic,assign) int page; @end -@implementation XPMoentsTopicListViewController +@implementation XPMomentsTopicListViewController - (__kindof id)createPresenter { - return [[XPMonentsTopicListPresenter alloc] init]; + return [[XPMomentsTopicListPresenter alloc] init]; } - (void)viewDidLoad { [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; + [self initHeaderAndFooterRefresh]; [self initSubViews]; [self initSubViewConstraints]; } -- (void)initHeaderAndFooterRrfresh { +- (void)initHeaderAndFooterRefresh { MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; header.stateLabel.font = [UIFont systemFontOfSize:10.0]; header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; @@ -93,7 +93,7 @@ if (cell == nil) { cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([UITableViewCell class])]; } - MonentsTopicModel * topicModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + MomentsTopicModel * topicModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; cell.textLabel.text = [NSString stringWithFormat:@"#%@", topicModel.name]; cell.textLabel.textColor = [DJDKMIMOMColor mainTextColor]; cell.textLabel.font = [UIFont systemFontOfSize:13]; @@ -103,15 +103,15 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - MonentsTopicModel * topicModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMonentTopicContainerViewController * topicVC = [[XPMonentTopicContainerViewController alloc] init]; + MomentsTopicModel * topicModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentTopicContainerViewController * topicVC = [[XPMomentTopicContainerViewController alloc] init]; topicVC.worldId = topicModel.tId; [self.navigationController pushViewController:topicVC animated:YES]; } } #pragma mark - XPMonentsTopicListProtocol -- (void)getMonentsTopicListSuccess:(NSArray *)list state:(int)state { +- (void)getMomentsTopicListSuccess:(NSArray *)list state:(int)state { if (state == 0) { [self.tableView.mj_header endRefreshing]; [self.datasource removeAllObjects]; @@ -129,7 +129,7 @@ [self.tableView reloadData]; } -- (void)getMoentsTopicFail:(NSString *)message state:(int)state { +- (void)getMomentsTopicFail:(NSString *)message state:(int)state { if (state == 0) { [self.tableView.mj_header endRefreshing]; } else { diff --git a/YuMi/Modules/YMMonents/View/XPMomentsViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsViewController.m index d055b851..26453f75 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentsViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsViewController.m @@ -16,7 +16,7 @@ #import "AttachMentModel.h" #import "MonentsUnReadModel.h" ///View -#import "XPMonentsRecommendViewController.h" +#import "XPMomentsRecommendViewController.h" #import "XPMonentsAttentionViewController.h" #import "XPMonentsLatestViewController.h" #import "XPMonentsInteractiveViewController.h" @@ -43,7 +43,7 @@ ///最新的 @property (nonatomic,strong) XPMonentsLatestViewController *latestVC; ///推荐 -@property (nonatomic,strong) XPMonentsRecommendViewController * recommendVC; +@property (nonatomic,strong) XPMomentsRecommendViewController * recommendVC; @end @implementation XPMomentsViewController @@ -275,9 +275,9 @@ return _latestVC; } -- (XPMonentsRecommendViewController *)recommendVC { +- (XPMomentsRecommendViewController *)recommendVC { if (!_recommendVC) { - _recommendVC = [[XPMonentsRecommendViewController alloc] init]; + _recommendVC = [[XPMomentsRecommendViewController alloc] init]; } return _recommendVC; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsAttentionViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsAttentionViewController.m index 1f1bbea8..05d2ab28 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsAttentionViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsAttentionViewController.m @@ -11,29 +11,29 @@ #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "TTPopup.h" ///Model -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" ///P #import "XPMonentsAttentionPresenter.h" #import "XPMonentsAttentionProtocol.h" ///View -#import "XPMonentsTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsDetailViewController.h" -UIKIT_EXTERN NSString *kRequestRicket; -@interface XPMonentsAttentionViewController () +#import "XPMomentsTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsDetailViewController.h" +UIKIT_EXTERN NSString *kRequestTicket; +@interface XPMonentsAttentionViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; ///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; ///当前的页数 @property (nonatomic,assign) NSInteger page; ///是否有更多的数据 @property (nonatomic,assign) BOOL hasNoMoreData; ///数据信息 -@property (nonatomic,strong) MonentsListInfoModel *listInfo; +@property (nonatomic,strong) MomentsListInfoModel *listInfo; @end @implementation XPMonentsAttentionViewController @@ -113,8 +113,8 @@ UIKIT_EXTERN NSString *kRequestRicket; - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - MonentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMonentsLayoutConfig layoutMonentsModel:monentInfo]; + MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; + [XPMomentsLayoutConfig layoutMomentsModel:monentInfo]; if(monentInfo.squareTop && monentInfo.content.length == 0){ return monentInfo.rowHeight + 20 ; }else{ @@ -127,36 +127,36 @@ UIKIT_EXTERN NSString *kRequestRicket; - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; cell.delegate = self; - cell.monentsInfo = monentsInfo; + cell.momentsInfo = monentsInfo; return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + detailVC.momentsInfo = monentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsDetailViewControllerDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(MonentsInfoModel *)monentsInfo{ +#pragma mark - XPMomentsDetailViewControllerDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ [self showLoading]; [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; } -- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId { - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; } @@ -168,12 +168,12 @@ UIKIT_EXTERN NSString *kRequestRicket; } } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsAttentionViewController1") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ @@ -181,9 +181,9 @@ UIKIT_EXTERN NSString *kRequestRicket; }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + __block MomentsInfoModel * monentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { monentsInfos = obj; *stop = YES; @@ -200,8 +200,8 @@ UIKIT_EXTERN NSString *kRequestRicket; return self.view; } -#pragma mark - XPMonentsRecommendProtocol -- (void)getMonentsAttentionListSuccess:(MonentsListInfoModel *)listInfo state:(int)state { +#pragma mark - XPMomentsRecommendProtocol +- (void)getMonentsAttentionListSuccess:(MomentsListInfoModel *)listInfo state:(int)state { self.listInfo = listInfo; if (state == 0) { [self.datasource removeAllObjects]; @@ -233,7 +233,7 @@ UIKIT_EXTERN NSString *kRequestRicket; } - (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { if (status) { obj.isLike += 1; @@ -247,9 +247,9 @@ UIKIT_EXTERN NSString *kRequestRicket; } -(void)requesstShieldingSuccess:(NSString *)monentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -262,8 +262,8 @@ UIKIT_EXTERN NSString *kRequestRicket; } - (void)deleteMonentsSuccess:(NSString *)monentsInfo { [self showSuccessToast:YMLocalizedString(@"XPMonentsAttentionViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -287,14 +287,14 @@ UIKIT_EXTERN NSString *kRequestRicket; if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m index b55a1a29..87f220b3 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m @@ -22,8 +22,8 @@ #import "XPMonentsInteractiveProtocol.h" ///View #import "XPMonentsInteractiveTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsDetailViewController.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsDetailViewController.h" #import "XPMomentsSimpleDetailViewController.h" @interface XPMonentsInteractiveViewController () @@ -121,7 +121,7 @@ cell.interactiveInfo = model; return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } @@ -129,11 +129,11 @@ [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { MonentsInteractiveModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - MonentsInfoModel * monents = [[MonentsInfoModel alloc] init]; + MomentsInfoModel * monents = [[MomentsInfoModel alloc] init]; monents.dynamicId = model.dynamicId; - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - detailVC.monentsInfo = monents; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + detailVC.momentsInfo = monents; [self.navigationController pushViewController:detailVC animated:YES]; } } @@ -199,7 +199,7 @@ _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } [_tableView registerClass:[XPMonentsInteractiveTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsInteractiveTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.m index f1c4452f..b90bb0ef 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.m @@ -10,29 +10,29 @@ #import #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "TTPopup.h" ///Model -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" ///P #import "XPMonentsLatestPresenter.h" #import "XPMonentsLatestProtocol.h" ///View -#import "XPMonentsTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsDetailViewController.h" -UIKIT_EXTERN NSString *kRequestRicket; -@interface XPMonentsLatestViewController () +#import "XPMomentsTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsDetailViewController.h" +UIKIT_EXTERN NSString *kRequestTicket; +@interface XPMonentsLatestViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; ///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; ///当前的页数 @property (nonatomic,assign) NSInteger page; ///是否有更多的数据 @property (nonatomic,assign) BOOL hasNoMoreData; ///数据信息 -@property (nonatomic,strong) MonentsListInfoModel *listInfo; +@property (nonatomic,strong) MomentsListInfoModel *listInfo; @end @implementation XPMonentsLatestViewController @@ -112,8 +112,8 @@ UIKIT_EXTERN NSString *kRequestRicket; - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - MonentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMonentsLayoutConfig layoutMonentsModel:monentInfo]; + MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; + [XPMomentsLayoutConfig layoutMomentsModel:monentInfo]; if(monentInfo.squareTop && monentInfo.content.length == 0){ return monentInfo.rowHeight + 20 ; }else{ @@ -126,30 +126,30 @@ UIKIT_EXTERN NSString *kRequestRicket; - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.monentsInfo = monentsInfo; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + cell.momentsInfo = monentsInfo; cell.delegate = self; return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + detailVC.momentsInfo = monentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsDetailViewControllerDelegate -- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId { - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +#pragma mark - XPMomentsDetailViewControllerDelegate +- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; } @@ -161,16 +161,16 @@ UIKIT_EXTERN NSString *kRequestRicket; } } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(MonentsInfoModel *)monentsInfo{ +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ [self showLoading]; [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsLatestViewController1") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ @@ -178,9 +178,9 @@ UIKIT_EXTERN NSString *kRequestRicket; }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + __block MomentsInfoModel * monentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { monentsInfos = obj; *stop = YES; @@ -198,7 +198,7 @@ UIKIT_EXTERN NSString *kRequestRicket; } #pragma mark - XPMonentsLatestProtocol -- (void)getMonentsLatestListSuccess:(MonentsListInfoModel *)listInfo state:(int)state{ +- (void)getMonentsLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state{ self.listInfo = listInfo; if (state == 0) { [self.datasource removeAllObjects]; @@ -230,7 +230,7 @@ UIKIT_EXTERN NSString *kRequestRicket; } - (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { NSInteger count = obj.likeCount.integerValue; obj.isLike = status; @@ -247,9 +247,9 @@ UIKIT_EXTERN NSString *kRequestRicket; } -(void)requesstShieldingSuccess:(NSString *)monentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -262,8 +262,8 @@ UIKIT_EXTERN NSString *kRequestRicket; } - (void)deleteMonentsSuccess:(NSString *)monentsInfo { [self showSuccessToast:YMLocalizedString(@"XPMonentsLatestViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -287,14 +287,14 @@ UIKIT_EXTERN NSString *kRequestRicket; if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h index a134796d..04bf7a9b 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h +++ b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h @@ -8,9 +8,9 @@ #import "MvpViewController.h" NS_ASSUME_NONNULL_BEGIN -@class MonentsTopicModel; +@class MomentsTopicModel; @interface XPMonentsPublishViewController : MvpViewController -@property (nonatomic,strong, nullable) MonentsTopicModel *topicInfo; +@property (nonatomic,strong, nullable) MomentsTopicModel *topicInfo; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m index 0992d8e7..680bf9fd 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m @@ -20,7 +20,7 @@ #import "ClientConfig.h" #import "NSMutableDictionary+Saft.h" ///Model -#import "MonentsTopicModel.h" +#import "MomentsTopicModel.h" #import "MonentsPicResInfo.h" ///View #import "XPMonentsPublishCollectionViewCell.h" @@ -344,7 +344,7 @@ } #pragma mark - XPMoentsTopicListViewDelegate -- (void)xPMoentsTopicListView:(XPMoentsTopicListView *)view didSelectItem:(MonentsTopicModel *)topicInfo { +- (void)xPMoentsTopicListView:(XPMoentsTopicListView *)view didSelectItem:(MomentsTopicModel *)topicInfo { [TTPopup dismiss]; self.topicInfo = topicInfo; } @@ -392,7 +392,7 @@ [self showLoading]; [self uploadAlbumPicList:self.uploadImageList finish:^(NSArray *list) { [self hideHUD]; - [self.presenter publishMonents:self.topicInfo.worldId type:MonentsContentType_Picture content:self.textView.text resList:list]; + [self.presenter publishMonents:self.topicInfo.worldId type:MomentsContentType_Picture content:self.textView.text resList:list]; }]; } else { [self.presenter publishMonents:self.topicInfo.worldId type:MonentsContentType_Text content:self.textView.text resList:@[]]; @@ -403,7 +403,7 @@ } #pragma mark - Getters And Setters -- (void)setTopicInfo:(MonentsTopicModel *)topicInfo { +- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { _topicInfo = topicInfo; self.addTopicView.topicInfo = _topicInfo; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m index 4069b9d6..e70f9ecb 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m @@ -11,27 +11,27 @@ #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "TTPopup.h" ///Model -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" ///P #import "XPMonentsTopicLatestPresenter.h" #import "XPMonentsTopicLatestProtocol.h" ///View -#import "XPMonentsTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsDetailViewController.h" +#import "XPMomentsTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsDetailViewController.h" -@interface XPMonentsTopicLatestViewController () +@interface XPMonentsTopicLatestViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; ///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; ///是否有更多的数据 @property (nonatomic,assign) BOOL hasNoMoreData; ///数据信息 -@property (nonatomic,strong) MonentsListInfoModel *listInfo; +@property (nonatomic,strong) MomentsListInfoModel *listInfo; @end @implementation XPMonentsTopicLatestViewController @@ -64,7 +64,7 @@ NSString *dynamicId = refreshData[@"dynamicId"]; BOOL status = [refreshData[@"status"] boolValue]; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { if (status) { obj.isLike = YES; @@ -84,8 +84,8 @@ { NSString *dynamicId = refreshData[@"dynamicId"]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; @@ -102,8 +102,8 @@ case 2: { NSString *dynamicId = refreshData[@"dynamicId"]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; *stop = YES; @@ -120,7 +120,7 @@ default: { NSString *dynamicId = refreshData[@"dynamicId"]; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { obj.commentCount = [NSString stringWithFormat:@"%ld",obj.commentCount.integerValue + 1]; *stop = YES; @@ -181,8 +181,8 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - MonentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMonentsLayoutConfig layoutMonentsModel:monentInfo]; + MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; + [XPMomentsLayoutConfig layoutMomentsModel:monentInfo]; if(monentInfo.squareTop && monentInfo.content.length == 0){ return monentInfo.rowHeight + 20 ; }else{ @@ -194,35 +194,35 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; cell.delegate = self; - cell.monentsInfo = monentsInfo; + cell.momentsInfo = monentsInfo; return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + detailVC.momentsInfo = monentsInfo; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(MonentsInfoModel *)monentsInfo{ +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ [self showLoading]; [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ @@ -230,9 +230,9 @@ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + __block MomentsInfoModel * monentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { monentsInfos = obj; *stop = YES; @@ -264,7 +264,7 @@ #pragma mark - XPMonentsTopicLatestProtocol -- (void)getMonentsTopicLatestListSuccess:(MonentsListInfoModel *)listInfo state:(int)state{ +- (void)getMonentsTopicLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state{ self.listInfo = listInfo; if (state == 0) { [self.datasource removeAllObjects]; @@ -302,7 +302,7 @@ } - (void)requesstShieldingSuccess:(NSString *)monentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; ///type,0=点赞，1=删除，2=屏蔽，3=评论 [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":monentsInfo,@"type":@"2"}]; } @@ -325,14 +325,14 @@ if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m index 4e1395e5..964a54ff 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m @@ -11,27 +11,27 @@ #import ///Tool -#import "XPMonentsLayoutConfig.h" +#import "XPMomentsLayoutConfig.h" #import "TTPopup.h" ///Model -#import "MonentsListInfoModel.h" +#import "MomentsListInfoModel.h" ///P #import "XPMonentsTopicRecommendPresenter.h" #import "XPMonentsTopicRecommendProtocol.h" ///View -#import "XPMonentsTableViewCell.h" -#import "XPMonentsEmptyTableViewCell.h" -#import "XPMonentsDetailViewController.h" +#import "XPMomentsTableViewCell.h" +#import "XPMomentsEmptyTableViewCell.h" +#import "XPMomentsDetailViewController.h" -@interface XPMonentsTopicRecommondViewController () +@interface XPMonentsTopicRecommondViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; ///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; ///是否有更多的数据 @property (nonatomic,assign) BOOL hasNoMoreData; ///数据信息 -@property (nonatomic,strong) MonentsListInfoModel *listInfo; +@property (nonatomic,strong) MomentsListInfoModel *listInfo; @end @implementation XPMonentsTopicRecommondViewController @@ -100,8 +100,8 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - MonentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMonentsLayoutConfig layoutMonentsModel:monentInfo]; + MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; + [XPMomentsLayoutConfig layoutMomentsModel:monentInfo]; if(monentInfo.squareTop && monentInfo.content.length == 0){ return monentInfo.rowHeight + 20 ; }else{ @@ -113,33 +113,33 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - XPMonentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; cell.delegate = self; cell.isTopic = YES; - cell.monentsInfo = monentsInfo; + cell.momentsInfo = monentsInfo; return cell; } - XPMonentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { - XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init]; - MonentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.monentsInfo = monentsInfo; + XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; + MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; + detailVC.momentsInfo = monentsInfo; detailVC.delegate = self; [self.navigationController pushViewController:detailVC animated:YES]; } } -#pragma mark - XPMonentsDetailViewControllerDelegate +#pragma mark - XPMomentsDetailViewControllerDelegate -- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId { - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == dynamicId.integerValue) { deleteInfo = obj; } @@ -151,16 +151,16 @@ } } -#pragma mark - XPMonentsTableViewCellDelegate -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicShielding:(MonentsInfoModel *)monentsInfo{ +#pragma mark - XPMomentsTableViewCellDelegate +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ [self showLoading]; [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClickLike:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicRecommondViewController1") confirmHandler:^{ [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; } cancelHandler:^{ @@ -168,9 +168,9 @@ }]; } -- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicFold:(MonentsInfoModel *)monentsInfo { - __block MonentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { + __block MomentsInfoModel * monentsInfos; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { monentsInfos = obj; *stop = YES; @@ -199,8 +199,8 @@ self.scrollCallback(scrollView); } -#pragma mark - XPMonentsRecommendProtocol -- (void)getMonentsTopicRecommendListSuccess:(MonentsListInfoModel *)listInfo state:(int)state { +#pragma mark - XPMomentsRecommendProtocol +- (void)getMonentsTopicRecommendListSuccess:(MomentsListInfoModel *)listInfo state:(int)state { self.listInfo = listInfo; if (state == 0) { [self.datasource removeAllObjects]; @@ -232,7 +232,7 @@ } - (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj.dynamicId isEqualToString:dynamicId]) { if (status) { obj.isLike += 1; @@ -246,9 +246,9 @@ } -(void)requesstShieldingSuccess:(NSString *)monentsInfo{ [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMonentsMineViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -261,8 +261,8 @@ } - (void)deleteMonentsSuccess:(NSString *)monentsInfo { [self showSuccessToast:YMLocalizedString(@"XPMonentsTopicRecommondViewController2")]; - __block MonentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + __block MomentsInfoModel * deleteInfo; + [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.dynamicId.integerValue == monentsInfo.integerValue) { deleteInfo = obj; } @@ -286,14 +286,14 @@ if (@available(iOS 11.0, *)) { _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } - [_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])]; + [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; + [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; } return _tableView; } -- (NSMutableArray *)datasource { +- (NSMutableArray *)datasource { if (!_datasource) { _datasource = [NSMutableArray array]; } diff --git a/YuMi/Modules/YMRoom/Api/Api+Room.h b/YuMi/Modules/YMRoom/Api/Api+Room.h index 9b54d44b..f9c5e2c0 100644 --- a/YuMi/Modules/YMRoom/Api/Api+Room.h +++ b/YuMi/Modules/YMRoom/Api/Api+Room.h @@ -211,7 +211,7 @@ NS_ASSUME_NONNULL_BEGIN /// 屏蔽 /// @param completion 完成 /// @param type type为0 => 屏蔽动态, objId 为 动态id, type为1 => 屏蔽房间, objId 为 用户uid -+ (void)requesstShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId; ++ (void)requestShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId; ///得到免费礼物数据 +(void)requestFreeGiftData:(HttpRequestHelperCompletion)completion; /// /获解锁照片 diff --git a/YuMi/Modules/YMRoom/Api/Api+Room.m b/YuMi/Modules/YMRoom/Api/Api+Room.m index 62777c40..4faab57d 100644 --- a/YuMi/Modules/YMRoom/Api/Api+Room.m +++ b/YuMi/Modules/YMRoom/Api/Api+Room.m @@ -292,7 +292,7 @@ /// 屏蔽 /// @param completion 完成 /// @param type type为0 => 屏蔽动态, objId 为 动态id, type为1 => 屏蔽房间, objId 为 用户uid -+ (void)requesstShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId{ ++ (void)requestShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId{ [self makeRequest:@"user/black/add" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, type,objId, nil]; } +(void)requestFreeGiftData:(HttpRequestHelperCompletion)completion{ diff --git a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m b/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m index 5cd59516..ef6e920c 100644 --- a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m +++ b/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m @@ -302,7 +302,7 @@ }showLoading:NO errorToast:NO] roomUid:roomUid]; } - (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requesstShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] requesstShieldingSuccess]; }] type:type objId:objId]; } diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m index 3212b423..0d394703 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m @@ -29,7 +29,7 @@ #import "Api+Home.h" #import "YUMIConstant.h" #import "StatisticsServiceHelper.h" -#import "Api+Monents.h" +#import "Api+Moments.h" #import "XPAdImageTool.h" #import "YYUtility.h" #import "XPWeakTimer.h" @@ -72,7 +72,7 @@ #import "MSTabbarRoomGameVC.h" #import "MSRoomGameVC.h" -#import "XPMonentsRecommendViewController.h" +#import "XPMomentsRecommendViewController.h" #import "XPMomentsViewController.h" #import "XPReceiveRedPacketView.h" #import "XPRoomYearActivityView.h" @@ -819,7 +819,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; #pragma mark - 动态 - (void)monentsUnReadCount { - [Api monentsUnReadCount:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + [Api momentsUnReadCount:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { if (code == 200) { MonentsUnReadModel * model = [MonentsUnReadModel modelWithDictionary:data.data]; NSString *badge = model.total > 0 ? @(model.total).stringValue : nil; diff --git a/YuMi/Modules/YMWeb/XPWebViewController.m b/YuMi/Modules/YMWeb/XPWebViewController.m index 7678f682..848e7c75 100644 --- a/YuMi/Modules/YMWeb/XPWebViewController.m +++ b/YuMi/Modules/YMWeb/XPWebViewController.m @@ -33,7 +33,7 @@ #import "XPWebViewNavView.h" #import "XPIAPRechargeViewController.h" #import "SessionViewController.h" -#import "XPMonentTopicContainerViewController.h" +#import "XPMomentTopicContainerViewController.h" #import "XPIncomeRecordVC.h" #import "PIWebViewSavePhotoView.h" @@ -724,7 +724,7 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; {//跳转对应的话题 bodyDict = [bodyDict toJSONObject]; NSString *topicId = bodyDict[@"routerVal"]; - XPMonentTopicContainerViewController * topicVC = [[XPMonentTopicContainerViewController alloc] init]; + XPMomentTopicContainerViewController * topicVC = [[XPMomentTopicContainerViewController alloc] init]; topicVC.worldId = topicId; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:topicVC animated:YES]; } diff --git a/YuMi/Structure/MVP/Model/UserInfoModel.h b/YuMi/Structure/MVP/Model/UserInfoModel.h index c0718592..64b2c51a 100644 --- a/YuMi/Structure/MVP/Model/UserInfoModel.h +++ b/YuMi/Structure/MVP/Model/UserInfoModel.h @@ -12,7 +12,7 @@ #import "UserVipInfoVo.h" #import "UserPhoto.h" #import "UserGiftWallInfoModel.h" -#import "MonentsInfoModel.h" +#import "MomentsInfoModel.h" #import "XPSoundCardModel.h" #import "MedalModel.h" NS_ASSUME_NONNULL_BEGIN @@ -137,7 +137,7 @@ NS_ASSUME_NONNULL_BEGIN ///是否是封号用户 @property (nonatomic,assign) BOOL banAccount; ///用户的动态 -@property (nonatomic,strong) NSArray *dynamicInfo; +@property (nonatomic,strong) NSArray *dynamicInfo; ///区号 @property (nonatomic,copy) NSString *pi_phoneAreaCode; ///声音卡 diff --git a/YuMi/Structure/MVP/Model/UserInfoModel.m b/YuMi/Structure/MVP/Model/UserInfoModel.m index 778d0b80..45629b01 100644 --- a/YuMi/Structure/MVP/Model/UserInfoModel.m +++ b/YuMi/Structure/MVP/Model/UserInfoModel.m @@ -14,7 +14,7 @@ @"privatePhoto":UserPhoto.class, @"userGiftWall":UserGiftWallInfoModel.class, @"userLuckyBagGiftWall":UserGiftWallInfoModel.class, - @"dynamicInfo":MonentsInfoModel.class, + @"dynamicInfo":MomentsInfoModel.class, @"audioCard":XPSoundCardModel.class, // @"medals":MedalModel.class }; diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index d46fbe78..7868bd90 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -529,8 +529,8 @@ "SessionNavLiveView0" = "البث المباشر"; "XPMonentsRecommendViewController0" = "لا توجد بيانات إضافية"; -"XPMonentsRecommendViewController1" = "بمجرد الحذف، لا يمكن استعادتها\nهل أنت متأكد أنك تريد حذف هذا التحديث؟"; -"XPMonentsRecommendViewController2" = "تم الحذف بنجاح"; +"XPMomentsRecommendViewController1" = "بمجرد الحذف، لا يمكن استعادتها\nهل أنت متأكد أنك تريد حذف هذا التحديث؟"; +"XPMomentsRecommendViewController2" = "تم الحذف بنجاح"; "XPMonentsDetailViewController0" = "يرجى إدخال المحتوى الذي ترغب في التعليق عليه"; "XPMonentsDetailViewController1" = "التفاصيل"; @@ -571,8 +571,8 @@ ///XPMonentsMineViewController.m "XPMonentsMineViewController0" = "بمجرد الحذف، لا يمكن استعادتها\nهل أنت متأكد أنك تريد حذف هذا التحديث؟"; -"XPMonentsMineViewController1" = "تم الحذف بنجاح"; -"XPMonentsMineViewController2" = "تم حظره بنجاح"; +"XPMomentsMineViewController1" = "تم الحذف بنجاح"; +"XPMomentsMineViewController2" = "تم حظره بنجاح"; "XPMonentsViewController0" = "شعبية"; "XPMonentsViewController1" = "تابع"; @@ -2677,8 +2677,8 @@ ineHeadView12" = "الحمل"; "SessionNavLiveView0" = "بث مباشر"; "XPMonentsRecommendViewController0" = "لا توجد مزيد من البيانات"; -"XPMonentsRecommendViewController1" = "بعد الحذف لا يمكن استرداده\nهل أنت متأكد من حذف هذا النشاط؟"; -"XPMonentsRecommendViewController2" = "تم الحذف بنجاح"; +"XPMomentsRecommendViewController1" = "بعد الحذف لا يمكن استرداده\nهل أنت متأكد من حذف هذا النشاط؟"; +"XPMomentsRecommendViewController2" = "تم الحذف بنجاح"; "XPMonentsDetailViewController0" = "الرجاء إدخال تعليقك"; "XPMonentsDetailViewController1" = "تفاصيل"; @@ -2727,8 +2727,8 @@ ineHeadView12" = "الحمل"; "SessionNavLiveView0" = "بث مباشر"; "XPMonentsRecommendViewController0" = "لا توجد مزيد من البيانات"; -"XPMonentsRecommendViewController1" = "بعد الحذف لا يمكن استرداده\nهل أنت متأكد من حذف هذا النشاط؟"; -"XPMonentsRecommendViewController2" = "تم الحذف بنجاح"; +"XPMomentsRecommendViewController1" = "بعد الحذف لا يمكن استرداده\nهل أنت متأكد من حذف هذا النشاط؟"; +"XPMomentsRecommendViewController2" = "تم الحذف بنجاح"; "XPMonentsDetailViewController0" = "الرجاء إدخال تعليقك"; "XPMonentsDetailViewController1" = "تفاصيل"; @@ -2772,8 +2772,8 @@ ineHeadView12" = "الحمل"; ///XPMonentsMineViewController.m "XPMonentsMineViewController0" = "بعد الحذف لا يمكن استرداده\nهل أنت متأكد من حذف هذا النشاط؟"; -"XPMonentsMineViewController1" = "تم الحذف بنجاح"; -"XPMonentsMineViewController2" = "تم الحظر بنجاح"; +"XPMomentsMineViewController1" = "تم الحذف بنجاح"; +"XPMomentsMineViewController2" = "تم الحظر بنجاح"; "XPMonentsViewController1" = "متابعة"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 94197df6..180a9f3e 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -222,8 +222,8 @@ "SessionNavLiveView0" = "Live streaming"; "XPMonentsRecommendViewController0" = "No more data"; -"XPMonentsRecommendViewController1" = "Once deleted, it cannot be recovered\nAre you sure you want to delete this dynamic?"; -"XPMonentsRecommendViewController2" = "Deleted successfully"; +"XPMomentsRecommendViewController1" = "Once deleted, it cannot be recovered\nAre you sure you want to delete this dynamic?"; +"XPMomentsRecommendViewController2" = "Deleted successfully"; "XPMonentsDetailViewController0" = "Please enter the content you want to comment on"; "XPMonentsDetailViewController1" = "Details"; @@ -264,8 +264,8 @@ ///XPMonentsMineViewController.m "XPMonentsMineViewController0" = "Once deleted, it cannot be recovered\nAre you sure you want to delete this dynamic?"; -"XPMonentsMineViewController1" = "Deleted successfully"; -"XPMonentsMineViewController2" = "Blocked successfully"; +"XPMomentsMineViewController1" = "Deleted successfully"; +"XPMomentsMineViewController2" = "Blocked successfully"; "XPMonentsViewController1" = "Following"; @@ -2164,8 +2164,8 @@ "SessionNavLiveView0" = "Live"; "XPMonentsRecommendViewController0" = "No more data available"; -"XPMonentsRecommendViewController1" = "Deletion is irreversible. Are you sure you want to delete this post?"; -"XPMonentsRecommendViewController2" = "Deleted successfully"; +"XPMomentsRecommendViewController1" = "Deletion is irreversible. Are you sure you want to delete this post?"; +"XPMomentsRecommendViewController2" = "Deleted successfully"; "XPMonentsDetailViewController0" = "Please enter your comment"; "XPMonentsDetailViewController1" = "Details"; @@ -2206,8 +2206,8 @@ ///XPMonentsMineViewController.m "XPMonentsMineViewController0" = "Deletion is irreversible. Are you sure you want to delete this post?"; -"XPMonentsMineViewController1" = "Deleted successfully"; -"XPMonentsMineViewController2" = "Blocked successfully"; +"XPMomentsMineViewController1" = "Deleted successfully"; +"XPMomentsMineViewController2" = "Blocked successfully"; "XPMonentsRecommendHeaderView0" = "Recommended Topics"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 3f5b8e8b..e37e52e5 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -2032,8 +2032,8 @@ "SessionNavLiveView0" = "直播中"; "XPMonentsRecommendViewController0" = "没有更多数据了"; -"XPMonentsRecommendViewController1" = "删除后不可恢复\n确定删除该动态吗"; -"XPMonentsRecommendViewController2" = "删除成功"; +"XPMomentsRecommendViewController1" = "删除后不可恢复\n确定删除该动态吗"; +"XPMomentsRecommendViewController2" = "删除成功"; "XPMonentsDetailViewController0" = "请输入您要评论的内容"; "XPMonentsDetailViewController1" = "详情"; @@ -2076,8 +2076,8 @@ ///XPMonentsMineViewController.m "XPMonentsMineViewController0" = "删除后不可恢复\n确定删除该动态吗？"; -"XPMonentsMineViewController1" = "删除成功"; -"XPMonentsMineViewController2" = "屏蔽成功"; +"XPMomentsMineViewController1" = "删除成功"; +"XPMomentsMineViewController2" = "屏蔽成功"; "XPMonentsViewController0" = "推荐"; "XPMonentsViewController1" = "关注"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index d3153a6f..3f060d3d 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -2028,8 +2028,8 @@ "SessionNavLiveView0" = "直播中"; "XPMonentsRecommendViewController0" = "沒有更多數據了"; -"XPMonentsRecommendViewController1" = "刪除後不可恢復\n確定刪除該動態嗎"; -"XPMonentsRecommendViewController2" = "刪除成功"; +"XPMomentsRecommendViewController1" = "刪除後不可恢復\n確定刪除該動態嗎"; +"XPMomentsRecommendViewController2" = "刪除成功"; "XPMonentsDetailViewController0" = "請輸入您要評論的內容"; "XPMonentsDetailViewController1" = "詳情"; @@ -2072,8 +2072,8 @@ ///XPMonentsMineViewController.m "XPMonentsMineViewController0" = "刪除後不可恢復\n確定刪除該動態嗎？"; -"XPMonentsMineViewController1" = "刪除成功"; -"XPMonentsMineViewController2" = "屏蔽成功"; +"XPMomentsMineViewController1" = "刪除成功"; +"XPMomentsMineViewController2" = "屏蔽成功"; "XPMonentsViewController0" = "推薦"; "XPMonentsViewController1" = "關註";