From c66b79dbe04fd5698973fc7839b99db85f2fe849 Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Mon, 18 Oct 2021 19:10:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=BF=9B=E6=88=BF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E6=88=BF=E9=97=B4=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xplan-ios.xcodeproj/project.pbxproj | 250 +++++++----------- xplan-ios/Base/MVP/Model/UserInfoModel.h | 7 +- xplan-ios/Global/XPEnum.h | 5 + .../Main/Mine/View/XPMineViewController.m | 11 +- xplan-ios/Main/Room/Api/Api+Room.h | 66 +++++ xplan-ios/Main/Room/Api/Api+Room.m | 71 +++++ xplan-ios/Main/Room/Model/RoomInfoModel.h | 63 +++++ xplan-ios/Main/Room/Model/RoomInfoModel.m | 12 + .../Main/Room/Presenter/XPRoomPresenter.h | 23 ++ .../Main/Room/Presenter/XPRoomPresenter.m | 77 ++++++ xplan-ios/Main/Room/Protocol/XPRoomProtocol.h | 16 ++ .../ActivityManager/XPRoomActivityManager.h | 16 -- .../ActivityManager/XPRoomActivityManager.m | 31 --- .../BaseUIManager/XPRoomBackUIManager.h | 16 -- .../BaseUIManager/XPRoomBackUIManager.m | 30 --- .../BaseUIManager/XPRoomBaseManager.h | 17 -- .../BaseUIManager/XPRoomBaseManager.m | 26 -- .../UIManager/MenuManager/XPRoomMenuManager.h | 16 -- .../UIManager/MenuManager/XPRoomMenuManager.m | 29 -- .../MessageManager/XPRoomMessageManager.h | 16 -- .../MessageManager/XPRoomMessageManager.m | 30 --- .../PositionManager/XPRoomPositionManager.h | 16 -- .../PositionManager/XPRoomPositionManager.m | 33 --- .../RoomInfoManager/XPRoomInfoManager.h | 16 -- .../RoomInfoManager/XPRoomInfoManager.m | 29 -- .../XPRoomActivityContainerView.h} | 2 +- .../XPRoomActivityContainerView.m} | 6 +- .../XPRoomBackContainerView.h} | 2 +- .../XPRoomBackContainerView.m} | 6 +- .../MenuContainerView}/Model/XPRoomMenuItem.h | 0 .../MenuContainerView}/Model/XPRoomMenuItem.m | 0 .../XPRoomMenuContainerView.h} | 2 +- .../XPRoomMenuContainerView.m} | 6 +- .../XPRoomMessageContainerView.h} | 2 +- .../XPRoomMessageContainerView.m} | 4 +- .../Object/XPRoomPositionDataSourceImpl.h | 0 .../Object/XPRoomPositionDataSourceImpl.m | 0 .../Object/XPRoomPositionDataSourceProtocol.h | 0 .../Object/XPRoomPositionLayoutImpl.h | 0 .../Object/XPRoomPositionLayoutImpl.m | 0 .../Object/XPRoomPositionLayoutProtocol.h | 0 .../View/XCRoomPostionNickView.h | 0 .../View/XCRoomPostionNickView.m | 0 .../View/XPRoomPostionBaseItemView.h | 0 .../View/XPRoomPostionBaseItemView.m | 0 .../PositionView}/XPRoomPositionView.h | 0 .../PositionView}/XPRoomPositionView.m | 0 .../XPRoomPositionContainView.h | 0 .../XPRoomPositionContainView.m | 0 .../XPRoomInfoContainerView.h} | 7 +- .../XPRoomInfoContainerView.m} | 23 +- xplan-ios/Main/Room/View/XPRoomModuleHelper.h | 19 ++ xplan-ios/Main/Room/View/XPRoomModuleHelper.m | 83 ++++++ .../Room/{ => View}/XPRoomViewController.h | 5 +- .../Main/Room/View/XPRoomViewController.m | 146 ++++++++++ xplan-ios/Main/Room/XPRoomViewController.m | 140 ---------- 56 files changed, 714 insertions(+), 661 deletions(-) create mode 100644 xplan-ios/Main/Room/Api/Api+Room.h create mode 100644 xplan-ios/Main/Room/Api/Api+Room.m create mode 100644 xplan-ios/Main/Room/Model/RoomInfoModel.h create mode 100644 xplan-ios/Main/Room/Model/RoomInfoModel.m create mode 100644 xplan-ios/Main/Room/Presenter/XPRoomPresenter.h create mode 100644 xplan-ios/Main/Room/Presenter/XPRoomPresenter.m create mode 100644 xplan-ios/Main/Room/Protocol/XPRoomProtocol.h delete mode 100644 xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.h delete mode 100644 xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.m delete mode 100644 xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.h delete mode 100644 xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.m delete mode 100644 xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.h delete mode 100644 xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.m delete mode 100644 xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.h delete mode 100644 xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.m delete mode 100644 xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.h delete mode 100644 xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.m delete mode 100644 xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.h delete mode 100644 xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.m delete mode 100644 xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.h delete mode 100644 xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.m rename xplan-ios/Main/Room/View/{ActivityView/XPRoomActivityView.h => ActivityContainerView/XPRoomActivityContainerView.h} (77%) rename xplan-ios/Main/Room/View/{ActivityView/XPRoomActivityView.m => ActivityContainerView/XPRoomActivityContainerView.m} (95%) rename xplan-ios/Main/Room/View/{BaseUIView/XPRoomBackUIView.h => BaseUIContainerView/XPRoomBackContainerView.h} (78%) rename xplan-ios/Main/Room/View/{BaseUIView/XPRoomBackUIView.m => BaseUIContainerView/XPRoomBackContainerView.m} (89%) rename xplan-ios/Main/Room/{ => View/MenuContainerView}/Model/XPRoomMenuItem.h (100%) rename xplan-ios/Main/Room/{ => View/MenuContainerView}/Model/XPRoomMenuItem.m (100%) rename xplan-ios/Main/Room/View/{MenuView/XPRoomBottomMenuView.h => MenuContainerView/XPRoomMenuContainerView.h} (79%) rename xplan-ios/Main/Room/View/{MenuView/XPRoomBottomMenuView.m => MenuContainerView/XPRoomMenuContainerView.m} (98%) rename xplan-ios/Main/Room/View/{MessageView/XPRoomMessageView.h => MessageContainerView/XPRoomMessageContainerView.h} (77%) rename xplan-ios/Main/Room/View/{MessageView/XPRoomMessageView.m => MessageContainerView/XPRoomMessageContainerView.m} (83%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/Object/XPRoomPositionDataSourceImpl.h (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/Object/XPRoomPositionDataSourceImpl.m (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/Object/XPRoomPositionDataSourceProtocol.h (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/Object/XPRoomPositionLayoutImpl.h (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/Object/XPRoomPositionLayoutImpl.m (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/Object/XPRoomPositionLayoutProtocol.h (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/View/XCRoomPostionNickView.h (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/View/XCRoomPostionNickView.m (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/View/XPRoomPostionBaseItemView.h (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/View/XPRoomPostionBaseItemView.m (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/XPRoomPositionView.h (100%) rename xplan-ios/Main/Room/View/{PositionView/SubViews => PositionContainerView/PositionView}/XPRoomPositionView.m (100%) rename xplan-ios/Main/Room/View/{PositionView => PositionContainerView}/XPRoomPositionContainView.h (100%) rename xplan-ios/Main/Room/View/{PositionView => PositionContainerView}/XPRoomPositionContainView.m (100%) rename xplan-ios/Main/Room/View/{RoomInfoView/XPRoomInfoView.h => RoomInfoContainerView/XPRoomInfoContainerView.h} (56%) rename xplan-ios/Main/Room/View/{RoomInfoView/XPRoomInfoView.m => RoomInfoContainerView/XPRoomInfoContainerView.m} (94%) create mode 100644 xplan-ios/Main/Room/View/XPRoomModuleHelper.h create mode 100644 xplan-ios/Main/Room/View/XPRoomModuleHelper.m rename xplan-ios/Main/Room/{ => View}/XPRoomViewController.h (70%) create mode 100644 xplan-ios/Main/Room/View/XPRoomViewController.m delete mode 100644 xplan-ios/Main/Room/XPRoomViewController.m diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index c8aa482d..78f07081 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -146,6 +146,10 @@ E88B5CBD26FB3BDF00DA9178 /* XPTeenagerAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88B5CBC26FB3BDF00DA9178 /* XPTeenagerAlertView.m */; }; E88B5CC126FB407B00DA9178 /* XPMineUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E88B5CC026FB407B00DA9178 /* XPMineUserInfoViewController.m */; }; E88B5CC526FB42B000DA9178 /* XPMineUserInfoHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88B5CC426FB42B000DA9178 /* XPMineUserInfoHeaderView.m */; }; + E89D60BA271D643A001F8895 /* Api+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60B9271D643A001F8895 /* Api+Room.m */; }; + E89D60BD271D647A001F8895 /* XPRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60BC271D647A001F8895 /* XPRoomPresenter.m */; }; + E89D60C1271D64B9001F8895 /* RoomInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60C0271D64B9001F8895 /* RoomInfoModel.m */; }; + E89D60C4271D7AAD001F8895 /* XPRoomModuleHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60C3271D7AAD001F8895 /* XPRoomModuleHelper.m */; }; E89DA66427005932008483C1 /* XPIAPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA66327005932008483C1 /* XPIAPHelper.m */; }; E89DA66727006443008483C1 /* RechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA66627006443008483C1 /* RechargeStorage.m */; }; E89DA67227008D59008483C1 /* WalletInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA67127008D59008483C1 /* WalletInfoModel.m */; }; @@ -169,20 +173,13 @@ E8AC723726F49982007D6E91 /* XPMineNotificaProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723626F49957007D6E91 /* XPMineNotificaProtocol.h */; }; E8AC723A26F49AAE007D6E91 /* XPMineNotifyStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723926F49AAE007D6E91 /* XPMineNotifyStatus.m */; }; E8AC723D26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723C26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m */; }; - E8AE42642715392E00BEEBB2 /* XPRoomInfoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE42632715392E00BEEBB2 /* XPRoomInfoManager.m */; }; - E8AE426A2715395F00BEEBB2 /* XPRoomMessageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE42692715395F00BEEBB2 /* XPRoomMessageManager.m */; }; - E8AE426D2715397100BEEBB2 /* XPRoomMenuManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE426C2715397100BEEBB2 /* XPRoomMenuManager.m */; }; - E8AE42702715398400BEEBB2 /* XPRoomActivityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE426F2715398400BEEBB2 /* XPRoomActivityManager.m */; }; - E8AE427327153A3500BEEBB2 /* XPRoomActivityView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE427227153A3500BEEBB2 /* XPRoomActivityView.m */; }; - E8AE427627153B7E00BEEBB2 /* XPRoomPositionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE427527153B7E00BEEBB2 /* XPRoomPositionManager.m */; }; + E8AE427327153A3500BEEBB2 /* XPRoomActivityContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */; }; E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */; }; - E8AEAEE1271418AA0017FCE0 /* XPRoomBackUIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEE0271418AA0017FCE0 /* XPRoomBackUIManager.m */; }; - E8AEAEE4271418DA0017FCE0 /* XPRoomBaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEE3271418DA0017FCE0 /* XPRoomBaseManager.m */; }; - E8AEAEED27141AE20017FCE0 /* XPRoomBackUIView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEEC27141AE20017FCE0 /* XPRoomBackUIView.m */; }; - E8AEAEF027141C430017FCE0 /* XPRoomBottomMenuView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEEF27141C430017FCE0 /* XPRoomBottomMenuView.m */; }; - E8AEAEF327141C7C0017FCE0 /* XPRoomMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF227141C7C0017FCE0 /* XPRoomMessageView.m */; }; + E8AEAEED27141AE20017FCE0 /* XPRoomBackContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */; }; + E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */; }; + E8AEAEF327141C7C0017FCE0 /* XPRoomMessageContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */; }; E8AEAEF627141C910017FCE0 /* XPRoomPositionContainView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF527141C910017FCE0 /* XPRoomPositionContainView.m */; }; - E8AEAEF927141CA30017FCE0 /* XPRoomInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF827141CA30017FCE0 /* XPRoomInfoView.m */; }; + E8AEAEF927141CA30017FCE0 /* XPRoomInfoContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF827141CA30017FCE0 /* XPRoomInfoContainerView.m */; }; E8B825B726E9A7D8009E8E9F /* BaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825B626E9A7D8009E8E9F /* BaseObject.m */; }; E8B825BF26E9E57D009E8E9F /* LoginTicketInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825BE26E9E57D009E8E9F /* LoginTicketInfo.m */; }; E8B825C226EA00DF009E8E9F /* LoginVerifCodePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825C126EA00DF009E8E9F /* LoginVerifCodePresent.m */; }; @@ -496,6 +493,15 @@ E88B5CC026FB407B00DA9178 /* XPMineUserInfoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoViewController.m; sourceTree = ""; }; E88B5CC326FB42B000DA9178 /* XPMineUserInfoHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoHeaderView.h; sourceTree = ""; }; E88B5CC426FB42B000DA9178 /* XPMineUserInfoHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoHeaderView.m; sourceTree = ""; }; + E89D60B8271D643A001F8895 /* Api+Room.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Room.h"; sourceTree = ""; }; + E89D60B9271D643A001F8895 /* Api+Room.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Room.m"; sourceTree = ""; }; + E89D60BB271D647A001F8895 /* XPRoomPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPresenter.h; sourceTree = ""; }; + E89D60BC271D647A001F8895 /* XPRoomPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPresenter.m; sourceTree = ""; }; + E89D60BE271D648D001F8895 /* XPRoomProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomProtocol.h; sourceTree = ""; }; + E89D60BF271D64B9001F8895 /* RoomInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomInfoModel.h; sourceTree = ""; }; + E89D60C0271D64B9001F8895 /* RoomInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomInfoModel.m; sourceTree = ""; }; + E89D60C2271D7AAD001F8895 /* XPRoomModuleHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomModuleHelper.h; sourceTree = ""; }; + E89D60C3271D7AAD001F8895 /* XPRoomModuleHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomModuleHelper.m; sourceTree = ""; }; E89DA66227005931008483C1 /* XPIAPHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPHelper.h; sourceTree = ""; }; E89DA66327005932008483C1 /* XPIAPHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPHelper.m; sourceTree = ""; }; E89DA66527006443008483C1 /* RechargeStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RechargeStorage.h; sourceTree = ""; }; @@ -539,34 +545,20 @@ E8AC723926F49AAE007D6E91 /* XPMineNotifyStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNotifyStatus.m; sourceTree = ""; }; E8AC723B26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginBindPhoneResultViewController.h; sourceTree = ""; }; E8AC723C26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginBindPhoneResultViewController.m; sourceTree = ""; }; - E8AE42622715392E00BEEBB2 /* XPRoomInfoManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInfoManager.h; sourceTree = ""; }; - E8AE42632715392E00BEEBB2 /* XPRoomInfoManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInfoManager.m; sourceTree = ""; }; - E8AE42682715395F00BEEBB2 /* XPRoomMessageManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageManager.h; sourceTree = ""; }; - E8AE42692715395F00BEEBB2 /* XPRoomMessageManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageManager.m; sourceTree = ""; }; - E8AE426B2715397100BEEBB2 /* XPRoomMenuManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuManager.h; sourceTree = ""; }; - E8AE426C2715397100BEEBB2 /* XPRoomMenuManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuManager.m; sourceTree = ""; }; - E8AE426E2715398400BEEBB2 /* XPRoomActivityManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomActivityManager.h; sourceTree = ""; }; - E8AE426F2715398400BEEBB2 /* XPRoomActivityManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityManager.m; sourceTree = ""; }; - E8AE427127153A3500BEEBB2 /* XPRoomActivityView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomActivityView.h; sourceTree = ""; }; - E8AE427227153A3500BEEBB2 /* XPRoomActivityView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityView.m; sourceTree = ""; }; - E8AE427427153B7E00BEEBB2 /* XPRoomPositionManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPositionManager.h; sourceTree = ""; }; - E8AE427527153B7E00BEEBB2 /* XPRoomPositionManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPositionManager.m; sourceTree = ""; }; + E8AE427127153A3500BEEBB2 /* XPRoomActivityContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomActivityContainerView.h; sourceTree = ""; }; + E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityContainerView.m; sourceTree = ""; }; E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomViewController.h; sourceTree = ""; }; E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomViewController.m; sourceTree = ""; }; - E8AEAEDF271418AA0017FCE0 /* XPRoomBackUIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBackUIManager.h; sourceTree = ""; }; - E8AEAEE0271418AA0017FCE0 /* XPRoomBackUIManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackUIManager.m; sourceTree = ""; }; - E8AEAEE2271418DA0017FCE0 /* XPRoomBaseManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBaseManager.h; sourceTree = ""; }; - E8AEAEE3271418DA0017FCE0 /* XPRoomBaseManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBaseManager.m; sourceTree = ""; }; - E8AEAEEB27141AE20017FCE0 /* XPRoomBackUIView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBackUIView.h; sourceTree = ""; }; - E8AEAEEC27141AE20017FCE0 /* XPRoomBackUIView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackUIView.m; sourceTree = ""; }; - E8AEAEEE27141C430017FCE0 /* XPRoomBottomMenuView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBottomMenuView.h; sourceTree = ""; }; - E8AEAEEF27141C430017FCE0 /* XPRoomBottomMenuView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBottomMenuView.m; sourceTree = ""; }; - E8AEAEF127141C7C0017FCE0 /* XPRoomMessageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageView.h; sourceTree = ""; }; - E8AEAEF227141C7C0017FCE0 /* XPRoomMessageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageView.m; sourceTree = ""; }; + E8AEAEEB27141AE20017FCE0 /* XPRoomBackContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBackContainerView.h; sourceTree = ""; }; + E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackContainerView.m; sourceTree = ""; }; + E8AEAEEE27141C430017FCE0 /* XPRoomMenuContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuContainerView.h; sourceTree = ""; }; + E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuContainerView.m; sourceTree = ""; }; + E8AEAEF127141C7C0017FCE0 /* XPRoomMessageContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageContainerView.h; sourceTree = ""; }; + E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageContainerView.m; sourceTree = ""; }; E8AEAEF427141C910017FCE0 /* XPRoomPositionContainView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPositionContainView.h; sourceTree = ""; }; E8AEAEF527141C910017FCE0 /* XPRoomPositionContainView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPositionContainView.m; sourceTree = ""; }; - E8AEAEF727141CA30017FCE0 /* XPRoomInfoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInfoView.h; sourceTree = ""; }; - E8AEAEF827141CA30017FCE0 /* XPRoomInfoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInfoView.m; sourceTree = ""; }; + E8AEAEF727141CA30017FCE0 /* XPRoomInfoContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInfoContainerView.h; sourceTree = ""; }; + E8AEAEF827141CA30017FCE0 /* XPRoomInfoContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInfoContainerView.m; sourceTree = ""; }; E8B825B526E9A7D8009E8E9F /* BaseObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseObject.h; sourceTree = ""; }; E8B825B626E9A7D8009E8E9F /* BaseObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseObject.m; sourceTree = ""; }; E8B825BD26E9E57D009E8E9F /* LoginTicketInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginTicketInfo.h; sourceTree = ""; }; @@ -1176,8 +1168,8 @@ E804875F2717DD70008595F2 /* Model */ = { isa = PBXGroup; children = ( - E80487632717DDD9008595F2 /* XPRoomMenuItem.h */, - E80487642717DDD9008595F2 /* XPRoomMenuItem.m */, + E89D60BF271D64B9001F8895 /* RoomInfoModel.h */, + E89D60C0271D64B9001F8895 /* RoomInfoModel.m */, ); path = Model; sourceTree = ""; @@ -1185,6 +1177,8 @@ E80487602717DD89008595F2 /* Api */ = { isa = PBXGroup; children = ( + E89D60B8271D643A001F8895 /* Api+Room.h */, + E89D60B9271D643A001F8895 /* Api+Room.m */, ); path = Api; sourceTree = ""; @@ -1192,6 +1186,8 @@ E80487612717DD92008595F2 /* Presenter */ = { isa = PBXGroup; children = ( + E89D60BB271D647A001F8895 /* XPRoomPresenter.h */, + E89D60BC271D647A001F8895 /* XPRoomPresenter.m */, ); path = Presenter; sourceTree = ""; @@ -1199,6 +1195,7 @@ E80487622717DDAE008595F2 /* Protocol */ = { isa = PBXGroup; children = ( + E89D60BE271D648D001F8895 /* XPRoomProtocol.h */, ); path = Protocol; sourceTree = ""; @@ -1296,23 +1293,15 @@ path = StatisticsService; sourceTree = ""; }; - E8680707271959090024F48F /* SubViews */ = { + E8680707271959090024F48F /* PositionView */ = { isa = PBXGroup; children = ( E86807152719678B0024F48F /* View */, E868070C27195D4C0024F48F /* Object */, - E868070B27195AA30024F48F /* Config */, E8680708271959DB0024F48F /* XPRoomPositionView.h */, E8680709271959DB0024F48F /* XPRoomPositionView.m */, ); - path = SubViews; - sourceTree = ""; - }; - E868070B27195AA30024F48F /* Config */ = { - isa = PBXGroup; - children = ( - ); - path = Config; + path = PositionView; sourceTree = ""; }; E868070C27195D4C0024F48F /* Object */ = { @@ -1410,6 +1399,15 @@ path = MineInfo; sourceTree = ""; }; + E89D60B7271D6417001F8895 /* Model */ = { + isa = PBXGroup; + children = ( + E80487632717DDD9008595F2 /* XPRoomMenuItem.h */, + E80487642717DDD9008595F2 /* XPRoomMenuItem.m */, + ); + path = Model; + sourceTree = ""; + }; E89DA6612700590A008483C1 /* IAPHelper */ = { isa = PBXGroup; children = ( @@ -1449,148 +1447,81 @@ E80487602717DD89008595F2 /* Api */, E804875F2717DD70008595F2 /* Model */, E8AEAED8271413530017FCE0 /* View */, - E8AEAED7271413210017FCE0 /* UIManager */, - E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */, - E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */, ); path = Room; sourceTree = ""; }; - E8AEAED7271413210017FCE0 /* UIManager */ = { - isa = PBXGroup; - children = ( - E8AEAEDE271414FB0017FCE0 /* ActivityManager */, - E8AEAEDD271414DB0017FCE0 /* MenuManager */, - E8AEAEDC271414CA0017FCE0 /* MessageManager */, - E8AEAEDB271414B60017FCE0 /* PositionManager */, - E8AEAEDA2714148C0017FCE0 /* RoomInfoManager */, - E8AEAED92714146B0017FCE0 /* BaseUIManager */, - ); - path = UIManager; - sourceTree = ""; - }; E8AEAED8271413530017FCE0 /* View */ = { isa = PBXGroup; children = ( - E8AEAEE527141ACC0017FCE0 /* ActivityView */, - E8AEAEE727141ACC0017FCE0 /* BaseUIView */, - E8AEAEE927141ACC0017FCE0 /* MenuView */, - E8AEAEE627141ACC0017FCE0 /* MessageView */, - E8AEAEEA27141ACC0017FCE0 /* PositionView */, - E8AEAEE827141ACC0017FCE0 /* RoomInfoView */, + E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */, + E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */, + E8AEAEE527141ACC0017FCE0 /* ActivityContainerView */, + E8AEAEE727141ACC0017FCE0 /* BaseUIContainerView */, + E8AEAEE927141ACC0017FCE0 /* MenuContainerView */, + E8AEAEE627141ACC0017FCE0 /* MessageContainerView */, + E8AEAEEA27141ACC0017FCE0 /* PositionContainerView */, + E8AEAEE827141ACC0017FCE0 /* RoomInfoContainerView */, + E89D60C2271D7AAD001F8895 /* XPRoomModuleHelper.h */, + E89D60C3271D7AAD001F8895 /* XPRoomModuleHelper.m */, ); path = View; sourceTree = ""; }; - E8AEAED92714146B0017FCE0 /* BaseUIManager */ = { + E8AEAEE527141ACC0017FCE0 /* ActivityContainerView */ = { isa = PBXGroup; children = ( - E8AEAEDF271418AA0017FCE0 /* XPRoomBackUIManager.h */, - E8AEAEE0271418AA0017FCE0 /* XPRoomBackUIManager.m */, - E8AEAEE2271418DA0017FCE0 /* XPRoomBaseManager.h */, - E8AEAEE3271418DA0017FCE0 /* XPRoomBaseManager.m */, + E8AE427127153A3500BEEBB2 /* XPRoomActivityContainerView.h */, + E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */, ); - path = BaseUIManager; + path = ActivityContainerView; sourceTree = ""; }; - E8AEAEDA2714148C0017FCE0 /* RoomInfoManager */ = { + E8AEAEE627141ACC0017FCE0 /* MessageContainerView */ = { isa = PBXGroup; children = ( - E8AE42622715392E00BEEBB2 /* XPRoomInfoManager.h */, - E8AE42632715392E00BEEBB2 /* XPRoomInfoManager.m */, + E8AEAEF127141C7C0017FCE0 /* XPRoomMessageContainerView.h */, + E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */, ); - path = RoomInfoManager; + path = MessageContainerView; sourceTree = ""; }; - E8AEAEDB271414B60017FCE0 /* PositionManager */ = { + E8AEAEE727141ACC0017FCE0 /* BaseUIContainerView */ = { isa = PBXGroup; children = ( - E8AE427427153B7E00BEEBB2 /* XPRoomPositionManager.h */, - E8AE427527153B7E00BEEBB2 /* XPRoomPositionManager.m */, + E8AEAEEB27141AE20017FCE0 /* XPRoomBackContainerView.h */, + E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */, ); - path = PositionManager; + path = BaseUIContainerView; sourceTree = ""; }; - E8AEAEDC271414CA0017FCE0 /* MessageManager */ = { + E8AEAEE827141ACC0017FCE0 /* RoomInfoContainerView */ = { isa = PBXGroup; children = ( - E8AE42682715395F00BEEBB2 /* XPRoomMessageManager.h */, - E8AE42692715395F00BEEBB2 /* XPRoomMessageManager.m */, + E8AEAEF727141CA30017FCE0 /* XPRoomInfoContainerView.h */, + E8AEAEF827141CA30017FCE0 /* XPRoomInfoContainerView.m */, ); - path = MessageManager; + path = RoomInfoContainerView; sourceTree = ""; }; - E8AEAEDD271414DB0017FCE0 /* MenuManager */ = { + E8AEAEE927141ACC0017FCE0 /* MenuContainerView */ = { isa = PBXGroup; children = ( - E8AE426B2715397100BEEBB2 /* XPRoomMenuManager.h */, - E8AE426C2715397100BEEBB2 /* XPRoomMenuManager.m */, + E89D60B7271D6417001F8895 /* Model */, + E8AEAEEE27141C430017FCE0 /* XPRoomMenuContainerView.h */, + E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */, ); - path = MenuManager; + path = MenuContainerView; sourceTree = ""; }; - E8AEAEDE271414FB0017FCE0 /* ActivityManager */ = { + E8AEAEEA27141ACC0017FCE0 /* PositionContainerView */ = { isa = PBXGroup; children = ( - E8AE426E2715398400BEEBB2 /* XPRoomActivityManager.h */, - E8AE426F2715398400BEEBB2 /* XPRoomActivityManager.m */, - ); - path = ActivityManager; - sourceTree = ""; - }; - E8AEAEE527141ACC0017FCE0 /* ActivityView */ = { - isa = PBXGroup; - children = ( - E8AE427127153A3500BEEBB2 /* XPRoomActivityView.h */, - E8AE427227153A3500BEEBB2 /* XPRoomActivityView.m */, - ); - path = ActivityView; - sourceTree = ""; - }; - E8AEAEE627141ACC0017FCE0 /* MessageView */ = { - isa = PBXGroup; - children = ( - E8AEAEF127141C7C0017FCE0 /* XPRoomMessageView.h */, - E8AEAEF227141C7C0017FCE0 /* XPRoomMessageView.m */, - ); - path = MessageView; - sourceTree = ""; - }; - E8AEAEE727141ACC0017FCE0 /* BaseUIView */ = { - isa = PBXGroup; - children = ( - E8AEAEEB27141AE20017FCE0 /* XPRoomBackUIView.h */, - E8AEAEEC27141AE20017FCE0 /* XPRoomBackUIView.m */, - ); - path = BaseUIView; - sourceTree = ""; - }; - E8AEAEE827141ACC0017FCE0 /* RoomInfoView */ = { - isa = PBXGroup; - children = ( - E8AEAEF727141CA30017FCE0 /* XPRoomInfoView.h */, - E8AEAEF827141CA30017FCE0 /* XPRoomInfoView.m */, - ); - path = RoomInfoView; - sourceTree = ""; - }; - E8AEAEE927141ACC0017FCE0 /* MenuView */ = { - isa = PBXGroup; - children = ( - E8AEAEEE27141C430017FCE0 /* XPRoomBottomMenuView.h */, - E8AEAEEF27141C430017FCE0 /* XPRoomBottomMenuView.m */, - ); - path = MenuView; - sourceTree = ""; - }; - E8AEAEEA27141ACC0017FCE0 /* PositionView */ = { - isa = PBXGroup; - children = ( - E8680707271959090024F48F /* SubViews */, + E8680707271959090024F48F /* PositionView */, E8AEAEF427141C910017FCE0 /* XPRoomPositionContainView.h */, E8AEAEF527141C910017FCE0 /* XPRoomPositionContainView.m */, ); - path = PositionView; + path = PositionContainerView; sourceTree = ""; }; E8B825BC26E9E520009E8E9F /* Model */ = { @@ -1991,6 +1922,7 @@ E8B846BF26FD827900A777FE /* XPMineUserInfoAlbumViewController.m in Sources */, E824545C26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.m in Sources */, E8AC723726F49982007D6E91 /* XPMineNotificaProtocol.h in Sources */, + E89D60BD271D647A001F8895 /* XPRoomPresenter.m in Sources */, E8AC723226F49710007D6E91 /* XPMineNotificationTableViewCell.m in Sources */, E8AC722926F488DA007D6E91 /* XPMineFeedbackProtocol.h in Sources */, E8AC721E26F472BF007D6E91 /* XPMineSettingProtocol.h in Sources */, @@ -2040,12 +1972,10 @@ E81C27AE26EF39AB0031E639 /* AppDelegate+ThirdConfig.m in Sources */, E8E70D8326F2F51A00F03460 /* XPMineHeadView.m in Sources */, E8B825D026EA3825009E8E9F /* LoginPasswordViewController.m in Sources */, - E8AE42642715392E00BEEBB2 /* XPRoomInfoManager.m in Sources */, E8EEB90C26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m in Sources */, 18E7B31826F097E00064BC9B /* UserInfoModel.m in Sources */, E8AC721326F46ADD007D6E91 /* XPMineSettingViewController.m in Sources */, 18E7B32126F098650064BC9B /* UserInfoSkillVo.m in Sources */, - E8AE42702715398400BEEBB2 /* XPRoomActivityManager.m in Sources */, E8AC722726F482A4007D6E91 /* XPMineFeedbackPresenter.m in Sources */, 186A534E26FC6ED900D67B2C /* TTPopupService.m in Sources */, E8AC722426F47E5E007D6E91 /* XPMineFeedbackViewController.m in Sources */, @@ -2084,12 +2014,11 @@ 18E7B31B26F0982E0064BC9B /* UserExpand.m in Sources */, E824543526F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m in Sources */, E8680718271967B00024F48F /* XPRoomPostionBaseItemView.m in Sources */, - E8AEAEE4271418DA0017FCE0 /* XPRoomBaseManager.m in Sources */, E8B825CD26EA18C8009E8E9F /* ThemeColor.m in Sources */, E8AC720D26F435F5007D6E91 /* UIImageView+LoadImage.m in Sources */, E88B5CBD26FB3BDF00DA9178 /* XPTeenagerAlertView.m in Sources */, - E8AEAEF327141C7C0017FCE0 /* XPRoomMessageView.m in Sources */, - E8AE427327153A3500BEEBB2 /* XPRoomActivityView.m in Sources */, + E8AEAEF327141C7C0017FCE0 /* XPRoomMessageContainerView.m in Sources */, + E8AE427327153A3500BEEBB2 /* XPRoomActivityContainerView.m in Sources */, E86596432701611A00846EBD /* UIImage+ImageEffects.m in Sources */, E8CEA03D26EA3DE500644B44 /* LoginPasswordPresent.m in Sources */, E8E70D7726F2F15100F03460 /* XPMineViewController.m in Sources */, @@ -2101,7 +2030,6 @@ E81C279326EB394D0031E639 /* LoginForgetPasswordViewController.m in Sources */, E81C278D26EAFAF60031E639 /* DESEncrypt.m in Sources */, E81366E726F0A49E0076364C /* NSString+Regex.m in Sources */, - E8AE426A2715395F00BEEBB2 /* XPRoomMessageManager.m in Sources */, E8EEB90126FC31B6007C6EBA /* XPMineUserInfoPresenter.m in Sources */, 189DD56526DE465A00AB55B1 /* LoginViewController.m in Sources */, E824544B26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m in Sources */, @@ -2109,13 +2037,13 @@ E88B5CAD26FB16A800DA9178 /* XPMineTeenagerDesView.m in Sources */, E824545126F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m in Sources */, E8EEB90F26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m in Sources */, - E8AEAEE1271418AA0017FCE0 /* XPRoomBackUIManager.m in Sources */, + E89D60C4271D7AAD001F8895 /* XPRoomModuleHelper.m in Sources */, E8AC723A26F49AAE007D6E91 /* XPMineNotifyStatus.m in Sources */, 18E7B33226F317A20064BC9B /* XPWebViewController.m in Sources */, - E8AEAEF927141CA30017FCE0 /* XPRoomInfoView.m in Sources */, + E8AEAEF927141CA30017FCE0 /* XPRoomInfoContainerView.m in Sources */, E8AC721C26F4720B007D6E91 /* XPMineSettingPresent.m in Sources */, E88B5CA526FB088600DA9178 /* XPMineTeenagerViewController.m in Sources */, - E8AEAEF027141C430017FCE0 /* XPRoomBottomMenuView.m in Sources */, + E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */, E8EEB90926FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.m in Sources */, 18C17A5D26F338F300C48E11 /* XplanFBFlutterViewContainer.m in Sources */, E89DA67527009ACD008483C1 /* XPMineRechargeNavView.m in Sources */, @@ -2136,7 +2064,7 @@ E824546426F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m in Sources */, E8B846BC26FD7C1200A777FE /* UploadImage.m in Sources */, 186A534D26FC6ED900D67B2C /* TTActionSheetView.m in Sources */, - E8AEAEED27141AE20017FCE0 /* XPRoomBackUIView.m in Sources */, + E8AEAEED27141AE20017FCE0 /* XPRoomBackContainerView.m in Sources */, E88B5CC126FB407B00DA9178 /* XPMineUserInfoViewController.m in Sources */, E824545926F5E65900BE8163 /* XPMineVerifIdentityView.m in Sources */, 189DD74026E21C3F00AB55B1 /* YYUtility+App.m in Sources */, @@ -2151,6 +2079,7 @@ E80487652717DDD9008595F2 /* XPRoomMenuItem.m in Sources */, 189DD75026E21D9000AB55B1 /* GCDHelper.m in Sources */, 186A534826FC6ED900D67B2C /* TTAlertButtonConfig.m in Sources */, + E89D60BA271D643A001F8895 /* Api+Room.m in Sources */, E8AEAEF627141C910017FCE0 /* XPRoomPositionContainView.m in Sources */, E872308926E89BE000B90D4F /* LoginPhoneViewController.m in Sources */, 18E7B29026EA0E6B0064BC9B /* FlutterBoost+Xplan.m in Sources */, @@ -2158,11 +2087,10 @@ 189DD75926E6003C00AB55B1 /* Api.m in Sources */, E88B5CB826FB325200DA9178 /* XPMineTeenagerPwdPresenter.m in Sources */, E868071B271969A50024F48F /* XCRoomPostionNickView.m in Sources */, + E89D60C1271D64B9001F8895 /* RoomInfoModel.m in Sources */, E89DA66727006443008483C1 /* RechargeStorage.m in Sources */, 189DD53F26DE255600AB55B1 /* main.m in Sources */, - E8AE427627153B7E00BEEBB2 /* XPRoomPositionManager.m in Sources */, E872308D26E89DAA00B90D4F /* LoginInputView.m in Sources */, - E8AE426D2715397100BEEBB2 /* XPRoomMenuManager.m in Sources */, 189DD58F26DF97E700AB55B1 /* LoginPresenter.m in Sources */, E89DA67227008D59008483C1 /* WalletInfoModel.m in Sources */, 189DD55026DE37F900AB55B1 /* MvpViewController.m in Sources */, diff --git a/xplan-ios/Base/MVP/Model/UserInfoModel.h b/xplan-ios/Base/MVP/Model/UserInfoModel.h index 3350daf3..6182a3b0 100644 --- a/xplan-ios/Base/MVP/Model/UserInfoModel.h +++ b/xplan-ios/Base/MVP/Model/UserInfoModel.h @@ -10,12 +10,9 @@ #import "UserLevelVo.h" #import "UserInfoSkillVo.h" #import "UserPhoto.h" - +#import "XPEnum.h" NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, GenderType) { - GenderType_Male = 1,///男性 - GenderType_Female = 2,///女性 -}; + @interface UserInfoModel : BaseObject @property (nonatomic , assign) NSInteger bindType; diff --git a/xplan-ios/Global/XPEnum.h b/xplan-ios/Global/XPEnum.h index cd9fc2f4..af98daaf 100644 --- a/xplan-ios/Global/XPEnum.h +++ b/xplan-ios/Global/XPEnum.h @@ -25,5 +25,10 @@ typedef NS_ENUM(NSUInteger, GetSmsType) { GetSmsType_Unbind_Phone = 7, ///解绑手机 }; +typedef NS_ENUM(NSInteger, GenderType) { + GenderType_Male = 1,///男性 + GenderType_Female = 2,///女性 +}; + #endif /* XPEnum_h */ diff --git a/xplan-ios/Main/Mine/View/XPMineViewController.m b/xplan-ios/Main/Mine/View/XPMineViewController.m index 171751b5..2a0cef01 100644 --- a/xplan-ios/Main/Mine/View/XPMineViewController.m +++ b/xplan-ios/Main/Mine/View/XPMineViewController.m @@ -33,6 +33,7 @@ #warning todo 测试 #import "BaseNavigationController.h" #import "XPRoomViewController.h" +#import "XPRoomModuleHelper.h" @interface XPMineViewController () @@ -130,16 +131,16 @@ break; case XPMineItemType_Account: { +#warning to do 测试 + [[XPRoomModuleHelper shareHelper] enterRoomVCWithRoomUid:[NSString stringWithFormat:@"%ld", self.userInfo.uid] viewController:self]; + return; + XPRoomViewController * roomVC = [[XPRoomViewController alloc] init]; BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; nav.modalPresentationStyle = UIModalPresentationFullScreen; [self.navigationController presentViewController:nav animated:YES completion:nil]; - return; - -#warning to do 测试 - XPMineRechargeViewController * rechargeVC = [[XPMineRechargeViewController alloc] init]; - [self.navigationController pushViewController:rechargeVC animated:YES]; } + break; case XPMineItemType_Invite_Friend: [self pushWebViewWIthUrl:URLWithType(kUserInviteFriendURL)]; diff --git a/xplan-ios/Main/Room/Api/Api+Room.h b/xplan-ios/Main/Room/Api/Api+Room.h new file mode 100644 index 00000000..bb097d26 --- /dev/null +++ b/xplan-ios/Main/Room/Api/Api+Room.h @@ -0,0 +1,66 @@ +// +// Api+Room.h +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import "Api.h" +#import "RoomInfoModel.h" +NS_ASSUME_NONNULL_BEGIN + +@interface Api (Room) + +/// 获取房间信息 +/// @param complection 完成 +/// @param uid 用户的uid +/// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 ++ (void)getRoomInfoWithComplection:(HttpRequestHelperCompletion)complection + uid:(NSString *)uid + intoUid:(NSString *)intoUid; + + +/// 开启房间 +/// @param complection 完成 +/// @param title 房间标题 +/// @param type 类型 +/// @param roomPwd 房间密码 +/// @param roomDesc 房间描述 +/// @param backPic 房间背景 +/// @param uid 用户的uid +/// @param ticket 用户的ticket ++ (void)openRoomWithComplection:(HttpRequestHelperCompletion)complection + title:(NSString *)title + type:(RoomType)type + roomPwd:(NSString *)roomPwd + roomDesc:(NSString *)roomDesc + backPic:(NSString *)backPic + uid:(NSString *)uid + ticket:(NSString *)ticket; + +/// 房间上麦 +/// @param complection 完成 +/// @param micUid 上麦的uid +/// @param roomId 房间的id +/// @param position 坑位的序号 +/// @param ticket ticket ++ (void)roomMicUpMicWithComplection:(HttpRequestHelperCompletion)complection + micUid:(NSString *)micUid + roomId:(NSString *)roomId + position:(NSString *)position + ticket:(NSString *)ticket; + +/// 房间下麦 +/// @param complection 完成 +/// @param micUid 上麦的uid +/// @param roomId 房间的id +/// @param position 坑位的序号 +/// @param ticket ticket ++ (void)roomMicDownMicWithComplection:(HttpRequestHelperCompletion)complection + micUid:(NSString *)micUid + roomId:(NSString *)roomId + position:(NSString *)position + ticket:(NSString *)ticket; +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/Api/Api+Room.m b/xplan-ios/Main/Room/Api/Api+Room.m new file mode 100644 index 00000000..a9e301fd --- /dev/null +++ b/xplan-ios/Main/Room/Api/Api+Room.m @@ -0,0 +1,71 @@ +// +// Api+Room.m +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import "Api+Room.h" + +@implementation Api (Room) + +/// 获取房间信息 +/// @param complection 完成 +/// @param uid 用户的uid +/// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 ++ (void)getRoomInfoWithComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid { + [self makeRequest:@"room/get" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, intoUid, nil]; +} + + +/// 开启房间 +/// @param complection 完成 +/// @param title 房间标题 +/// @param type 类型 +/// @param roomPwd 房间密码 +/// @param roomDesc 房间描述 +/// @param backPic 房间背景 +/// @param uid 用户的uid +/// @param ticket 用户的ticket ++ (void)openRoomWithComplection:(HttpRequestHelperCompletion)complection + title:(NSString *)title + type:(RoomType)type + roomPwd:(NSString *)roomPwd + roomDesc:(NSString *)roomDesc + backPic:(NSString *)backPic + uid:(NSString *)uid + ticket:(NSString *)ticket { + [Api makeRequest:@"room/open" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, title, type, roomPwd, roomDesc, backPic, uid, ticket,nil]; +} + + +/// 关闭房间 +/// @param complection 完成 +/// @param uid 用户的uid +/// @param ticket 用户的ticket ++ (void)closeRoomWithComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { + [Api makeRequest:@"room/close" method:HttpRequestHelperMethodPOST completion:complection,__FUNCTION__, uid, ticket, nil]; +} + + +/// 房间上麦 +/// @param complection 完成 +/// @param micUid 上麦的uid +/// @param roomId 房间的id +/// @param position 坑位的序号 +/// @param ticket ticket ++ (void)roomMicUpMicWithComplection:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { + [Api makeRequest:@"room/mic/upmic" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; +} + +/// 房间下麦 +/// @param complection 完成 +/// @param micUid 上麦的uid +/// @param roomId 房间的id +/// @param position 坑位的序号 +/// @param ticket ticket ++ (void)roomMicDownMicWithComplection:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { + [Api makeRequest:@"room/mic/downmic" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; +} + +@end diff --git a/xplan-ios/Main/Room/Model/RoomInfoModel.h b/xplan-ios/Main/Room/Model/RoomInfoModel.h new file mode 100644 index 00000000..c2ebfedb --- /dev/null +++ b/xplan-ios/Main/Room/Model/RoomInfoModel.h @@ -0,0 +1,63 @@ +// +// RoomInfoModel.h +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import "BaseObject.h" +#import "XPEnum.h" + +NS_ASSUME_NONNULL_BEGIN +typedef NS_ENUM(NSInteger, RoomType) { + RoomType_Game = 3, +}; + + +@interface RoomInfoModel : BaseObject +@property (nonatomic , copy) NSString * nick; +@property (nonatomic , assign) NSInteger uid; +@property (nonatomic , assign) NSInteger isRecom; +@property (nonatomic , assign) NSInteger calcSumDataIndex; +@property (nonatomic , assign) NSInteger roomModeType; +@property (nonatomic , copy) NSString * roomTag; +@property (nonatomic , copy) NSString * audioSdkType; +@property (nonatomic , assign) NSInteger hideFlag; +@property (nonatomic , assign) NSInteger blindDateState; +@property (nonatomic , assign) RoomType type; +@property (nonatomic , strong) NSArray * speakTemplate; +@property (nonatomic , assign) NSInteger tagId; +@property (nonatomic , assign) BOOL canOpenBlindDate; +@property (nonatomic , assign) BOOL isExceptionClose; +@property (nonatomic , assign) NSInteger recomSeq; +@property (nonatomic , assign) BOOL redEnvelopeOpen; +@property (nonatomic , assign) NSInteger roomId; +@property (nonatomic , copy) NSString * meetingName; +@property (nonatomic , assign) BOOL valid; +@property (nonatomic , assign) NSInteger openTime; +@property (nonatomic , copy) NSString * tagPict; +@property (nonatomic , assign) BOOL isPureMode; +@property (nonatomic , assign) NSInteger count; +@property (nonatomic , assign) BOOL showGiftValue; +@property (nonatomic , copy) NSString * avatar; +@property (nonatomic , assign) NSInteger onlineNum; +@property (nonatomic , assign) BOOL isCloseScreen; +@property (nonatomic , assign) BOOL exceptionClose; +@property (nonatomic , assign) NSInteger isPermitRoom; +@property (nonatomic , assign) NSInteger abChannelType; +@property (nonatomic , assign) BOOL hasAnimationEffect; +@property (nonatomic , assign) GenderType gender; +@property (nonatomic , assign) BOOL serverRedEnvelopeSwitch; +@property (nonatomic , assign) BOOL isOpenGame; +@property (nonatomic , copy) NSString * roomDesc; +@property (nonatomic , assign) BOOL leaveMode; +@property (nonatomic , assign) NSInteger officeUser; +@property (nonatomic , assign) NSInteger erbanNo; +@property (nonatomic , assign) NSInteger audioQuality; +@property (nonatomic , copy) NSString * title; +@property (nonatomic , assign) NSInteger closeScreenFlag; +@property (nonatomic , assign) NSInteger operatorStatus; +@property (nonatomic , assign) BOOL isRoomFans; +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/Model/RoomInfoModel.m b/xplan-ios/Main/Room/Model/RoomInfoModel.m new file mode 100644 index 00000000..7f0e6198 --- /dev/null +++ b/xplan-ios/Main/Room/Model/RoomInfoModel.m @@ -0,0 +1,12 @@ +// +// RoomInfoModel.m +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import "RoomInfoModel.h" + +@implementation RoomInfoModel + +@end diff --git a/xplan-ios/Main/Room/Presenter/XPRoomPresenter.h b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.h new file mode 100644 index 00000000..3cf69516 --- /dev/null +++ b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.h @@ -0,0 +1,23 @@ +// +// XPRoomPresenter.h +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import "BaseMvpPresenter.h" + +NS_ASSUME_NONNULL_BEGIN +@class UserInfoModel, RoomInfoModel; +@interface XPRoomPresenter : BaseMvpPresenter +/// 获取用户信息 +/// @param success 成功 +- (void)getUserInfoSuccess:(void(^)(UserInfoModel * info))success; + +/// 获取进入的那个房间信息 +/// @param uid 进入的房间的uid +/// @param success 成功 +- (void)getRoomInfoWithUid:(NSString *)uid success:(void(^)(RoomInfoModel *roomInfo))success; +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m new file mode 100644 index 00000000..7fe2e3d2 --- /dev/null +++ b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m @@ -0,0 +1,77 @@ +// +// XPRoomPresenter.m +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import "XPRoomPresenter.h" +///API +#import "Api+Room.h" +#import "RoomInfoModel.h" +#import "UserInfoModel.h" +///Tool +#import "AccountInfoStorage.h" + + +@implementation XPRoomPresenter + + +/// 获取用户信息 +/// @param success 成功 +- (void)getUserInfoSuccess:(void(^)(UserInfoModel * info))success { + NSString * uid = [AccountInfoStorage instance].getUid; + [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + UserInfoModel * infoModel = [UserInfoModel modelWithJSON:data.data]; + if (infoModel && success) { + success(infoModel); + } + }] uid:uid]; +} + +/// 获取进入的那个房间信息 +/// @param uid 进入的房间的uid +/// @param success 成功 +- (void)getRoomInfoWithUid:(NSString *)uid success:(void(^)(RoomInfoModel *roomInfo))success { + NSString * intoUid = [AccountInfoStorage instance].getUid; + [Api getRoomInfoWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + RoomInfoModel * model = [RoomInfoModel modelWithJSON:data.data]; + if (model && success) { + success(model); + } + } showLoading:YES] uid:uid intoUid:intoUid]; +} + + +/// 开启用户自己的房间 +/// @param title 房间标题 +/// @param type 房间类型 +/// @param roomPwd 房间密码 +/// @param roomDesc 房间介绍 +/// @param backPic 房间背景 +- (void)openUserRoomWithTitle:(NSString *)title + type:(RoomType)type + roomPwd:(NSString *)roomPwd + roomDesc:(NSString *)roomDesc + backPic:(NSString *)backPic { + NSString * uid = [AccountInfoStorage instance].getUid; + NSString * ticket = [AccountInfoStorage instance].getTicket; + if (roomPwd.length <= 0) { + roomPwd = @""; + } + + if (roomDesc.length <= 0) { + roomDesc = @""; + } + + if (backPic.length <= 0) { + backPic = @""; + } + + [Api openRoomWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { +#warning to do s1 应该用不到房间开启吧 + }] title:title type:type roomPwd:roomPwd roomDesc:roomDesc backPic:backPic uid:uid ticket:ticket]; +} + + +@end diff --git a/xplan-ios/Main/Room/Protocol/XPRoomProtocol.h b/xplan-ios/Main/Room/Protocol/XPRoomProtocol.h new file mode 100644 index 00000000..bc131f54 --- /dev/null +++ b/xplan-ios/Main/Room/Protocol/XPRoomProtocol.h @@ -0,0 +1,16 @@ +// +// XPRoomProtocol.h +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol XPRoomProtocol + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.h b/xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.h deleted file mode 100644 index 7cb606f8..00000000 --- a/xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomActivityManager.h -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomBaseManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomActivityManager : XPRoomBaseManager - -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.m b/xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.m deleted file mode 100644 index 07558759..00000000 --- a/xplan-ios/Main/Room/UIManager/ActivityManager/XPRoomActivityManager.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// XPRoomActivityManager.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomActivityManager.h" -///View -#import "XPRoomActivityView.h" - -@interface XPRoomActivityManager () -///活动的View -@property (nonatomic,strong) XPRoomActivityView *activityView; -@end - -@implementation XPRoomActivityManager - -- (UIView *)containerView { - return self.activityView; -} - - -- (XPRoomActivityView *)activityView { - if (!_activityView) { - _activityView = [[XPRoomActivityView alloc] init]; - } - return _activityView; -} - -@end diff --git a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.h b/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.h deleted file mode 100644 index 8031eb0c..00000000 --- a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// BaseUIManager.h -// xplan-ios -// -// Created by 冯硕 on 2021/10/11. -// - -#import "XPRoomBaseManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomBackUIManager : XPRoomBaseManager - -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.m b/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.m deleted file mode 100644 index 54e0f0af..00000000 --- a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBackUIManager.m +++ /dev/null @@ -1,30 +0,0 @@ -// -// BaseUIManager.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/11. -// - -#import "XPRoomBackUIManager.h" -#import "XPRoomBackUIView.h" -@interface XPRoomBackUIManager () -/// -@property (nonatomic,strong) XPRoomBackUIView *roomBackView; -@end - -@implementation XPRoomBackUIManager - -- (UIView *)containerView { - return self.roomBackView; -} - - - -- (XPRoomBackUIView *)roomBackView { - if (!_roomBackView) { - _roomBackView = [[XPRoomBackUIView alloc] init]; - } - return _roomBackView; -} - -@end diff --git a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.h b/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.h deleted file mode 100644 index 7dec779a..00000000 --- a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPRoomBaseManager.h -// xplan-ios -// -// Created by 冯硕 on 2021/10/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomBaseManager : NSObject -/// -@property (nonatomic,strong, readonly) UIView * containerView; -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.m b/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.m deleted file mode 100644 index 72963162..00000000 --- a/xplan-ios/Main/Room/UIManager/BaseUIManager/XPRoomBaseManager.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPRoomBaseManager.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/11. -// - -#import "XPRoomBaseManager.h" - -@interface XPRoomBaseManager () -/// -@property (nonatomic,strong) UIView * containerView; -@end - -@implementation XPRoomBaseManager - - -- (UIView *)containerView { - if (!_containerView) { - _containerView = [[UIView alloc] init]; - _containerView.backgroundColor = [UIColor clearColor]; - } - return _containerView; -} - -@end diff --git a/xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.h b/xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.h deleted file mode 100644 index 2c78f236..00000000 --- a/xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomMenuManager.h -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomBaseManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomMenuManager : XPRoomBaseManager - -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.m b/xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.m deleted file mode 100644 index 21203274..00000000 --- a/xplan-ios/Main/Room/UIManager/MenuManager/XPRoomMenuManager.m +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPRoomMenuManager.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomMenuManager.h" -#import "XPRoomBottomMenuView.h" - -@interface XPRoomMenuManager () -/// -@property (nonatomic,strong) XPRoomBottomMenuView *menuView; -@end - -@implementation XPRoomMenuManager - -- (UIView *)containerView { - return self.menuView; -} - -#pragma mark - Getters And Setters -- (XPRoomBottomMenuView *)menuView { - if (!_menuView) { - _menuView = [[XPRoomBottomMenuView alloc] init]; - } - return _menuView; -} -@end diff --git a/xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.h b/xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.h deleted file mode 100644 index 0b7a837a..00000000 --- a/xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomPositionManager.h -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomBaseManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomMessageManager : XPRoomBaseManager - -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.m b/xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.m deleted file mode 100644 index cae73d01..00000000 --- a/xplan-ios/Main/Room/UIManager/MessageManager/XPRoomMessageManager.m +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPRoomPositionManager.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomMessageManager.h" -#import "XPRoomMessageView.h" -@interface XPRoomMessageManager () -/// -@property (nonatomic,strong) XPRoomMessageView *messageView; -@end - - -@implementation XPRoomMessageManager - -- (UIView *)containerView { - return self.messageView; -} - -- (XPRoomMessageView *)messageView { - if (!_messageView) { - _messageView = [[XPRoomMessageView alloc] init]; - } - return _messageView; -} - - -@end diff --git a/xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.h b/xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.h deleted file mode 100644 index 5893a546..00000000 --- a/xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomPositionManager.h -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomBaseManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPositionManager : XPRoomBaseManager -- (CGFloat)getContainerViewHeight; -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.m b/xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.m deleted file mode 100644 index fe99650b..00000000 --- a/xplan-ios/Main/Room/UIManager/PositionManager/XPRoomPositionManager.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPRoomPositionManager.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomPositionManager.h" -#import "XPRoomPositionContainView.h" - -@interface XPRoomPositionManager () -///坑位 -@property (nonatomic,strong) XPRoomPositionContainView *positionView; -@end - -@implementation XPRoomPositionManager - -- (UIView *)containerView { - return self.positionView; -} - -- (XPRoomPositionContainView *)positionView { - if (!_positionView) { - _positionView = [[XPRoomPositionContainView alloc] init]; - } - return _positionView; -} - -- (CGFloat)getContainerViewHeight { - return [self.positionView positionContainerViewHeight]; -} - -@end diff --git a/xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.h b/xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.h deleted file mode 100644 index 00228838..00000000 --- a/xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomInfoManager.h -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomBaseManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomInfoManager : XPRoomBaseManager - -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.m b/xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.m deleted file mode 100644 index ff21f522..00000000 --- a/xplan-ios/Main/Room/UIManager/RoomInfoManager/XPRoomInfoManager.m +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPRoomInfoManager.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomInfoManager.h" -#import "XPRoomInfoView.h" -@interface XPRoomInfoManager () -/// -@property (nonatomic,strong) XPRoomInfoView *infoView; -@end - -@implementation XPRoomInfoManager -#pragma mark - OVer load -- (UIView *)containerView { - return self.infoView; -} - -#pragma mark - Getters And Setters -- (XPRoomInfoView *)infoView { - if (!_infoView) { - _infoView = [[XPRoomInfoView alloc] init]; - } - return _infoView; -} - -@end diff --git a/xplan-ios/Main/Room/View/ActivityView/XPRoomActivityView.h b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.h similarity index 77% rename from xplan-ios/Main/Room/View/ActivityView/XPRoomActivityView.h rename to xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.h index b2ab25e9..a1580c36 100644 --- a/xplan-ios/Main/Room/View/ActivityView/XPRoomActivityView.h +++ b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPRoomActivityView : UIView +@interface XPRoomActivityContainerView : UIView @end diff --git a/xplan-ios/Main/Room/View/ActivityView/XPRoomActivityView.m b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m similarity index 95% rename from xplan-ios/Main/Room/View/ActivityView/XPRoomActivityView.m rename to xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m index 94a54f03..0fba7d58 100644 --- a/xplan-ios/Main/Room/View/ActivityView/XPRoomActivityView.m +++ b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -5,12 +5,12 @@ // Created by 冯硕 on 2021/10/12. // -#import "XPRoomActivityView.h" +#import "XPRoomActivityContainerView.h" ///Third #import #import -@interface XPRoomActivityView () +@interface XPRoomActivityContainerView () ///容器 @property (nonatomic,strong) UIStackView *stackView; ///轮播图 @@ -19,7 +19,7 @@ @property (nonatomic,strong) UIView * placeHolderView; @end -@implementation XPRoomActivityView +@implementation XPRoomActivityContainerView - (instancetype)initWithFrame:(CGRect)frame { diff --git a/xplan-ios/Main/Room/View/BaseUIView/XPRoomBackUIView.h b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.h similarity index 78% rename from xplan-ios/Main/Room/View/BaseUIView/XPRoomBackUIView.h rename to xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.h index a0f4a20d..77f43bfb 100644 --- a/xplan-ios/Main/Room/View/BaseUIView/XPRoomBackUIView.h +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPRoomBackUIView : UIView +@interface XPRoomBackContainerView : UIView @end diff --git a/xplan-ios/Main/Room/View/BaseUIView/XPRoomBackUIView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m similarity index 89% rename from xplan-ios/Main/Room/View/BaseUIView/XPRoomBackUIView.m rename to xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m index ff522073..5316ec91 100644 --- a/xplan-ios/Main/Room/View/BaseUIView/XPRoomBackUIView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m @@ -5,16 +5,16 @@ // Created by 冯硕 on 2021/10/11. // 最下面的View -#import "XPRoomBackUIView.h" +#import "XPRoomBackContainerView.h" ///Third #import -@interface XPRoomBackUIView () +@interface XPRoomBackContainerView () /// @property (nonatomic,strong) UIImageView *backImageView; @end -@implementation XPRoomBackUIView +@implementation XPRoomBackContainerView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; diff --git a/xplan-ios/Main/Room/Model/XPRoomMenuItem.h b/xplan-ios/Main/Room/View/MenuContainerView/Model/XPRoomMenuItem.h similarity index 100% rename from xplan-ios/Main/Room/Model/XPRoomMenuItem.h rename to xplan-ios/Main/Room/View/MenuContainerView/Model/XPRoomMenuItem.h diff --git a/xplan-ios/Main/Room/Model/XPRoomMenuItem.m b/xplan-ios/Main/Room/View/MenuContainerView/Model/XPRoomMenuItem.m similarity index 100% rename from xplan-ios/Main/Room/Model/XPRoomMenuItem.m rename to xplan-ios/Main/Room/View/MenuContainerView/Model/XPRoomMenuItem.m diff --git a/xplan-ios/Main/Room/View/MenuView/XPRoomBottomMenuView.h b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.h similarity index 79% rename from xplan-ios/Main/Room/View/MenuView/XPRoomBottomMenuView.h rename to xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.h index 9a7e772b..db692f59 100644 --- a/xplan-ios/Main/Room/View/MenuView/XPRoomBottomMenuView.h +++ b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPRoomBottomMenuView : UIView +@interface XPRoomMenuContainerView : UIView @end diff --git a/xplan-ios/Main/Room/View/MenuView/XPRoomBottomMenuView.m b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m similarity index 98% rename from xplan-ios/Main/Room/View/MenuView/XPRoomBottomMenuView.m rename to xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m index a3a6004b..8fcb7342 100644 --- a/xplan-ios/Main/Room/View/MenuView/XPRoomBottomMenuView.m +++ b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m @@ -5,13 +5,13 @@ // Created by 冯硕 on 2021/10/11. // -#import "XPRoomBottomMenuView.h" +#import "XPRoomMenuContainerView.h" ///Third #import ///Model #import "XPRoomMenuItem.h" -@interface XPRoomBottomMenuView () +@interface XPRoomMenuContainerView () /// @property (nonatomic,strong) UIStackView *stackView; ///输入框 @@ -33,7 +33,7 @@ @end -@implementation XPRoomBottomMenuView +@implementation XPRoomMenuContainerView - (instancetype)initWithFrame:(CGRect)frame { diff --git a/xplan-ios/Main/Room/View/MessageView/XPRoomMessageView.h b/xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.h similarity index 77% rename from xplan-ios/Main/Room/View/MessageView/XPRoomMessageView.h rename to xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.h index 8755d6d0..7a1b13f2 100644 --- a/xplan-ios/Main/Room/View/MessageView/XPRoomMessageView.h +++ b/xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface XPRoomMessageView : UIView +@interface XPRoomMessageContainerView : UIView @end diff --git a/xplan-ios/Main/Room/View/MessageView/XPRoomMessageView.m b/xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.m similarity index 83% rename from xplan-ios/Main/Room/View/MessageView/XPRoomMessageView.m rename to xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.m index b3811b19..61849406 100644 --- a/xplan-ios/Main/Room/View/MessageView/XPRoomMessageView.m +++ b/xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.m @@ -5,9 +5,9 @@ // Created by 冯硕 on 2021/10/11. // -#import "XPRoomMessageView.h" +#import "XPRoomMessageContainerView.h" -@implementation XPRoomMessageView +@implementation XPRoomMessageContainerView - (instancetype)initWithFrame:(CGRect)frame { diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionDataSourceImpl.h b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionDataSourceImpl.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionDataSourceImpl.h rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionDataSourceImpl.h diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionDataSourceImpl.m b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionDataSourceImpl.m similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionDataSourceImpl.m rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionDataSourceImpl.m diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionDataSourceProtocol.h b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionDataSourceProtocol.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionDataSourceProtocol.h rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionDataSourceProtocol.h diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionLayoutImpl.h b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionLayoutImpl.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionLayoutImpl.h rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionLayoutImpl.h diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionLayoutImpl.m b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionLayoutImpl.m similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionLayoutImpl.m rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionLayoutImpl.m diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionLayoutProtocol.h b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionLayoutProtocol.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/Object/XPRoomPositionLayoutProtocol.h rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/Object/XPRoomPositionLayoutProtocol.h diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/View/XCRoomPostionNickView.h b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XCRoomPostionNickView.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/View/XCRoomPostionNickView.h rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XCRoomPostionNickView.h diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/View/XCRoomPostionNickView.m b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XCRoomPostionNickView.m similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/View/XCRoomPostionNickView.m rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XCRoomPostionNickView.m diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/View/XPRoomPostionBaseItemView.h b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XPRoomPostionBaseItemView.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/View/XPRoomPostionBaseItemView.h rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XPRoomPostionBaseItemView.h diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/View/XPRoomPostionBaseItemView.m b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XPRoomPostionBaseItemView.m similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/View/XPRoomPostionBaseItemView.m rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/View/XPRoomPostionBaseItemView.m diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/XPRoomPositionView.h b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/XPRoomPositionView.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/XPRoomPositionView.h rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/XPRoomPositionView.h diff --git a/xplan-ios/Main/Room/View/PositionView/SubViews/XPRoomPositionView.m b/xplan-ios/Main/Room/View/PositionContainerView/PositionView/XPRoomPositionView.m similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/SubViews/XPRoomPositionView.m rename to xplan-ios/Main/Room/View/PositionContainerView/PositionView/XPRoomPositionView.m diff --git a/xplan-ios/Main/Room/View/PositionView/XPRoomPositionContainView.h b/xplan-ios/Main/Room/View/PositionContainerView/XPRoomPositionContainView.h similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/XPRoomPositionContainView.h rename to xplan-ios/Main/Room/View/PositionContainerView/XPRoomPositionContainView.h diff --git a/xplan-ios/Main/Room/View/PositionView/XPRoomPositionContainView.m b/xplan-ios/Main/Room/View/PositionContainerView/XPRoomPositionContainView.m similarity index 100% rename from xplan-ios/Main/Room/View/PositionView/XPRoomPositionContainView.m rename to xplan-ios/Main/Room/View/PositionContainerView/XPRoomPositionContainView.m diff --git a/xplan-ios/Main/Room/View/RoomInfoView/XPRoomInfoView.h b/xplan-ios/Main/Room/View/RoomInfoContainerView/XPRoomInfoContainerView.h similarity index 56% rename from xplan-ios/Main/Room/View/RoomInfoView/XPRoomInfoView.h rename to xplan-ios/Main/Room/View/RoomInfoContainerView/XPRoomInfoContainerView.h index 7c55742e..c78e519b 100644 --- a/xplan-ios/Main/Room/View/RoomInfoView/XPRoomInfoView.h +++ b/xplan-ios/Main/Room/View/RoomInfoContainerView/XPRoomInfoContainerView.h @@ -8,9 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomInfoView : UIView - +@class RoomInfoModel; +@interface XPRoomInfoContainerView : UIView +/// +@property (nonatomic,strong) RoomInfoModel *roomInfo; @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/View/RoomInfoView/XPRoomInfoView.m b/xplan-ios/Main/Room/View/RoomInfoContainerView/XPRoomInfoContainerView.m similarity index 94% rename from xplan-ios/Main/Room/View/RoomInfoView/XPRoomInfoView.m rename to xplan-ios/Main/Room/View/RoomInfoContainerView/XPRoomInfoContainerView.m index 7357455b..0a372419 100644 --- a/xplan-ios/Main/Room/View/RoomInfoView/XPRoomInfoView.m +++ b/xplan-ios/Main/Room/View/RoomInfoContainerView/XPRoomInfoContainerView.m @@ -5,7 +5,7 @@ // Created by 冯硕 on 2021/10/11. // -#import "XPRoomInfoView.h" +#import "XPRoomInfoContainerView.h" ///Third #import #import @@ -15,8 +15,10 @@ #import "UIButton+EnlargeTouchArea.h" #import "XPMacro.h" #import "ThemeColor.h" +///Model +#import "RoomInfoModel.h" -@interface XPRoomInfoView () +@interface XPRoomInfoContainerView () ///返回按钮 @property (nonatomic,strong) UIButton *backButton; ///容器 @@ -41,15 +43,13 @@ @property (nonatomic,strong) UIButton *settingButton; @end -@implementation XPRoomInfoView +@implementation XPRoomInfoContainerView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { [self initSubViews]; [self initSubViewConstraints]; -#warning to do 测试数据 - [self initMallocData]; } return self; } @@ -69,11 +69,6 @@ #pragma mark - Private Method -- (void)initMallocData { - self.titleLabel.text = @"这是房间标题"; - self.idLabel.text = @"这是在线人数1000 ID:100000"; -} - - (void)initSubViews { [self addSubview:self.backButton]; @@ -134,6 +129,14 @@ } #pragma mark - Getters And Setters +- (void)setRoomInfo:(RoomInfoModel *)roomInfo { + _roomInfo = roomInfo; + if (_roomInfo) { + self.titleLabel.text = _roomInfo.title; + self.idLabel.text = [NSString stringWithFormat:@"音游号:%ld %ld人在线", (long)_roomInfo.erbanNo, (long)(_roomInfo.onlineNum > 0 ? _roomInfo.onlineNum : 0)]; + } +} + - (UIButton *)backButton{ if (!_backButton) { _backButton = [[UIButton alloc] init]; diff --git a/xplan-ios/Main/Room/View/XPRoomModuleHelper.h b/xplan-ios/Main/Room/View/XPRoomModuleHelper.h new file mode 100644 index 00000000..b2c5176a --- /dev/null +++ b/xplan-ios/Main/Room/View/XPRoomModuleHelper.h @@ -0,0 +1,19 @@ +// +// XPRoomModuleHelper.h +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XPRoomModuleHelper : NSObject + ++ (instancetype)shareHelper; +///进入房间 +- (void)enterRoomVCWithRoomUid:(NSString *)roomUid viewController:(UIViewController *)viewController; +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/View/XPRoomModuleHelper.m b/xplan-ios/Main/Room/View/XPRoomModuleHelper.m new file mode 100644 index 00000000..cf852745 --- /dev/null +++ b/xplan-ios/Main/Room/View/XPRoomModuleHelper.m @@ -0,0 +1,83 @@ +// +// XPRoomModuleHelper.m +// xplan-ios +// +// Created by 冯硕 on 2021/10/18. +// + +#import "XPRoomModuleHelper.h" +#import +///Model +#import "RoomInfoModel.h" +///P +#import "XPRoomPresenter.h" +///VC +#import "XPRoomViewController.h" +#import "BaseNavigationController.h" + +@interface XPRoomModuleHelper () +///是否正在进房 +@property (nonatomic,assign) BOOL isEntering; +/// +@property (nonatomic,strong) XPRoomPresenter *roomPresenter; +@end + +@implementation XPRoomModuleHelper + ++ (instancetype)shareHelper { + static dispatch_once_t onceToken; + static XPRoomModuleHelper * helper; + dispatch_once(&onceToken, ^{ + helper = [[XPRoomModuleHelper alloc] init]; + }); + return helper; +} + + +- (void)enterRoomVCWithRoomUid:(NSString *)roomUid viewController:(nonnull UIViewController *)viewController{ + if (viewController == nil || roomUid <= 0) { + return; + } + @weakify(self); + [self.roomPresenter getRoomInfoWithUid:roomUid success:^(RoomInfoModel * _Nonnull roomInfo) { + roomInfo.valid = YES; + @strongify(self); + if (roomInfo.valid) { + self.isEntering = YES; + [self presenterRoomVCWithRoomInfo:roomInfo viewController:viewController]; + } else { +#warning to do - 如果房间无效的话 + } + }]; +} + +- (void)presenterRoomVCWithRoomInfo:(RoomInfoModel *)roomInfo viewController:(nonnull UIViewController *)viewController { + if (roomInfo == nil) { + return; + } + + if (self.isEntering) { +#warning to do - 显示toast + return; + } + +#warning to do - 还需完善 如果当前有房间的话 需要关闭当前的房间 然后进入需要进入的房间 + + XPRoomViewController * roomVC = [[XPRoomViewController alloc] init]; + roomVC.roomInfo = roomInfo; + BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; + nav.modalPresentationStyle = UIModalPresentationFullScreen; + [viewController presentViewController:nav animated:YES completion:^{ + self.isEntering = NO; + }]; +} + + +- (XPRoomPresenter *)roomPresenter { + if (!_roomPresenter) { + _roomPresenter = [[XPRoomPresenter alloc] init]; + } + return _roomPresenter; +} + +@end diff --git a/xplan-ios/Main/Room/XPRoomViewController.h b/xplan-ios/Main/Room/View/XPRoomViewController.h similarity index 70% rename from xplan-ios/Main/Room/XPRoomViewController.h rename to xplan-ios/Main/Room/View/XPRoomViewController.h index 783f5dc4..9aecd4f1 100644 --- a/xplan-ios/Main/Room/XPRoomViewController.h +++ b/xplan-ios/Main/Room/View/XPRoomViewController.h @@ -8,9 +8,12 @@ #import "MvpViewController.h" NS_ASSUME_NONNULL_BEGIN - +@class RoomInfoModel; @interface XPRoomViewController : MvpViewController +///房间信息 +@property (nonatomic,strong) RoomInfoModel *roomInfo; + @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/View/XPRoomViewController.m b/xplan-ios/Main/Room/View/XPRoomViewController.m new file mode 100644 index 00000000..55d47ae7 --- /dev/null +++ b/xplan-ios/Main/Room/View/XPRoomViewController.m @@ -0,0 +1,146 @@ +// +// XPRoomViewController.m +// xplan-ios +// +// Created by 冯硕 on 2021/10/11. +// + +#import "XPRoomViewController.h" +///Third +#import +///Tool +#import "XPMacro.h" +///Model +#import "RoomInfoModel.h" +///View +#import "XPRoomActivityContainerView.h" +#import "XPRoomBackContainerView.h" +#import "XPRoomMenuContainerView.h" +#import "XPRoomMessageContainerView.h" +#import "XPRoomPositionContainView.h" +#import "XPRoomInfoContainerView.h" + +@interface XPRoomViewController () +///背景 +@property (nonatomic,strong) XPRoomBackContainerView *backContainerView; +///房间信息 +@property (nonatomic,strong) XPRoomInfoContainerView *roomInfoContainerView; +///坑位信息 +@property (nonatomic,strong) XPRoomPositionContainView *positionContainerView; +///公屏 +@property (nonatomic,strong) XPRoomMessageContainerView *messageContainerView; +///底部操作栏 +@property (nonatomic,strong) XPRoomMenuContainerView *menuContainerView; +///活动 +@property (nonatomic,strong) XPRoomActivityContainerView *activityContainerView; +@end + +@implementation XPRoomViewController + +- (BOOL)isHiddenNavBar { + return YES; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + [self initSubViews]; + [self initSubViewConstraints]; +} + +#pragma mark - Private Method +- (void)initSubViews { + [self.view addSubview:self.backContainerView]; + [self.view addSubview:self.roomInfoContainerView]; + [self.view addSubview:self.positionContainerView]; + [self.view addSubview:self.messageContainerView]; + [self.view addSubview:self.menuContainerView]; + [self.view addSubview:self.activityContainerView]; +} + +- (void)initSubViewConstraints { + [self.backContainerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self.view); + }]; + + [self.roomInfoContainerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.top.mas_equalTo(self.view); + make.height.mas_equalTo(kNavigationHeight); + }]; + + [self.positionContainerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.mas_equalTo(self.view); + make.top.mas_equalTo(self.roomInfoContainerView.mas_bottom); + make.height.mas_equalTo([self.positionContainerView positionContainerViewHeight]); + }]; + + [self.messageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(self.positionContainerView.mas_bottom); + make.bottom.equalTo(self.menuContainerView.mas_top).offset(-5); + make.left.equalTo(self.view); + make.right.equalTo(self.activityContainerView.mas_left).offset(-10); + }]; + + [self.menuContainerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.mas_equalTo(self.view); + make.bottom.mas_equalTo(-kSafeAreaBottomHeight- 8); + make.height.mas_equalTo(40); + }]; + + [self.activityContainerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.messageContainerView); + make.right.mas_equalTo(self.view); + make.bottom.mas_equalTo(self.menuContainerView.mas_top).offset(-5); + make.width.mas_equalTo(80); + }]; +} + + +#pragma mark - Getters And Setters +- (void)setRoomInfo:(RoomInfoModel *)roomInfo { + _roomInfo = roomInfo; + self.roomInfoContainerView.roomInfo = _roomInfo; +} + +- (XPRoomBackContainerView *)backContainerView { + if (!_backContainerView) { + _backContainerView = [[XPRoomBackContainerView alloc] init]; + } + return _backContainerView; +} + +- (XPRoomInfoContainerView *)roomInfoContainerView { + if (!_roomInfoContainerView) { + _roomInfoContainerView = [[XPRoomInfoContainerView alloc] init]; + } + return _roomInfoContainerView; +} + +- (XPRoomPositionContainView *)positionContainerView { + if (!_positionContainerView) { + _positionContainerView = [[XPRoomPositionContainView alloc] init]; + } + return _positionContainerView; +} + +- (XPRoomMessageContainerView *)messageContainerView { + if (!_messageContainerView) { + _messageContainerView = [[XPRoomMessageContainerView alloc] init]; + } + return _messageContainerView; +} + +- (XPRoomMenuContainerView *)menuContainerView { + if (!_menuContainerView) { + _menuContainerView = [[XPRoomMenuContainerView alloc] init]; + } + return _menuContainerView; +} + +- (XPRoomActivityContainerView *)activityContainerView { + if (!_activityContainerView) { + _activityContainerView = [[XPRoomActivityContainerView alloc] init]; + } + return _activityContainerView; +} + +@end diff --git a/xplan-ios/Main/Room/XPRoomViewController.m b/xplan-ios/Main/Room/XPRoomViewController.m deleted file mode 100644 index e287980f..00000000 --- a/xplan-ios/Main/Room/XPRoomViewController.m +++ /dev/null @@ -1,140 +0,0 @@ -// -// XPRoomViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/11. -// - -#import "XPRoomViewController.h" -///Third -#import -///Tool -#import "XPMacro.h" -///Manager -#import "XPRoomBackUIManager.h" -#import "XPRoomInfoManager.h" -#import "XPRoomPositionManager.h" -#import "XPRoomMessageManager.h" -#import "XPRoomMenuManager.h" -#import "XPRoomActivityManager.h" - -@interface XPRoomViewController () -///背景 -@property (nonatomic,strong) XPRoomBackUIManager *backManager; -///房间信息 -@property (nonatomic,strong) XPRoomInfoManager *infoManager; -///坑位信息 -@property (nonatomic,strong) XPRoomPositionManager *positionManager; -///公屏 -@property (nonatomic,strong) XPRoomMessageManager *messageManager; -///底部操作栏 -@property (nonatomic,strong) XPRoomMenuManager *menuManager; -///活动 -@property (nonatomic,strong) XPRoomActivityManager *activityManager; -@end - -@implementation XPRoomViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.backManager.containerView]; - [self.view addSubview:self.infoManager.containerView]; - [self.view addSubview:self.positionManager.containerView]; - [self.view addSubview:self.messageManager.containerView]; - [self.view addSubview:self.menuManager.containerView]; - [self.view addSubview:self.activityManager.containerView]; -} - -- (void)initSubViewConstraints { - [self.backManager.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self.infoManager.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.positionManager.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); - make.top.mas_equalTo(self.infoManager.containerView.mas_bottom); - make.height.mas_equalTo([self.positionManager getContainerViewHeight]); - }]; - - [self.messageManager.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.positionManager.containerView.mas_bottom); - make.bottom.equalTo(self.menuManager.containerView.mas_top).offset(-5); - make.left.equalTo(self.view); - make.right.equalTo(self.activityManager.containerView.mas_left).offset(-10); - }]; - - [self.menuManager.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); - make.bottom.mas_equalTo(-kSafeAreaBottomHeight- 8); - make.height.mas_equalTo(40); - }]; - - [self.activityManager.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.messageManager.containerView); - make.right.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.menuManager.containerView.mas_top).offset(-5); - make.width.mas_equalTo(80); - }]; - -} - - -#pragma mark - Getters And Setters -- (XPRoomBackUIManager *)backManager { - if (!_backManager) { - _backManager = [[XPRoomBackUIManager alloc] init]; - } - return _backManager; -} - -- (XPRoomInfoManager *)infoManager { - if (!_infoManager) { - _infoManager = [[XPRoomInfoManager alloc] init]; - } - return _infoManager; -} - -- (XPRoomPositionManager *)positionManager { - if (!_positionManager) { - _positionManager = [[XPRoomPositionManager alloc] init]; - } - return _positionManager; -} - -- (XPRoomMessageManager *)messageManager { - if (!_messageManager) { - _messageManager = [[XPRoomMessageManager alloc] init]; - } - return _messageManager; -} - -- (XPRoomMenuManager *)menuManager { - if (!_menuManager) { - _menuManager = [[XPRoomMenuManager alloc] init]; - } - return _menuManager; -} - -- (XPRoomActivityManager *)activityManager { - if (!_activityManager) { - _activityManager = [[XPRoomActivityManager alloc] init]; - } - return _activityManager; -} - -@end