主播收入
This commit is contained in:
liyuhua
@@ -312,6 +312,8 @@
|
||||
23C9DFC32B84807A00B51558 /* PIRoomActivityClickView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFC22B84807A00B51558 /* PIRoomActivityClickView.m */; };
|
||||
23C9DFC62B84903500B51558 /* PIRoomActivityChoosePlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFC52B84903500B51558 /* PIRoomActivityChoosePlayView.m */; };
|
||||
23C9DFC92B84917B00B51558 /* PIRoomActivityChoosePlayCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFC82B84917B00B51558 /* PIRoomActivityChoosePlayCell.m */; };
|
||||
23C9DFCC2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFCB2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m */; };
|
||||
23C9DFCF2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFCE2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m */; };
|
||||
23CEFB6C2AFB803B00576D89 /* PISwitchingEnvironmentVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */; };
|
||||
23CEFC4A2AFB8FC100576D89 /* BSNSStringUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0C2AFB8FC100576D89 /* BSNSStringUtil.m */; };
|
||||
23CEFC4B2AFB8FC100576D89 /* BSUIDemoUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0D2AFB8FC100576D89 /* BSUIDemoUtil.m */; };
|
||||
@@ -501,8 +503,6 @@
|
||||
9BA8A47727C60DF7000365A3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BA8A47627C60DF7000365A3 /* AVFoundation.framework */; };
|
||||
9BAA5FED277A1BBE007453F3 /* XPPrivacyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */; };
|
||||
9BAA5FF0277A23F4007453F3 /* XPPermissionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */; };
|
||||
9BAC92EE28E6989400147DD8 /* XPRoomActivityPlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAC92ED28E6989400147DD8 /* XPRoomActivityPlayView.m */; };
|
||||
9BAC92F228E6A05600147DD8 /* XPRoomActivityPlayModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAC92F128E6A05600147DD8 /* XPRoomActivityPlayModel.m */; };
|
||||
9BAC92F528E6E63000147DD8 /* XPRoomInsideOperationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAC92F428E6E63000147DD8 /* XPRoomInsideOperationCell.m */; };
|
||||
9BB89DC327FE7F3A00586A83 /* XPAnchorFansRelationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BB89DC227FE7F3A00586A83 /* XPAnchorFansRelationModel.m */; };
|
||||
9BB89DC627FEB9E100586A83 /* XPAnchorFansTaskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BB89DC527FEB9E100586A83 /* XPAnchorFansTaskViewController.m */; };
|
||||
@@ -1265,9 +1265,6 @@
|
||||
E89DCF5D2900E5EE001647EC /* WishGiftHistoryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DCF5C2900E5EE001647EC /* WishGiftHistoryModel.m */; };
|
||||
E89DCF602900F4FB001647EC /* XPWishGiftEnterView.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DCF5F2900F4FB001647EC /* XPWishGiftEnterView.m */; };
|
||||
E8A03DFF27635F960098D9EA /* XPRoomCandyGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A03DFE27635F960098D9EA /* XPRoomCandyGiftView.m */; };
|
||||
E8A1F794290642500099C952 /* XPRoomMorePlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A1F793290642500099C952 /* XPRoomMorePlayViewController.m */; };
|
||||
E8A1F7972906426B0099C952 /* XPRoomMorePlayPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A1F7962906426B0099C952 /* XPRoomMorePlayPresenter.m */; };
|
||||
E8A1F79C290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A1F79B290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.m */; };
|
||||
E8A30BE328534A28003B4873 /* XPSessionFindNewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BE228534A28003B4873 /* XPSessionFindNewViewController.m */; };
|
||||
E8A30BE828534A63003B4873 /* XPSessionFindNewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BE728534A63003B4873 /* XPSessionFindNewTableViewCell.m */; };
|
||||
E8A30BEB28534A96003B4873 /* XPSessionFindNewFiltrateView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BEA28534A96003B4873 /* XPSessionFindNewFiltrateView.m */; };
|
||||
@@ -2090,6 +2087,10 @@
|
||||
23C9DFC52B84903500B51558 /* PIRoomActivityChoosePlayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityChoosePlayView.m; sourceTree = "<group>"; };
|
||||
23C9DFC72B84917B00B51558 /* PIRoomActivityChoosePlayCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityChoosePlayCell.h; sourceTree = "<group>"; };
|
||||
23C9DFC82B84917B00B51558 /* PIRoomActivityChoosePlayCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityChoosePlayCell.m; sourceTree = "<group>"; };
|
||||
23C9DFCA2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGuildAnchorIncomeSectionView.h; sourceTree = "<group>"; };
|
||||
23C9DFCB2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGuildAnchorIncomeSectionView.m; sourceTree = "<group>"; };
|
||||
23C9DFCD2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGuildSingleRoomIncomeCell.h; sourceTree = "<group>"; };
|
||||
23C9DFCE2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGuildSingleRoomIncomeCell.m; sourceTree = "<group>"; };
|
||||
23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PISwitchingEnvironmentVC.h; sourceTree = "<group>"; };
|
||||
23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PISwitchingEnvironmentVC.m; sourceTree = "<group>"; };
|
||||
23CEFC0B2AFB8FC100576D89 /* BSXWDateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSXWDateUtil.h; sourceTree = "<group>"; };
|
||||
@@ -2449,10 +2450,6 @@
|
||||
9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPrivacyViewController.m; sourceTree = "<group>"; };
|
||||
9BAA5FEE277A23F4007453F3 /* XPPermissionsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPermissionsViewController.h; sourceTree = "<group>"; };
|
||||
9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPermissionsViewController.m; sourceTree = "<group>"; };
|
||||
9BAC92EC28E6989400147DD8 /* XPRoomActivityPlayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomActivityPlayView.h; sourceTree = "<group>"; };
|
||||
9BAC92ED28E6989400147DD8 /* XPRoomActivityPlayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityPlayView.m; sourceTree = "<group>"; };
|
||||
9BAC92F028E6A05600147DD8 /* XPRoomActivityPlayModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomActivityPlayModel.h; sourceTree = "<group>"; };
|
||||
9BAC92F128E6A05600147DD8 /* XPRoomActivityPlayModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityPlayModel.m; sourceTree = "<group>"; };
|
||||
9BAC92F328E6E63000147DD8 /* XPRoomInsideOperationCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInsideOperationCell.h; sourceTree = "<group>"; };
|
||||
9BAC92F428E6E63000147DD8 /* XPRoomInsideOperationCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInsideOperationCell.m; sourceTree = "<group>"; };
|
||||
9BAD41AD28C6ECBA005E47B3 /* XPInRoomRecordProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPInRoomRecordProtocol.h; sourceTree = "<group>"; };
|
||||
@@ -3852,13 +3849,6 @@
|
||||
E89DCF5F2900F4FB001647EC /* XPWishGiftEnterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPWishGiftEnterView.m; sourceTree = "<group>"; };
|
||||
E8A03DFD27635F960098D9EA /* XPRoomCandyGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomCandyGiftView.h; sourceTree = "<group>"; };
|
||||
E8A03DFE27635F960098D9EA /* XPRoomCandyGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomCandyGiftView.m; sourceTree = "<group>"; };
|
||||
E8A1F792290642500099C952 /* XPRoomMorePlayViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMorePlayViewController.h; sourceTree = "<group>"; };
|
||||
E8A1F793290642500099C952 /* XPRoomMorePlayViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMorePlayViewController.m; sourceTree = "<group>"; };
|
||||
E8A1F7952906426B0099C952 /* XPRoomMorePlayPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMorePlayPresenter.h; sourceTree = "<group>"; };
|
||||
E8A1F7962906426B0099C952 /* XPRoomMorePlayPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMorePlayPresenter.m; sourceTree = "<group>"; };
|
||||
E8A1F7982906427D0099C952 /* XPRoomMorePlayProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMorePlayProtocol.h; sourceTree = "<group>"; };
|
||||
E8A1F79A290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMorePlayCollectionViewCell.h; sourceTree = "<group>"; };
|
||||
E8A1F79B290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMorePlayCollectionViewCell.m; sourceTree = "<group>"; };
|
||||
E8A30BE128534A28003B4873 /* XPSessionFindNewViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewViewController.h; sourceTree = "<group>"; };
|
||||
E8A30BE228534A28003B4873 /* XPSessionFindNewViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewViewController.m; sourceTree = "<group>"; };
|
||||
E8A30BE628534A63003B4873 /* XPSessionFindNewTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewTableViewCell.h; sourceTree = "<group>"; };
|
||||
@@ -8172,6 +8162,8 @@
|
||||
E85E7AB82A4EB0D200B6D00A /* XPGoldIncomeSectionView.m */,
|
||||
E85E7AB02A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.h */,
|
||||
E85E7ABC2A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.m */,
|
||||
23C9DFCA2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.h */,
|
||||
23C9DFCB2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m */,
|
||||
E85E7AA52A4EB0D200B6D00A /* XPGuildHeaderView.h */,
|
||||
E85E7AB22A4EB0D200B6D00A /* XPGuildHeaderView.m */,
|
||||
E85E7AA92A4EB0D200B6D00A /* XPGuildIncomeHeaderView.h */,
|
||||
@@ -8263,6 +8255,8 @@
|
||||
E85E7AD72A4EB0D200B6D00A /* XPGuildPersonIncomeTableViewCell.m */,
|
||||
E85E7AD92A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.h */,
|
||||
E85E7AD52A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m */,
|
||||
23C9DFCD2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.h */,
|
||||
23C9DFCE2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m */,
|
||||
);
|
||||
path = Income;
|
||||
sourceTree = "<group>";
|
||||
@@ -9403,62 +9397,6 @@
|
||||
path = Resources;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E8A1F78D290641D80099C952 /* MorePlay */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
E8A1F791290642040099C952 /* Model */,
|
||||
E8A1F790290641FB0099C952 /* View */,
|
||||
E8A1F78F290641EB0099C952 /* Presenter */,
|
||||
E8A1F78E290641E50099C952 /* Protocol */,
|
||||
);
|
||||
path = MorePlay;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E8A1F78E290641E50099C952 /* Protocol */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
E8A1F7982906427D0099C952 /* XPRoomMorePlayProtocol.h */,
|
||||
);
|
||||
path = Protocol;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E8A1F78F290641EB0099C952 /* Presenter */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
E8A1F7952906426B0099C952 /* XPRoomMorePlayPresenter.h */,
|
||||
E8A1F7962906426B0099C952 /* XPRoomMorePlayPresenter.m */,
|
||||
);
|
||||
path = Presenter;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E8A1F790290641FB0099C952 /* View */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
E8A1F799290644C20099C952 /* Cell */,
|
||||
E8A1F792290642500099C952 /* XPRoomMorePlayViewController.h */,
|
||||
E8A1F793290642500099C952 /* XPRoomMorePlayViewController.m */,
|
||||
);
|
||||
path = View;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E8A1F791290642040099C952 /* Model */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
9BAC92F028E6A05600147DD8 /* XPRoomActivityPlayModel.h */,
|
||||
9BAC92F128E6A05600147DD8 /* XPRoomActivityPlayModel.m */,
|
||||
);
|
||||
path = Model;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E8A1F799290644C20099C952 /* Cell */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
E8A1F79A290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.h */,
|
||||
E8A1F79B290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.m */,
|
||||
);
|
||||
path = Cell;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E8A30BDB28534667003B4873 /* FindNew */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@@ -9690,7 +9628,6 @@
|
||||
E8AEAEE927141ACC0017FCE0 /* MenuContainerView */,
|
||||
E8AEAEE627141ACC0017FCE0 /* MessageContainerView */,
|
||||
186F8B472733F2AE007A17BC /* MicroQueueProtocol.h */,
|
||||
E8A1F78D290641D80099C952 /* MorePlay */,
|
||||
E8DEC9962764A51F0078CB70 /* MoreView */,
|
||||
9B9BBF80288FBF93004E2E74 /* NewUserGift */,
|
||||
E87AE8C2284E1A6B00CAFBB3 /* NewUserGreet */,
|
||||
@@ -9736,8 +9673,6 @@
|
||||
23C9DFC52B84903500B51558 /* PIRoomActivityChoosePlayView.m */,
|
||||
23C9DFC72B84917B00B51558 /* PIRoomActivityChoosePlayCell.h */,
|
||||
23C9DFC82B84917B00B51558 /* PIRoomActivityChoosePlayCell.m */,
|
||||
9BAC92EC28E6989400147DD8 /* XPRoomActivityPlayView.h */,
|
||||
9BAC92ED28E6989400147DD8 /* XPRoomActivityPlayView.m */,
|
||||
235A45182B04A352009753F5 /* PIRoomActivityWebView.h */,
|
||||
235A45192B04A352009753F5 /* PIRoomActivityWebView.m */,
|
||||
235A451B2B04A452009753F5 /* PIRoomActivityWebCell.h */,
|
||||
@@ -10899,6 +10834,7 @@
|
||||
E87C0AA027D9DE6400CB2241 /* RoomFaceSendInfoModel.m in Sources */,
|
||||
1464C5F629A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m in Sources */,
|
||||
E8751E6328A646400056EF44 /* XPSailingRankView.m in Sources */,
|
||||
23C9DFCC2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m in Sources */,
|
||||
9BD9A18027A0EFC7004186FE /* XPMineVisitorTableViewCell.m in Sources */,
|
||||
233423D02AAEFBC300B1253F /* PICandyTreeSetModel.m in Sources */,
|
||||
E85E7B112A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m in Sources */,
|
||||
@@ -11004,7 +10940,6 @@
|
||||
E80E900C27E0358900434B90 /* XPRoomTopicAlertView.m in Sources */,
|
||||
9BDA3E7A27FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.m in Sources */,
|
||||
E81C279826EB3AC40031E639 /* LoginForgetPasswordProtocol.h in Sources */,
|
||||
9BAC92F228E6A05600147DD8 /* XPRoomActivityPlayModel.m in Sources */,
|
||||
9BD8D4E328911E9900AE03FF /* XPMineCollectRoomListViewController.m in Sources */,
|
||||
2331C1732A5EB71000E1D940 /* XPNoblePrivilegeCell.m in Sources */,
|
||||
9B2EA7C628041EFC00ED17BF /* XPAnchorPkPanelView.m in Sources */,
|
||||
@@ -11067,7 +11002,6 @@
|
||||
9BD9A17927A0EC57004186FE /* XPMineVisitorPresenter.m in Sources */,
|
||||
E8BD0F8828A9E9E400DE050D /* RoomSailingPrizeModel.m in Sources */,
|
||||
238B37B32AC55A2C00BFC9D5 /* XPTreasureFairyPrizeRecordCell.m in Sources */,
|
||||
E8A1F79C290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.m in Sources */,
|
||||
23CEFC512AFB8FC100576D89 /* SystemUtil.m in Sources */,
|
||||
E8659909273E800D00EE349D /* XPGiftCollectionViewFlowLayout.m in Sources */,
|
||||
238B37BD2AC55A2C00BFC9D5 /* XPTreasureFairyTrialsContentView.m in Sources */,
|
||||
@@ -11149,6 +11083,7 @@
|
||||
189DD53426DE255300AB55B1 /* TabbarViewController.m in Sources */,
|
||||
23C9DFC92B84917B00B51558 /* PIRoomActivityChoosePlayCell.m in Sources */,
|
||||
9BA3B40B293DCDFD0071DF1C /* XPVersionUpdateModel.m in Sources */,
|
||||
23C9DFCF2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m in Sources */,
|
||||
18EE401A2754BA9F00A452BF /* NIMMessageMaker.m in Sources */,
|
||||
E8EEB91D26FC9D58007C6EBA /* XPMineUserInfoDateView.m in Sources */,
|
||||
E82325E9274CE56A003A3332 /* XPShareItem.m in Sources */,
|
||||
@@ -11352,7 +11287,6 @@
|
||||
9B0E1C5926E77022005D4442 /* BaseNavigationController.m in Sources */,
|
||||
E8664ED927E4355C000171BA /* XPRoomPKRecordTableViewCell.m in Sources */,
|
||||
238B37AB2AC55A2C00BFC9D5 /* TreasureFairyConvertRecordModel.m in Sources */,
|
||||
E8A1F794290642500099C952 /* XPRoomMorePlayViewController.m in Sources */,
|
||||
23FF42762AA6E1480055733C /* XPHomeRecommendOtherRoomView.m in Sources */,
|
||||
142721B229A7647F00C7C423 /* XPBlankViewController.m in Sources */,
|
||||
E85E7B6B2A4EC39400B6D00A /* XPMineExchangeAuthorityModel.m in Sources */,
|
||||
@@ -11366,7 +11300,6 @@
|
||||
2305EF0D2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.m in Sources */,
|
||||
E84BF7DD277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m in Sources */,
|
||||
E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */,
|
||||
9BAC92EE28E6989400147DD8 /* XPRoomActivityPlayView.m in Sources */,
|
||||
1427213429A75A2600C7C423 /* XPMonentsLatestPresenter.m in Sources */,
|
||||
E83ABEFD280EB5E200322EE4 /* ContentOpenLiveInfoModel.m in Sources */,
|
||||
E85E7BAF2A4EC99300B6D00A /* XPMineChooseGiveDiamondVC.m in Sources */,
|
||||
@@ -11400,7 +11333,6 @@
|
||||
E82325F2274E2DE6003A3332 /* XPUserCardViewController.m in Sources */,
|
||||
E85E7B512A4EB0D300B6D00A /* Api+Guild.m in Sources */,
|
||||
E83645682A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.m in Sources */,
|
||||
E8A1F7972906426B0099C952 /* XPRoomMorePlayPresenter.m in Sources */,
|
||||
E8F65C222869A36F009BB5B9 /* ContentShareMonentsModel.m in Sources */,
|
||||
9B6E856E281AABAB0041A321 /* XPRoomRecommendModel.m in Sources */,
|
||||
E84A2E992A52817E00D6AF8A /* XPIncomeRecordView.m in Sources */,
|
||||
|
||||
@@ -51,6 +51,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@property (nonatomic,copy) NSString *anchorDiamondNum;
|
||||
///房间收入
|
||||
@property (nonatomic,copy) NSString *roomDiamondNum;
|
||||
|
||||
@property(nonatomic,assign) NSInteger timeDuration;
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
//
|
||||
// PIGuildSingleRoomIncomeCell.h
|
||||
// YuMi
|
||||
//
|
||||
// Created by duoban on 2024/2/21.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
#import "GuildPersonIncomeRecordModel.h"
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface PIGuildSingleRoomIncomeCell : UITableViewCell
|
||||
@property (nonatomic,strong) GuildPersonIncomeUserInfoModel *userInfo;
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -0,0 +1,162 @@
|
||||
//
|
||||
// PIGuildSingleRoomIncomeCell.m
|
||||
// YuMi
|
||||
//
|
||||
// Created by duoban on 2024/2/21.
|
||||
//
|
||||
|
||||
#import "PIGuildSingleRoomIncomeCell.h"
|
||||
@interface PIGuildSingleRoomIncomeCell()
|
||||
@property(nonatomic,strong) NetImageView *headView;
|
||||
@property(nonatomic,strong) UILabel *nameView;
|
||||
@property(nonatomic,strong) UILabel *numberView;
|
||||
@property(nonatomic,strong) UILabel *anchorNumView;
|
||||
@property(nonatomic,strong) UILabel *roomNumView;
|
||||
@property(nonatomic,strong) UILabel *timeView;
|
||||
@property(nonatomic,strong) UIView *lineView;
|
||||
@end
|
||||
@implementation PIGuildSingleRoomIncomeCell
|
||||
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
|
||||
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
|
||||
if(self){
|
||||
[self installUI];
|
||||
[self installConstraints];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
-(void)installUI{
|
||||
self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor];
|
||||
self.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
[self.contentView addSubview:self.headView];
|
||||
[self.contentView addSubview:self.nameView];
|
||||
[self.contentView addSubview:self.numberView];
|
||||
[self.contentView addSubview:self.anchorNumView];
|
||||
[self.contentView addSubview:self.roomNumView];
|
||||
[self.contentView addSubview:self.timeView];
|
||||
[self.contentView addSubview:self.lineView];
|
||||
}
|
||||
-(void)installConstraints{
|
||||
[self.headView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.height.mas_equalTo(kGetScaleWidth(44));
|
||||
make.leading.mas_equalTo(kGetScaleWidth(17));
|
||||
make.centerY.equalTo(self.contentView);
|
||||
|
||||
}];
|
||||
CGFloat width = kGetScaleWidth(242) / 3;
|
||||
[self.timeView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.trailing.mas_equalTo(0);
|
||||
make.width.mas_equalTo(width);
|
||||
make.centerY.equalTo(self.contentView);
|
||||
}];
|
||||
[self.roomNumView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.mas_equalTo(width);
|
||||
make.centerY.equalTo(self.contentView);
|
||||
make.trailing.equalTo(self.timeView.mas_leading).mas_offset(0);
|
||||
}];
|
||||
[self.anchorNumView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.mas_equalTo(width);
|
||||
make.centerY.equalTo(self.contentView);
|
||||
make.trailing.equalTo(self.roomNumView.mas_leading).mas_offset(0);
|
||||
}];
|
||||
[self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.equalTo(self.headView.mas_top).mas_offset(kGetScaleWidth(4));
|
||||
make.leading.equalTo(self.headView.mas_trailing).mas_offset(kGetScaleWidth(6));
|
||||
make.trailing.equalTo(self.anchorNumView.mas_leading).mas_offset((0));
|
||||
make.height.mas_equalTo(kGetScaleWidth(20));
|
||||
}];
|
||||
[self.numberView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.equalTo(self.nameView.mas_bottom).mas_offset(kGetScaleWidth(0));
|
||||
make.leading.equalTo(self.nameView);
|
||||
make.trailing.equalTo(self.nameView);
|
||||
}];
|
||||
}
|
||||
- (void)setUserInfo:(GuildPersonIncomeUserInfoModel *)userInfo {
|
||||
_userInfo = userInfo;
|
||||
if (_userInfo) {
|
||||
self.headView.image = nil;
|
||||
[self.headView loadImageWithUrl:_userInfo.avatar completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
|
||||
self.headView.image = image;
|
||||
}];
|
||||
|
||||
self.nameView.text = _userInfo.nick;
|
||||
self.numberView.text = [NSString stringWithFormat:@"ID:%@",_userInfo.erbanNo];
|
||||
self.anchorNumView.text = _userInfo.anchorDiamondNum;
|
||||
self.roomNumView.text = _userInfo.roomDiamondNum;
|
||||
if(_userInfo.timeDuration < 60){
|
||||
self.timeView.text = [NSString stringWithFormat:@"%ldmin",_userInfo.timeDuration];
|
||||
}else if(_userInfo.timeDuration == 60){
|
||||
self.timeView.text = [NSString stringWithFormat:@"1h"];
|
||||
}else{
|
||||
NSInteger h = _userInfo.timeDuration / 60;
|
||||
NSInteger min = _userInfo.timeDuration % 60;
|
||||
self.timeView.text = [NSString stringWithFormat:@"%ldh%ldmin",h,min];
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#pragma mark - 懒加载
|
||||
- (NetImageView *)headView{
|
||||
if(!_headView){
|
||||
NetImageConfig *config = [NetImageConfig new];
|
||||
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
|
||||
_headView = [[NetImageView alloc]initWithConfig:config];
|
||||
_headView.layer.cornerRadius = kGetScaleWidth(44)/2;
|
||||
_headView.layer.masksToBounds = YES;
|
||||
}
|
||||
return _headView;
|
||||
}
|
||||
- (UILabel *)nameView{
|
||||
if(!_nameView){
|
||||
_nameView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)];
|
||||
}
|
||||
return _nameView;
|
||||
}
|
||||
- (UILabel *)numberView{
|
||||
if(!_numberView){
|
||||
_numberView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:11 weight:UIFontWeightRegular] textColor:UIColorFromRGB(0x8A8CAB)];
|
||||
}
|
||||
return _numberView;
|
||||
}
|
||||
- (UILabel *)anchorNumView{
|
||||
if(!_anchorNumView){
|
||||
_anchorNumView = [UILabel labelInitWithText:@"0" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)];
|
||||
_anchorNumView.textAlignment = NSTextAlignmentCenter;
|
||||
_anchorNumView.numberOfLines = 2;
|
||||
}
|
||||
return _anchorNumView;
|
||||
}
|
||||
- (UILabel *)roomNumView{
|
||||
if(!_roomNumView){
|
||||
_roomNumView = [UILabel labelInitWithText:@"0" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)];
|
||||
_roomNumView.textAlignment = NSTextAlignmentCenter;
|
||||
_roomNumView.numberOfLines = 2;
|
||||
}
|
||||
return _roomNumView;
|
||||
}
|
||||
- (UILabel *)timeView{
|
||||
if(!_timeView){
|
||||
_timeView = [UILabel labelInitWithText:@"0h0min" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)];
|
||||
_timeView.textAlignment = NSTextAlignmentCenter;
|
||||
_timeView.numberOfLines = 2;
|
||||
}
|
||||
return _timeView;
|
||||
}
|
||||
- (UIView *)lineView{
|
||||
if(!_lineView){
|
||||
_lineView = [UIView new];
|
||||
_lineView.backgroundColor = UIColorFromRGB(0xF1F2F2);
|
||||
}
|
||||
return _lineView;
|
||||
}
|
||||
- (void)awakeFromNib {
|
||||
[super awakeFromNib];
|
||||
// Initialization code
|
||||
}
|
||||
|
||||
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
|
||||
[super setSelected:selected animated:animated];
|
||||
|
||||
// Configure the view for the selected state
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -32,6 +32,8 @@
|
||||
///P
|
||||
#import "XPGuildIncomePresenter.h"
|
||||
#import "XPGuildIncomeProtocol.h"
|
||||
#import "PIGuildAnchorIncomeSectionView.h"
|
||||
#import "PIGuildSingleRoomIncomeCell.h"
|
||||
@interface XPMineGuildIncomeRecordViewController ()<UITableViewDelegate, UITableViewDataSource, XPGuildIncomeProtocol, XPGuildIncomeHeaderViewDelegate, XPGuildTimePickViewDelegate, XPGuildTimeMonthPickerViewDelegate>
|
||||
///列表
|
||||
@property (nonatomic,strong) UITableView *tableView;
|
||||
@@ -168,6 +170,9 @@
|
||||
}
|
||||
|
||||
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
if(self.incomeType == GuildIncomeType_Anchor){
|
||||
return self.datasource.count > 0 ? kGetScaleWidth(75) : 400;
|
||||
}
|
||||
return self.datasource.count > 0 ? kGetScaleWidth(71) : 400;
|
||||
}
|
||||
|
||||
@@ -189,13 +194,8 @@
|
||||
cell.userInfo = [self.datasource safeObjectAtIndex1:indexPath.row];
|
||||
return cell;
|
||||
} else if(self.incomeType == GuildIncomeType_Anchor) {
|
||||
XPGuildSingleRoomIncomeTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])];
|
||||
if (cell == nil) {
|
||||
cell = [[XPGuildSingleRoomIncomeTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])];
|
||||
}
|
||||
|
||||
PIGuildSingleRoomIncomeCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PIGuildSingleRoomIncomeCell class])];
|
||||
cell.userInfo = [self.datasource safeObjectAtIndex1:indexPath.row];
|
||||
cell.rankNumber = indexPath.row;
|
||||
return cell;
|
||||
}
|
||||
}
|
||||
@@ -217,7 +217,7 @@
|
||||
sectionView.incomeType = self.incomeType;
|
||||
return sectionView;
|
||||
} else {
|
||||
XPGuildAnchorIncomeSectionView * sectionView = [[XPGuildAnchorIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)];
|
||||
PIGuildAnchorIncomeSectionView * sectionView = [[PIGuildAnchorIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)];
|
||||
return sectionView;
|
||||
}
|
||||
}
|
||||
@@ -328,7 +328,10 @@
|
||||
- (void)getClanAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo {
|
||||
[self.tableView.mj_header endRefreshing];
|
||||
self.headerView.totalIncome = incomeInfo.totalDiamond;
|
||||
|
||||
|
||||
self.datasource = incomeInfo.incomes;
|
||||
|
||||
[self.tableView reloadData];
|
||||
}
|
||||
|
||||
@@ -405,6 +408,7 @@
|
||||
[_tableView registerClass:[XPGuildPersonIncomeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildPersonIncomeTableViewCell class])];
|
||||
[_tableView registerClass:[XPMineGuildEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])];
|
||||
[_tableView registerClass:[XPGuildSingleRoomIncomeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])];
|
||||
[_tableView registerClass:[PIGuildSingleRoomIncomeCell class] forCellReuseIdentifier:NSStringFromClass([PIGuildSingleRoomIncomeCell class])];
|
||||
}
|
||||
return _tableView;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
//
|
||||
// PIGuildAnchorIncomeSectionView.h
|
||||
// YuMi
|
||||
//
|
||||
// Created by duoban on 2024/2/21.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface PIGuildAnchorIncomeSectionView : UIView
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -0,0 +1,91 @@
|
||||
//
|
||||
// PIGuildAnchorIncomeSectionView.m
|
||||
// YuMi
|
||||
//
|
||||
// Created by duoban on 2024/2/21.
|
||||
//
|
||||
|
||||
#import "PIGuildAnchorIncomeSectionView.h"
|
||||
@interface PIGuildAnchorIncomeSectionView()
|
||||
@property(nonatomic,strong) UILabel *userInfoView;
|
||||
@property(nonatomic,strong) UILabel *anchorView;
|
||||
@property(nonatomic,strong) UILabel *roomView;
|
||||
@property(nonatomic,strong) UILabel *timeView;
|
||||
@end
|
||||
@implementation PIGuildAnchorIncomeSectionView
|
||||
|
||||
- (instancetype)initWithFrame:(CGRect)frame {
|
||||
self = [super initWithFrame:frame];
|
||||
if (self) {
|
||||
[self initSubViews];
|
||||
[self initSubViewConstraints];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
#pragma mark - Private Method
|
||||
- (void)initSubViews {
|
||||
self.backgroundColor = UIColorFromRGB(0xF1F2F2);
|
||||
[self addSubview:self.userInfoView];
|
||||
[self addSubview:self.anchorView];
|
||||
[self addSubview:self.roomView];
|
||||
[self addSubview:self.timeView];
|
||||
|
||||
}
|
||||
|
||||
- (void)initSubViewConstraints {
|
||||
CGFloat width = kGetScaleWidth(242) / 3;
|
||||
[self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.leading.mas_equalTo(kGetScaleWidth(15));
|
||||
make.centerY.equalTo(self);
|
||||
}];
|
||||
[self.timeView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.trailing.mas_equalTo(0);
|
||||
make.centerY.equalTo(self);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
[self.roomView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.trailing.equalTo(self.timeView.mas_leading).mas_offset(0);
|
||||
make.centerY.equalTo(self);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
[self.anchorView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerY.equalTo(self);
|
||||
make.trailing.equalTo(self.roomView.mas_leading).mas_offset(0);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Getters And Setters
|
||||
- (UILabel *)userInfoView{
|
||||
if(!_userInfoView){
|
||||
_userInfoView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView0") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)];
|
||||
}
|
||||
return _userInfoView;
|
||||
}
|
||||
- (UILabel *)anchorView{
|
||||
if(!_anchorView){
|
||||
_anchorView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView1") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)];
|
||||
_anchorView.textAlignment = NSTextAlignmentCenter;
|
||||
}
|
||||
return _anchorView;
|
||||
}
|
||||
|
||||
- (UILabel *)roomView{
|
||||
if(!_roomView){
|
||||
_roomView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView2") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)];
|
||||
_roomView.textAlignment = NSTextAlignmentCenter;
|
||||
}
|
||||
return _roomView;
|
||||
}
|
||||
|
||||
- (UILabel *)timeView{
|
||||
if(!_timeView){
|
||||
_timeView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView3") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)];
|
||||
_timeView.textAlignment = NSTextAlignmentCenter;
|
||||
}
|
||||
return _timeView;
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@interface PIRoomActivityChoosePlayView : UIView
|
||||
@property(nonatomic,strong) NSMutableArray *playList;
|
||||
@property(nonatomic,weak) id<PIRoomActivityChoosePlayViewDelegate>delegate;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
}
|
||||
-(void)setInfoModel:(ActivityInfoModel *)infoModel{
|
||||
_infoModel = infoModel;
|
||||
_bgImageView.imageUrl = _infoModel.bannerUrl;
|
||||
_bgImageView.imageUrl = _infoModel.icon;
|
||||
}
|
||||
#pragma mark - 懒加载
|
||||
- (NetImageView *)bgImageView{
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
}
|
||||
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||
ActivityInfoModel *model = [_infoList safeObjectAtIndex1:indexPath.row];
|
||||
self.webVC.url = model.skipUri;
|
||||
self.webVC.url = model.skipContent;
|
||||
self.path = indexPath.row;
|
||||
[self.collectionView reloadData];
|
||||
}
|
||||
@@ -92,7 +92,7 @@
|
||||
_infoList = infoList;
|
||||
for (int i = 0; i < _infoList.count; i++) {
|
||||
ActivityInfoModel *model = _infoList[i];
|
||||
if([model.skipUri isEqualToString:_url]){
|
||||
if([model.skipContent isEqualToString:_url]){
|
||||
self.path = i;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -60,11 +60,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
///房间活动的列表
|
||||
@property (nonatomic,strong) NSMutableArray<ActivityInfoModel *> *activityList;
|
||||
@property(nonatomic,strong) NSMutableArray<ActivityInfoModel *> *playList;
|
||||
///航海
|
||||
@property (nonatomic,strong) UIImageView *sailingImageView;
|
||||
///是否加载了活动
|
||||
@property (nonatomic,assign) BOOL isLoadActivity;
|
||||
|
||||
@property(nonatomic,assign) BOOL isShowChoosePlayView;
|
||||
@end
|
||||
|
||||
@implementation XPRoomActivityContainerView
|
||||
@@ -92,7 +90,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
[self.stackView addArrangedSubview:self.redPacketView];
|
||||
[self.stackView addArrangedSubview:self.joinDatingView];
|
||||
[self.stackView addArrangedSubview:self.clickPlayView];
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -178,10 +176,13 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
} else {
|
||||
[self.pi_cycleScrollView setAutoScroll:NO];
|
||||
}
|
||||
|
||||
if(self.playList.count > 0){
|
||||
ActivityInfoModel *playModel = self.playList.firstObject;
|
||||
self.clickPlayView.model = playModel;
|
||||
self.clickPlayView.hidden = NO;
|
||||
if(self.isShowChoosePlayView == NO){
|
||||
self.clickPlayView.hidden = NO;
|
||||
}
|
||||
}else{
|
||||
self.clickPlayView.hidden = YES;
|
||||
}
|
||||
@@ -221,9 +222,19 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo;
|
||||
self.redPacketView.type = roomInfo.type;
|
||||
if (roomInfo.type == RoomType_MiniGame) {
|
||||
if(self.isShowChoosePlayView == YES){
|
||||
PIRoomActivityChoosePlayView *choosePlayView = [self.hostDelegate.getSuperView viewWithTag:98021];
|
||||
self.isShowChoosePlayView = NO;
|
||||
CGFloat y = self.frame.size.height + self.frame.origin.y - 124;
|
||||
[UIView animateWithDuration:0.1 animations:^{
|
||||
choosePlayView.frame = CGRectMake(KScreenWidth, y, 201, 124);
|
||||
}completion:^(BOOL finished) {
|
||||
[choosePlayView removeFromSuperview];
|
||||
}];
|
||||
}
|
||||
self.redPacketView.hidden = YES;
|
||||
self.clickPlayView.hidden = YES;
|
||||
self.sailingImageView.hidden = YES;
|
||||
|
||||
if (self.isLoadActivity) {
|
||||
[self configLittleGameActivity];
|
||||
} else {
|
||||
@@ -242,10 +253,13 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
} else {
|
||||
[self.pi_cycleScrollView setAutoScroll:NO];
|
||||
}
|
||||
|
||||
if(self.playList.count > 0){
|
||||
ActivityInfoModel *playModel = self.playList.firstObject;
|
||||
self.clickPlayView.model = playModel;
|
||||
self.clickPlayView.hidden = NO;
|
||||
if(self.isShowChoosePlayView == NO){
|
||||
self.clickPlayView.hidden = NO;
|
||||
}
|
||||
}else{
|
||||
self.clickPlayView.hidden = YES;
|
||||
}
|
||||
@@ -272,11 +286,8 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
self.joinDatingView.hidden = YES;
|
||||
}
|
||||
|
||||
if ([ClientConfig shareConfig].configInfo.linearlyPoolOpenLevel <= self.hostDelegate.getUserInfo.userLevelVo.experLevelSeq) {
|
||||
self.sailingImageView.hidden = NO;
|
||||
} else {
|
||||
self.sailingImageView.hidden = YES;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(self.openRedPacketHandle){
|
||||
@@ -340,19 +351,16 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
if (imageUrlList.count > index) {
|
||||
NSString *pic = imageUrlList[index];
|
||||
NSMutableArray *inftList = [NSMutableArray array];
|
||||
NSMutableArray *modelList = [NSMutableArray array];
|
||||
if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) {
|
||||
[modelList addObjectsFromArray:self.playList];
|
||||
[modelList addObjectsFromArray:self.activityList];
|
||||
}else{
|
||||
modelList = self.activityList;
|
||||
[self jumpPlayActionWithIndex:index imageUrlList:imageUrlList];
|
||||
return;
|
||||
}
|
||||
ActivityInfoModel * info;
|
||||
for (ActivityInfoModel * getInfo in modelList) {
|
||||
for (ActivityInfoModel * getInfo in self.activityList) {
|
||||
if([getInfo.icon isEqualToString:pic]){
|
||||
info = getInfo;
|
||||
}
|
||||
if(getInfo.skipType == 3){
|
||||
if(getInfo.skipType == 3 ){
|
||||
[inftList addObject:getInfo];
|
||||
}
|
||||
}
|
||||
@@ -401,6 +409,89 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
}
|
||||
}
|
||||
|
||||
-(void)jumpPlayActionWithIndex:(NSInteger)index imageUrlList:(NSArray *)imageUrlList{
|
||||
|
||||
if (imageUrlList.count > index) {
|
||||
NSString *pic = imageUrlList[index];
|
||||
NSMutableArray *inftList = [NSMutableArray array];
|
||||
NSMutableArray *modelList = [NSMutableArray array];
|
||||
[modelList addObjectsFromArray:self.playList];
|
||||
[modelList addObjectsFromArray:self.activityList];
|
||||
ActivityInfoModel * info;
|
||||
for (int i = 0 ; i < modelList.count; i++) {
|
||||
ActivityInfoModel * getInfo = modelList[i];
|
||||
if([getInfo.icon isEqualToString:pic]){
|
||||
info = getInfo;
|
||||
}
|
||||
if(getInfo.skipType == 3 && i > self.playList.count){
|
||||
[inftList addObject:getInfo];
|
||||
}
|
||||
}
|
||||
|
||||
if(info == nil)return;
|
||||
if([info.code isEqualToString:@"FIRST_CHARGE"]) {
|
||||
[self firstRechargeTapRecognizer];
|
||||
}else if ([info.code isEqualToString:@"FIND_LOVE"]) {
|
||||
[self lookLoveTapRecognizer];
|
||||
} else if([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) {
|
||||
[self sailTapRecognizer];
|
||||
}else if([info.code isEqualToString:@"SEIZE_TREASURE"]){
|
||||
XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
|
||||
fairyVC.roomUid =[NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
|
||||
fairyVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight);
|
||||
[[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:fairyVC];
|
||||
[fairyVC.navigationController setNavigationBarHidden:YES animated:NO];
|
||||
[[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:fairyVC.view];
|
||||
[UIView animateWithDuration:0.2 animations:^{
|
||||
|
||||
fairyVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
|
||||
|
||||
}completion:^(BOOL finished) {
|
||||
|
||||
}];
|
||||
}else {
|
||||
|
||||
if(index < self.playList.count){
|
||||
|
||||
if(info.showType == ActivityShowType_Half){
|
||||
XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
|
||||
webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
|
||||
webView.url = info.skipContent;
|
||||
[TTPopup popupView:webView style:TTPopupStyleActionSheet];
|
||||
return;
|
||||
}
|
||||
XPWebViewController * webVC = [[XPWebViewController alloc] init];
|
||||
webVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
|
||||
webVC.url = info.skipContent;
|
||||
[self.hostDelegate.getCurrentNav pushViewController:webVC animated:YES];
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (info.skipType == ActivitySkipType_Room) {
|
||||
[self.hostDelegate exitRoom];
|
||||
|
||||
[XPRoomViewController openRoom:info.skipContent viewController:kWindow.rootViewController];
|
||||
|
||||
|
||||
} else if(info.skipType == ActivitySkipType_Web) {
|
||||
|
||||
PIRoomActivityWebView * webView = [[PIRoomActivityWebView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
|
||||
webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
|
||||
webView.url = info.skipContent;
|
||||
webView.infoList = inftList;
|
||||
[kWindow addSubview:webView];
|
||||
[UIView animateWithDuration:0.2 animations:^{
|
||||
webView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
|
||||
}];
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - Event Response
|
||||
- (void)lookLoveTapRecognizer {
|
||||
XPCandyTreeViewController * candyTreeVC = [[XPCandyTreeViewController alloc] initWithDelegate:self.hostDelegate];
|
||||
@@ -457,10 +548,13 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
#pragma mark - PIRoomActivityClickViewDelegate
|
||||
- (void)showChoosePlayViewAction{
|
||||
self.clickPlayView.hidden = YES;
|
||||
self.isShowChoosePlayView = YES;
|
||||
|
||||
PIRoomActivityChoosePlayView *choosePlayView = [[PIRoomActivityChoosePlayView alloc]initWithFrame:CGRectZero];
|
||||
choosePlayView.delegate = self;
|
||||
choosePlayView.playList = self.playList;
|
||||
CGFloat y = self.frame.size.height + self.frame.origin.y - 124;
|
||||
choosePlayView.tag = 98021;
|
||||
[self.hostDelegate.getSuperView addSubview:choosePlayView];
|
||||
choosePlayView.frame = CGRectMake(KScreenWidth, y, 201, 124);
|
||||
|
||||
@@ -489,7 +583,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
|
||||
}];
|
||||
} else if(model.skipType == ActivitySkipType_Web) {
|
||||
if(model.skipType == ActivityShowType_Half){
|
||||
if(model.showType == ActivityShowType_Half){
|
||||
XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
|
||||
webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
|
||||
webView.url = model.skipContent;
|
||||
@@ -507,6 +601,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
[self clickPlayTypeWithModel:model];
|
||||
}
|
||||
-(void)hiddenViewActionWithView:(PIRoomActivityChoosePlayView *)view{
|
||||
self.isShowChoosePlayView = NO;
|
||||
CGFloat y = self.frame.size.height + self.frame.origin.y - 124;
|
||||
[UIView animateWithDuration:0.1 animations:^{
|
||||
view.frame = CGRectMake(KScreenWidth, y, 201, 124);
|
||||
@@ -574,17 +669,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
return _activityList;
|
||||
}
|
||||
|
||||
- (UIImageView *)sailingImageView {
|
||||
if (!_sailingImageView) {
|
||||
_sailingImageView = [[UIImageView alloc] init];
|
||||
_sailingImageView.image = [UIImage imageNamed:@"room_sailiing_enter"];
|
||||
_sailingImageView.userInteractionEnabled = YES;
|
||||
_sailingImageView.hidden = YES;
|
||||
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(sailTapRecognizer)];
|
||||
[_sailingImageView addGestureRecognizer:tap];
|
||||
}
|
||||
return _sailingImageView;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
//
|
||||
// YMRoomActivityPlayView.h
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/9/30.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class XPRoomActivityPlayModel;
|
||||
@protocol XPRoomActivityPlayViewDelegate <NSObject>
|
||||
|
||||
///展示更多玩法
|
||||
- (void)xPRoomActivityPlayViewShowMorePlay;
|
||||
///隐藏更多玩法
|
||||
- (void)xPRoomActivityPlayViewHideMorePlay;
|
||||
///点击了某个玩法
|
||||
- (void)xPRoomActivityPlayViewDidClickPlay:(XPRoomActivityPlayModel *)model;
|
||||
|
||||
@end
|
||||
|
||||
@interface XPRoomActivityPlayView : UIView
|
||||
|
||||
@property (nonatomic, strong) NSMutableArray *playArray;
|
||||
|
||||
@property (nonatomic, weak) id<XPRoomActivityPlayViewDelegate> delegate;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,126 +0,0 @@
|
||||
//
|
||||
// YMRoomActivityPlayView.m
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/9/30.
|
||||
//
|
||||
|
||||
#import "XPRoomActivityPlayView.h"
|
||||
///Third
|
||||
#import <Masonry/Masonry.h>
|
||||
#import "YUMIMacroUitls.h"
|
||||
#import "DJDKMIMOMColor.h"
|
||||
#import "UIImage+Utils.h"
|
||||
///Model
|
||||
#import "XPRoomActivityPlayModel.h"
|
||||
#import "NetImageView.h"
|
||||
|
||||
@interface XPRoomActivityPlayView()
|
||||
|
||||
@property (nonatomic, strong) UIButton *moreButton;
|
||||
|
||||
@end
|
||||
|
||||
@implementation XPRoomActivityPlayView
|
||||
|
||||
- (instancetype)initWithFrame:(CGRect)frame {
|
||||
self = [super initWithFrame:frame];
|
||||
if (self) {
|
||||
[self initSubViews];
|
||||
[self initSubViewConstraints];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)layoutSubviews {
|
||||
[super layoutSubviews];
|
||||
|
||||
UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:self.moreButton.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii:CGSizeMake(8, 8)];
|
||||
CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
|
||||
maskLayer.frame = self.moreButton.bounds;
|
||||
maskLayer.path = maskPath.CGPath;
|
||||
self.moreButton.layer.mask = maskLayer;
|
||||
}
|
||||
|
||||
#pragma mark - Private Method
|
||||
- (void)initSubViews {
|
||||
[self addSubview:self.moreButton];
|
||||
}
|
||||
|
||||
- (void)initSubViewConstraints {
|
||||
[self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.top.bottom.mas_equalTo(self);
|
||||
make.width.mas_equalTo(18);
|
||||
}];
|
||||
}
|
||||
|
||||
|
||||
- (void)moreButtonAction:(UIButton *)sender {
|
||||
if (self.frame.size.width > 18) {
|
||||
if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomActivityPlayViewHideMorePlay)]) {
|
||||
[self.delegate xPRoomActivityPlayViewHideMorePlay];
|
||||
}
|
||||
} else {
|
||||
if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomActivityPlayViewShowMorePlay)]) {
|
||||
[self.delegate xPRoomActivityPlayViewShowMorePlay];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void)imageTapRecognizer:(UITapGestureRecognizer *)ges {
|
||||
if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomActivityPlayViewDidClickPlay:)]) {
|
||||
XPRoomActivityPlayModel *model = self.playArray[ges.view.tag];
|
||||
[self.delegate xPRoomActivityPlayViewDidClickPlay:model];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setPlayArray:(NSMutableArray *)playArray {
|
||||
_playArray = playArray;
|
||||
if (playArray.count) {
|
||||
CGFloat itemWidth = 45;
|
||||
for (int i = 0; i<playArray.count; i++) {
|
||||
XPRoomActivityPlayModel *model = playArray[i];
|
||||
NetImageView *imageView = [[NetImageView alloc] init];
|
||||
if (model.playType == RoomActivityPlayTypeCandyTree) {
|
||||
imageView.imageUrl = model.imageName;
|
||||
} else {
|
||||
imageView.image = [UIImage imageNamed:model.imageName];
|
||||
}
|
||||
imageView.tag = i;
|
||||
if (i == 0) {
|
||||
imageView.frame = CGRectMake(18, (53 - itemWidth ) * 0.5, itemWidth, itemWidth);
|
||||
} else {
|
||||
imageView.frame = CGRectMake(18 + i * (itemWidth+2), (53 - itemWidth ) * 0.5, itemWidth, itemWidth);
|
||||
}
|
||||
imageView.backgroundColor = UIColorRGBAlpha(0xD7D7D7, 0.2);
|
||||
imageView.userInteractionEnabled = YES;
|
||||
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(imageTapRecognizer:)];
|
||||
[imageView addGestureRecognizer:tap];
|
||||
[self addSubview:imageView];
|
||||
}
|
||||
} else {
|
||||
for (UIView *view in self.subviews) {
|
||||
if (view != self.moreButton) {
|
||||
[view removeFromSuperview];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (UIButton *)moreButton {
|
||||
if (!_moreButton) {
|
||||
UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
button.titleLabel.font = [UIFont systemFontOfSize:10];
|
||||
[button addTarget:self action:@selector(moreButtonAction:) forControlEvents:UIControlEventTouchUpInside];
|
||||
[button setTitle:YMLocalizedString(@"XPRoomActivityPlayView0") forState:UIControlStateNormal];
|
||||
[button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
|
||||
button.titleLabel.lineBreakMode = NSLineBreakByWordWrapping;//换行模式自动换行
|
||||
button.titleLabel.numberOfLines = 0;
|
||||
button.titleLabel.textAlignment = NSTextAlignmentCenter;
|
||||
[button setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x6E36FF), UIColorFromRGB(0x31EBF7)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(18, 53)] forState:UIControlStateNormal];
|
||||
_moreButton = button;
|
||||
}
|
||||
return _moreButton;
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -1,27 +0,0 @@
|
||||
//
|
||||
// YMRoomActivityPlayModel.h
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/9/30.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
typedef NS_ENUM(NSUInteger, RoomActivityPlayType) {
|
||||
RoomActivityPlayTypeSailing,//航海
|
||||
RoomActivityPlayTypeCandyTree,//糖果树
|
||||
};
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface XPRoomActivityPlayModel : PIBaseModel
|
||||
|
||||
@property (nonatomic, copy) NSString *name;
|
||||
|
||||
@property (nonatomic, copy) NSString *imageName;
|
||||
|
||||
@property (nonatomic, assign) RoomActivityPlayType playType;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,12 +0,0 @@
|
||||
//
|
||||
// YMRoomActivityPlayModel.m
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/9/30.
|
||||
//
|
||||
|
||||
#import "XPRoomActivityPlayModel.h"
|
||||
|
||||
@implementation XPRoomActivityPlayModel
|
||||
|
||||
@end
|
||||
@@ -1,18 +0,0 @@
|
||||
//
|
||||
// YMRoomMorePlayPresenter.h
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/10/24.
|
||||
//
|
||||
|
||||
#import "BaseMvpPresenter.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
@class RoomInfoModel, UserInfoModel;
|
||||
@interface XPRoomMorePlayPresenter : BaseMvpPresenter
|
||||
|
||||
- (void)getRoomMorePlayData:(RoomInfoModel *)roomInfo userInfo:(UserInfoModel *)userInfo;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,31 +0,0 @@
|
||||
//
|
||||
// YMRoomMorePlayPresenter.m
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/10/24.
|
||||
//
|
||||
|
||||
#import "XPRoomMorePlayPresenter.h"
|
||||
#import "RoomInfoModel.h"
|
||||
#import "UserInfoModel.h"
|
||||
#import "XPRoomActivityPlayModel.h"
|
||||
#import "ClientConfig.h"
|
||||
#import "XPRoomMorePlayProtocol.h"
|
||||
|
||||
@implementation XPRoomMorePlayPresenter
|
||||
|
||||
- (void)getRoomMorePlayData:(RoomInfoModel *)roomInfo userInfo:(UserInfoModel *)userInfo {
|
||||
NSMutableArray * data = [NSMutableArray array];
|
||||
///航海玩法
|
||||
XPRoomActivityPlayModel *sailingModel = [[XPRoomActivityPlayModel alloc] init];
|
||||
sailingModel.name = YMLocalizedString(@"XPRoomMorePlayPresenter0");
|
||||
sailingModel.imageName = @"room_sailiing_enter";
|
||||
sailingModel.playType = RoomActivityPlayTypeSailing;
|
||||
|
||||
if ([ClientConfig shareConfig].configInfo.linearlyPoolOpenLevel <= userInfo.userLevelVo.experLevelSeq) {
|
||||
[data addObject:sailingModel];
|
||||
}
|
||||
[[self getView] getMorePlaysSuccess:data];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -1,19 +0,0 @@
|
||||
//
|
||||
// YMRoomMorePlayProtocol.h
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/10/24.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@protocol XPRoomMorePlayProtocol <NSObject>
|
||||
|
||||
///获取更多玩法成功
|
||||
- (void)getMorePlaysSuccess:(NSArray *)list;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,16 +0,0 @@
|
||||
//
|
||||
// YMRoomMorePlayCollectionViewCell.h
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/10/24.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
@class XPRoomActivityPlayModel;
|
||||
@interface XPRoomMorePlayCollectionViewCell : UICollectionViewCell
|
||||
@property (nonatomic,strong) XPRoomActivityPlayModel *playModel;
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,87 +0,0 @@
|
||||
//
|
||||
// YMRoomMorePlayCollectionViewCell.m
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/10/24.
|
||||
//
|
||||
|
||||
#import "XPRoomMorePlayCollectionViewCell.h"
|
||||
///Third
|
||||
#import <Masonry/Masonry.h>
|
||||
///Tool
|
||||
#import "DJDKMIMOMColor.h"
|
||||
#import "NetImageView.h"
|
||||
///Model
|
||||
#import "XPRoomActivityPlayModel.h"
|
||||
|
||||
@interface XPRoomMorePlayCollectionViewCell ()
|
||||
///显示logo
|
||||
@property (nonatomic,strong) NetImageView *logoImageView;
|
||||
///显示文案
|
||||
@property (nonatomic,strong) UILabel *titleLabel;
|
||||
|
||||
@end
|
||||
|
||||
@implementation XPRoomMorePlayCollectionViewCell
|
||||
|
||||
- (instancetype)initWithFrame:(CGRect)frame {
|
||||
self = [super initWithFrame:frame];
|
||||
if (self) {
|
||||
[self initSubViews];
|
||||
[self initSubViewConstraints];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
#pragma mark - Private Method
|
||||
- (void)initSubViews {
|
||||
[self.contentView addSubview:self.logoImageView];
|
||||
[self.contentView addSubview:self.titleLabel];
|
||||
}
|
||||
|
||||
- (void)initSubViewConstraints {
|
||||
[self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(64, 64));
|
||||
make.centerX.mas_equalTo(self.contentView);
|
||||
make.top.mas_equalTo(self.contentView);
|
||||
}];
|
||||
|
||||
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.right.mas_equalTo(self.contentView);
|
||||
make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(7);
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Getters And Setters
|
||||
- (void)setPlayModel:(XPRoomActivityPlayModel *)playModel {
|
||||
_playModel = playModel;
|
||||
if (_playModel) {
|
||||
if ([_playModel.imageName hasPrefix:@"http"]) {
|
||||
self.logoImageView.imageUrl = _playModel.imageName;
|
||||
} else {
|
||||
self.logoImageView.image = [UIImage imageNamed:_playModel.imageName];
|
||||
}
|
||||
self.titleLabel.text = _playModel.name;
|
||||
}
|
||||
}
|
||||
|
||||
- (NetImageView *)logoImageView {
|
||||
if (!_logoImageView) {
|
||||
_logoImageView = [[NetImageView alloc] init];
|
||||
_logoImageView.userInteractionEnabled = YES;
|
||||
}
|
||||
return _logoImageView;
|
||||
}
|
||||
|
||||
- (UILabel *)titleLabel {
|
||||
if (!_titleLabel) {
|
||||
_titleLabel = [[UILabel alloc] init];
|
||||
_titleLabel.font = [UIFont systemFontOfSize:10];
|
||||
_titleLabel.textColor = [UIColor whiteColor];
|
||||
_titleLabel.textAlignment = NSTextAlignmentCenter;
|
||||
}
|
||||
return _titleLabel;
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
@@ -1,16 +0,0 @@
|
||||
//
|
||||
// YMRoomMorePlayViewController.h
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/10/24.
|
||||
//
|
||||
|
||||
#import "MvpViewController.h"
|
||||
#import "RoomHostDelegate.h"
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface XPRoomMorePlayViewController : MvpViewController
|
||||
- (instancetype)initWithdelegate:(id<RoomHostDelegate>)delegate;
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,196 +0,0 @@
|
||||
//
|
||||
// YMRoomMorePlayViewController.m
|
||||
// YUMI
|
||||
//
|
||||
// Created by YUMI on 2022/10/24.
|
||||
//
|
||||
|
||||
#import "XPRoomMorePlayViewController.h"
|
||||
///Third
|
||||
#import <Masonry/Masonry.h>
|
||||
///Tool
|
||||
#import "YUMIMacroUitls.h"
|
||||
#import "UIView+Corner.h"
|
||||
#import "StatisticsServiceHelper.h"
|
||||
#import "NSArray+Safe.h"
|
||||
///Model
|
||||
#import "XPRoomActivityPlayModel.h"
|
||||
#import "RoomInfoModel.h"
|
||||
///View
|
||||
#import "XPRoomMorePlayCollectionViewCell.h"
|
||||
#import "XPCandyTreeViewController.h"
|
||||
#import "XPSailingViewController.h"
|
||||
///P
|
||||
#import "XPRoomMorePlayPresenter.h"
|
||||
#import "XPRoomMorePlayProtocol.h"
|
||||
|
||||
@interface XPRoomMorePlayViewController ()<UICollectionViewDelegate, UICollectionViewDataSource, XPRoomMorePlayProtocol>
|
||||
///顶部
|
||||
@property (nonatomic,strong) UIView *topView;
|
||||
///列表
|
||||
@property (nonatomic,strong) UICollectionView *collectionView;
|
||||
///数据源
|
||||
@property (nonatomic,strong) NSArray<XPRoomActivityPlayModel *> *datasource;
|
||||
///蒙层
|
||||
@property (nonatomic,strong) UIVisualEffectView *effectView;
|
||||
///host 代理
|
||||
@property (nonatomic,weak) id<RoomHostDelegate>hostDelegate;
|
||||
@end
|
||||
|
||||
@implementation XPRoomMorePlayViewController
|
||||
|
||||
- (instancetype)initWithdelegate:(id<RoomHostDelegate>)delegate {
|
||||
if (self = [super init]) {
|
||||
self.hostDelegate = delegate;
|
||||
self.modalPresentationStyle = UIModalPresentationOverFullScreen;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (__kindof id)createPresenter {
|
||||
return [[XPRoomMorePlayPresenter alloc] init];
|
||||
}
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
[self initSubViews];
|
||||
[self initSubViewConstraints];
|
||||
[self.presenter getRoomMorePlayData:self.hostDelegate.getRoomInfo userInfo:self.hostDelegate.getUserInfo];
|
||||
}
|
||||
|
||||
#pragma mark - Private Method
|
||||
- (void)initSubViews {
|
||||
self.view.backgroundColor = [UIColor clearColor];
|
||||
[self.view addSubview:self.topView];
|
||||
[self.view addSubview:self.effectView];
|
||||
[self.view addSubview:self.collectionView];
|
||||
}
|
||||
|
||||
- (void)initSubViewConstraints {
|
||||
[self.topView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.right.top.mas_equalTo(self.view);
|
||||
make.bottom.mas_equalTo(self.collectionView.mas_top);
|
||||
}];
|
||||
|
||||
[self.effectView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.edges.mas_equalTo(self.collectionView);
|
||||
}];
|
||||
|
||||
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.right.bottom.mas_equalTo(self.view);
|
||||
make.height.mas_equalTo(81 + 16 + kSafeAreaBottomHeight + 10);
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)dismissVC {
|
||||
[self dismissViewControllerAnimated:YES completion:nil];
|
||||
}
|
||||
|
||||
#pragma mark - UITableViewDelegate And UITableViewDataSource
|
||||
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
|
||||
return self.datasource.count;
|
||||
}
|
||||
|
||||
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
|
||||
XPRoomMorePlayCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomMorePlayCollectionViewCell class]) forIndexPath:indexPath];
|
||||
cell.playModel = [self.datasource safeObjectAtIndex1:indexPath.row];
|
||||
return cell;
|
||||
}
|
||||
|
||||
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
|
||||
[collectionView deselectItemAtIndexPath:indexPath animated:YES];
|
||||
if (self.datasource.count > 0) {
|
||||
XPRoomActivityPlayModel * info = [self.datasource safeObjectAtIndex1:indexPath.row];
|
||||
switch (info.playType) {
|
||||
case RoomActivityPlayTypeCandyTree:
|
||||
{
|
||||
[self dismissVC];
|
||||
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_pop_click eventAttributes:@{@"bannerName": YMLocalizedString(@"XPRoomMorePlayViewController0")}];
|
||||
XPCandyTreeViewController * candyTreeVC = [[XPCandyTreeViewController alloc] initWithDelegate:self.hostDelegate];
|
||||
candyTreeVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
|
||||
[self.hostDelegate.getCurrentNav presentViewController:candyTreeVC animated:YES completion:nil];
|
||||
}
|
||||
break;
|
||||
case RoomActivityPlayTypeSailing:
|
||||
{
|
||||
[self dismissVC];
|
||||
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_pop_click eventAttributes:@{@"bannerName": YMLocalizedString(@"XPRoomMorePlayViewController1")}];
|
||||
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
|
||||
XPSailingViewController * sailingVC = [[XPSailingViewController alloc] initWithRoomUid:roomUid];
|
||||
[self.hostDelegate.getCurrentNav presentViewController:sailingVC animated:YES completion:nil];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#pragma mark - XPRoomMorePlayProtocol
|
||||
- (void)getMorePlaysSuccess:(NSArray *)list {
|
||||
self.datasource = list;
|
||||
CGFloat contentHeight= 24 + kSafeAreaBottomHeight + 10;
|
||||
CGFloat itemHeight = 81;
|
||||
int page = list.count % 3;
|
||||
int scale = (int)list.count / (int)3;
|
||||
if (page == 0) {
|
||||
contentHeight += (scale *itemHeight);
|
||||
} else {
|
||||
contentHeight += ((scale+1) *itemHeight + scale * 12);
|
||||
}
|
||||
CAShapeLayer * layer = [CAShapeLayer layer];
|
||||
UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, contentHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)];
|
||||
layer.path = path.CGPath;
|
||||
self.collectionView.layer.mask = layer;
|
||||
[self.collectionView mas_updateConstraints:^(MASConstraintMaker *make) {
|
||||
make.height.mas_equalTo(contentHeight);
|
||||
}];
|
||||
[self.collectionView reloadData];
|
||||
}
|
||||
|
||||
#pragma mark - Getters And Setters
|
||||
- (UIView *)topView {
|
||||
if (!_topView) {
|
||||
_topView = [[UIView alloc] init];
|
||||
_topView.backgroundColor = [UIColor clearColor];
|
||||
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissVC)];
|
||||
[_topView addGestureRecognizer:tap];
|
||||
}
|
||||
return _topView;
|
||||
}
|
||||
|
||||
- (UICollectionView *)collectionView{
|
||||
if (!_collectionView) {
|
||||
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
|
||||
layout.itemSize = CGSizeMake(KScreenWidth / 3.0, 81);
|
||||
layout.sectionInset = UIEdgeInsetsMake(16, 0, 0, 0);
|
||||
layout.minimumLineSpacing = 10;
|
||||
layout.minimumInteritemSpacing = 0;
|
||||
_collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
|
||||
_collectionView.dataSource = self;
|
||||
_collectionView.delegate = self;
|
||||
_collectionView.backgroundColor = [UIColor clearColor];
|
||||
[_collectionView registerClass:[XPRoomMorePlayCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomMorePlayCollectionViewCell class])];
|
||||
|
||||
}
|
||||
return _collectionView;
|
||||
}
|
||||
|
||||
- (UIVisualEffectView *)effectView {
|
||||
if (!_effectView) {
|
||||
UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
|
||||
_effectView = [[UIVisualEffectView alloc] initWithEffect:beffect];
|
||||
|
||||
UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, KScreenHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)];
|
||||
CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
|
||||
maskLayer.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
|
||||
maskLayer.path = maskPath.CGPath;
|
||||
_effectView.layer.mask = maskLayer;
|
||||
}
|
||||
return _effectView;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@end
|
||||
@@ -1677,11 +1677,11 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
|
||||
if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen && attachment.second == Custom_Message_Sub_Star_Kitchen_FullScreen){
|
||||
isHave = YES;
|
||||
}else if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
|
||||
|
||||
isHave = YES;
|
||||
}else if(attachment.first == CustomMessageType_Guardian_Planet && attachment.second == Custom_Message_Sub_Guardian_Planet_All_Room){
|
||||
|
||||
isHave = YES;
|
||||
}else if (attachment.first == CustomMessageType_Treasure_Fairy && (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) { //夺宝精灵
|
||||
|
||||
isHave = YES;
|
||||
}else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){
|
||||
isHave = YES;
|
||||
}if (attachment.first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_AllDiamandRedPacket) {
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
"LoginPresenter1" = "登录失败，请重试";
|
||||
"XPRoomStarKitchenBannerView0"="恭喜%@在星级厨房抽中%@倍奖励，获得 %@钻石！";
|
||||
"XPRoomMessageParser1033333"="恭喜%@在星级厨房抽中 %@倍奖励，获得 %@钻石！";
|
||||
"XPRoomMessageParser1033334"="恭喜 [%@] 在守护星球中成功击败怪兽，获得%@鉆石奖励";
|
||||
"XPRoomMessageParser1033334"="恭喜 %@ 在守护星球中成功击败怪兽，获得%@钻石奖励";
|
||||
///XPShareView.m
|
||||
"XPShareView0" = "拷贝成功";
|
||||
"XPShareView1" = "来玩奥";
|
||||
@@ -733,8 +733,8 @@
|
||||
|
||||
"XPNewHomePlayEmptyTableViewCell0" = "快来创建房间一起交友吧";
|
||||
|
||||
"XPNewHomeViewController0" = "推荐";
|
||||
"XPNewHomeViewController1" = "推荐";
|
||||
|
||||
|
||||
"XPNewHomeViewController2" = "推荐";
|
||||
"XPNewHomeViewController3" = "推荐";
|
||||
|
||||
@@ -1261,8 +1261,7 @@
|
||||
|
||||
"XPRoomMorePlayPresenter0" = "航海";
|
||||
|
||||
"XPRoomMorePlayViewController0" = "糖果树";
|
||||
"XPRoomMorePlayViewController1" = "航海";
|
||||
|
||||
|
||||
"XPReleaseRadioViewController0" = "发佈成功";
|
||||
"XPReleaseRadioViewController1" = "发佈后，%zd分钟内不可再发佈广播";
|
||||
@@ -1632,7 +1631,7 @@
|
||||
|
||||
|
||||
|
||||
"XPRoomActivityPlayView0" = "更多玩法";
|
||||
|
||||
|
||||
"XPRoomQuickMessageContainView0" = "你发送的太频繁啦，请稍后再试";
|
||||
|
||||
@@ -3183,6 +3182,11 @@
|
||||
"PIRoomGiftBroadcastWindow2"="下次不再出现此提示";
|
||||
"PIRoomGiftBroadcastWindow3"="留在这";
|
||||
"PIRoomGiftBroadcastWindow4"="立即前往";
|
||||
///PIGuildAnchorIncomeSectionView
|
||||
"PIGuildAnchorIncomeSectionView0"="个人信息";
|
||||
"PIGuildAnchorIncomeSectionView1"="主播(钻石)";
|
||||
"PIGuildAnchorIncomeSectionView2"="房间(钻石)";
|
||||
"PIGuildAnchorIncomeSectionView3"="直播时长";
|
||||
///不能脚本生成的
|
||||
"App_Common_And" = "和";
|
||||
"App_Common_Male" = "男";
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
"LoginPresenter1" = "登錄失敗，請重試";
|
||||
"XPRoomStarKitchenBannerView0"="恭喜%@在星級廚房抽中%@倍獎勵，獲得 %@鉆石！";
|
||||
"XPRoomMessageParser1033333"="恭喜%@在星級廚房抽中 %@倍獎勵，獲得 %@鉆石！";
|
||||
"XPRoomMessageParser1033334"="恭喜 [%@] 在守護星球中成功擊敗怪獸，獲得%@鉆石獎勵";
|
||||
"XPRoomMessageParser1033334"="恭喜 %@ 在守護星球中成功擊敗怪獸，獲得%@鉆石獎勵";
|
||||
///XPShareView.m
|
||||
"XPShareView0" = "拷貝成功";
|
||||
"XPShareView1" = "來玩奧";
|
||||
@@ -735,8 +735,8 @@
|
||||
|
||||
"XPNewHomePlayEmptyTableViewCell0" = "快來創建房間一起交友吧";
|
||||
|
||||
"XPNewHomeViewController0" = "推薦";
|
||||
"XPNewHomeViewController1" = "推薦";
|
||||
|
||||
|
||||
"XPNewHomeViewController2" = "推薦";
|
||||
"XPNewHomeViewController3" = "推薦";
|
||||
|
||||
@@ -1263,8 +1263,7 @@
|
||||
|
||||
"XPRoomMorePlayPresenter0" = "航海";
|
||||
|
||||
"XPRoomMorePlayViewController0" = "糖果樹";
|
||||
"XPRoomMorePlayViewController1" = "航海";
|
||||
|
||||
|
||||
"XPReleaseRadioViewController0" = "發佈成功";
|
||||
"XPReleaseRadioViewController1" = "發佈後，%zd分鐘內不可再發佈廣播";
|
||||
@@ -1629,7 +1628,7 @@
|
||||
"XPRoomLuckyBigPrizeView0" = "%@運氣爆表！在%@ 中開出了價值 %@鉆 的 %@";
|
||||
|
||||
|
||||
"XPRoomActivityPlayView0" = "更多玩法";
|
||||
|
||||
|
||||
"XPRoomQuickMessageContainView0" = "你發送的太頻繁啦，請稍後再試";
|
||||
|
||||
@@ -3181,7 +3180,11 @@
|
||||
"PIRoomGiftBroadcastWindow2"="下次不再出現此提示";
|
||||
"PIRoomGiftBroadcastWindow3"="留在這";
|
||||
"PIRoomGiftBroadcastWindow4"="立即前往";
|
||||
|
||||
///PIGuildAnchorIncomeSectionView
|
||||
"PIGuildAnchorIncomeSectionView0"="個人信息";
|
||||
"PIGuildAnchorIncomeSectionView1"="主播(鉆石)";
|
||||
"PIGuildAnchorIncomeSectionView2"="房間(鉆石)";
|
||||
"PIGuildAnchorIncomeSectionView3"="直播時長";
|
||||
///不能腳本生成的
|
||||
"App_Common_And" = "和";
|
||||
"App_Common_Male" = "男";
|
||||
|
||||
Reference in New Issue
Block a user