更改logo

Podfile

@@ -62,7 +62,7 @@ target 'YuMi' do
 	pod 'SVGAPlayer'
 
 	pod 'GoogleSignIn'
-	pod 'mob_linksdk_pro'
+	#pod 'mob_linksdk_pro'
 	pod 'mob_sharesdk'
 	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
 	#pod 'mob_sharesdk/ShareSDKPlatforms/Line'

YuMi.xcodeproj/project.pbxproj

@@ -236,8 +236,6 @@
 		237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; };
 		237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */; };
 		237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */; };
-		238A90072BA9729200828123 /* PIUniversalBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 238A90062BA9729200828123 /* PIUniversalBannerView.m */; };
-		238A900A2BA9756600828123 /* PIUniversalBannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 238A90092BA9756600828123 /* PIUniversalBannerModel.m */; };
 		238B37A32AC55A2C00BFC9D5 /* XPTreasureFailyPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 238B37242AC55A2C00BFC9D5 /* XPTreasureFailyPresenter.m */; };
 		238B37A42AC55A2C00BFC9D5 /* TreasureFairyLimitModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 238B372B2AC55A2C00BFC9D5 /* TreasureFairyLimitModel.m */; };
 		238B37A52AC55A2C00BFC9D5 /* TreasureFailyKeyInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 238B372C2AC55A2C00BFC9D5 /* TreasureFailyKeyInfoModel.m */; };
@@ -309,17 +307,8 @@
 		23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */; };
 		23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */; };
 		23B2AEC42A6516C200543D17 /* LoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */; };
-		23B8D8D82B85F8B900CA472F /* PIHoemCategoryTitleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8D72B85F8B900CA472F /* PIHoemCategoryTitleCell.m */; };
-		23B8D8DB2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8DA2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m */; };
-		23B8D8DE2B860B8800CA472F /* PIHoemCategoryCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8DD2B860B8800CA472F /* PIHoemCategoryCollectionView.m */; };
-		23B8D8E12B87715100CA472F /* PIGeneralPublicScreenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8E02B87715100CA472F /* PIGeneralPublicScreenModel.m */; };
 		23BA165B2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */; };
 		23C7C0B72A7CD7B000802205 /* XPNewMineGuildItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */; };
-		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 */; };
@@ -404,8 +393,6 @@
 		23E9EB252A84E98300B792F2 /* pi_new_mine_info_online.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */; };
 		23E9EB312A85E5D100B792F2 /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */; };
 		23E9EB332A85E97C00B792F2 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */; };
-		23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */; };
-		23EE970A2BA2D39C00475D69 /* PIWebViewSavePhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23EE97092BA2D39C00475D69 /* PIWebViewSavePhotoView.m */; };
 		23FF255B2AB956D50064E904 /* pi_home_new_pk.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */; };
 		23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */; };
 		23FF25652ABC3B3C0064E904 /* XPHomeGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25642ABC3B3B0064E904 /* XPHomeGameView.m */; };
@@ -511,6 +498,8 @@
 		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 */; };
@@ -989,6 +978,7 @@
 		E85E7B1B2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A8A2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m */; };
 		E85E7B1C2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A8B2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m */; };
 		E85E7B1D2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A8C2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m */; };
+		E85E7B1E2A4EB0D200B6D00A /* XPMineAnchorIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A912A4EB0D200B6D00A /* XPMineAnchorIncomeStatisViewController.m */; };
 		E85E7B1F2A4EB0D300B6D00A /* XPMineGuildIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A932A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.m */; };
 		E85E7B202A4EB0D300B6D00A /* XPMineGuildIncomeDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A942A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.m */; };
 		E85E7B212A4EB0D300B6D00A /* XPNewMineGuildIncomeRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A952A4EB0D200B6D00A /* XPNewMineGuildIncomeRecordViewController.m */; };
@@ -1272,6 +1262,9 @@
 		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 */; };
@@ -1943,10 +1936,6 @@
 		237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomTrumpetView.m; sourceTree = "<group>"; };
 		237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+RoomTrumpet.m"; sourceTree = "<group>"; };
 		237B94BB2A984DA7007853E3 /* Api+RoomTrumpet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+RoomTrumpet.h"; sourceTree = "<group>"; };
-		238A90052BA9729200828123 /* PIUniversalBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUniversalBannerView.h; sourceTree = "<group>"; };
-		238A90062BA9729200828123 /* PIUniversalBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIUniversalBannerView.m; sourceTree = "<group>"; };
-		238A90082BA9756600828123 /* PIUniversalBannerModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUniversalBannerModel.h; sourceTree = "<group>"; };
-		238A90092BA9756600828123 /* PIUniversalBannerModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIUniversalBannerModel.m; sourceTree = "<group>"; };
 		238B37242AC55A2C00BFC9D5 /* XPTreasureFailyPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTreasureFailyPresenter.m; sourceTree = "<group>"; };
 		238B37252AC55A2C00BFC9D5 /* XPTreasureFailyPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTreasureFailyPresenter.h; sourceTree = "<group>"; };
 		238B37272AC55A2C00BFC9D5 /* XPTreasureFailyProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTreasureFailyProtocol.h; sourceTree = "<group>"; };
@@ -2088,28 +2077,10 @@
 		23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetEditView.m; sourceTree = "<group>"; };
 		23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetPasswordViewController.m; sourceTree = "<group>"; };
 		23B2AEC32A6516C200543D17 /* LoginForgetPasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetPasswordViewController.h; sourceTree = "<group>"; };
-		23B8D8D62B85F8B900CA472F /* PIHoemCategoryTitleCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleCell.h; sourceTree = "<group>"; };
-		23B8D8D72B85F8B900CA472F /* PIHoemCategoryTitleCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleCell.m; sourceTree = "<group>"; };
-		23B8D8D92B85FDDD00CA472F /* PIHomeCategoryTitleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHomeCategoryTitleModel.h; sourceTree = "<group>"; };
-		23B8D8DA2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHomeCategoryTitleModel.m; sourceTree = "<group>"; };
-		23B8D8DC2B860B8800CA472F /* PIHoemCategoryCollectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryCollectionView.h; sourceTree = "<group>"; };
-		23B8D8DD2B860B8800CA472F /* PIHoemCategoryCollectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryCollectionView.m; sourceTree = "<group>"; };
-		23B8D8DF2B87715100CA472F /* PIGeneralPublicScreenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGeneralPublicScreenModel.h; sourceTree = "<group>"; };
-		23B8D8E02B87715100CA472F /* PIGeneralPublicScreenModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGeneralPublicScreenModel.m; sourceTree = "<group>"; };
 		23BA16592A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIBaseAnimationViewModel.h; sourceTree = "<group>"; };
 		23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIBaseAnimationViewModel.m; sourceTree = "<group>"; };
 		23C7C0B52A7CD7B000802205 /* XPNewMineGuildItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewMineGuildItemView.h; sourceTree = "<group>"; };
 		23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewMineGuildItemView.m; sourceTree = "<group>"; };
-		23C9DFC12B84807A00B51558 /* PIRoomActivityClickView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityClickView.h; sourceTree = "<group>"; };
-		23C9DFC22B84807A00B51558 /* PIRoomActivityClickView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityClickView.m; sourceTree = "<group>"; };
-		23C9DFC42B84903500B51558 /* PIRoomActivityChoosePlayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityChoosePlayView.h; sourceTree = "<group>"; };
-		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>"; };
@@ -2266,9 +2237,6 @@
 		23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_new_mine_info_online.svga; sourceTree = "<group>"; };
 		23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = "<group>"; };
 		23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = "<group>"; };
-		23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_crazy_zoo.svga; sourceTree = "<group>"; };
-		23EE97082BA2D39C00475D69 /* PIWebViewSavePhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIWebViewSavePhotoView.h; sourceTree = "<group>"; };
-		23EE97092BA2D39C00475D69 /* PIWebViewSavePhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIWebViewSavePhotoView.m; sourceTree = "<group>"; };
 		23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_home_new_pk.svga; sourceTree = "<group>"; };
 		23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_game_fine_love.svga; sourceTree = "<group>"; };
 		23FF25632ABC3B3B0064E904 /* XPHomeGameView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeGameView.h; sourceTree = "<group>"; };
@@ -2472,6 +2440,10 @@
 		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>"; };
@@ -3284,6 +3256,7 @@
 		E85E7A842A4EB0D200B6D00A /* GuildSearchUserInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildSearchUserInfoModel.h; sourceTree = "<group>"; };
 		E85E7A872A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildIncomeStatisViewController.h; sourceTree = "<group>"; };
 		E85E7A882A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGoldIncomeRecordVC.m; sourceTree = "<group>"; };
+		E85E7A892A4EB0D200B6D00A /* XPMineAnchorIncomeStatisViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineAnchorIncomeStatisViewController.h; sourceTree = "<group>"; };
 		E85E7A8A2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineMainIncomeStatisViewController.m; sourceTree = "<group>"; };
 		E85E7A8B2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineHallAnchorIncomeStatisViewController.m; sourceTree = "<group>"; };
 		E85E7A8C2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineClanIncomeStatisViewController.m; sourceTree = "<group>"; };
@@ -3291,6 +3264,7 @@
 		E85E7A8E2A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildIncomeDetailViewController.h; sourceTree = "<group>"; };
 		E85E7A8F2A4EB0D200B6D00A /* XPMineGuildIncomeRecordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildIncomeRecordViewController.h; sourceTree = "<group>"; };
 		E85E7A902A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineMainIncomeStatisViewController.h; sourceTree = "<group>"; };
+		E85E7A912A4EB0D200B6D00A /* XPMineAnchorIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineAnchorIncomeStatisViewController.m; sourceTree = "<group>"; };
 		E85E7A922A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGoldIncomeRecordVC.h; sourceTree = "<group>"; };
 		E85E7A932A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildIncomeStatisViewController.m; sourceTree = "<group>"; };
 		E85E7A942A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildIncomeDetailViewController.m; sourceTree = "<group>"; };
@@ -3869,6 +3843,13 @@
 		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>"; };
@@ -4368,8 +4349,6 @@
 				E80E09AC2A41336500CD2BE7 /* XPWebViewNavView.m */,
 				18E7B33026F317A20064BC9B /* XPWebViewController.h */,
 				18E7B33126F317A20064BC9B /* XPWebViewController.m */,
-				23EE97082BA2D39C00475D69 /* PIWebViewSavePhotoView.h */,
-				23EE97092BA2D39C00475D69 /* PIWebViewSavePhotoView.m */,
 			);
 			path = YMWeb;
 			sourceTree = "<group>";
@@ -7529,8 +7508,6 @@
 				F1D8556E2931FC86008C418F /* XPRoomYearActivityView.m */,
 				E80E09B12A42071C00CD2BE7 /* XPRoomStarKitchenBannerView.h */,
 				E80E09B22A42071D00CD2BE7 /* XPRoomStarKitchenBannerView.m */,
-				238A90052BA9729200828123 /* PIUniversalBannerView.h */,
-				238A90062BA9729200828123 /* PIUniversalBannerView.m */,
 			);
 			path = AnimationView;
 			sourceTree = "<group>";
@@ -7684,8 +7661,6 @@
 				E80E09B52A42078F00CD2BE7 /* XPRoomStarKitchenModel.m */,
 				23BA16592A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.h */,
 				23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */,
-				238A90082BA9756600828123 /* PIUniversalBannerModel.h */,
-				238A90092BA9756600828123 /* PIUniversalBannerModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -7931,8 +7906,6 @@
 				E87A24F0272935920086A794 /* XPMessageRemoteExtModel.m */,
 				E8398069290288660084BFC8 /* XPMessageInfoModel.h */,
 				E839806A290288660084BFC8 /* XPMessageInfoModel.m */,
-				23B8D8DF2B87715100CA472F /* PIGeneralPublicScreenModel.h */,
-				23B8D8E02B87715100CA472F /* PIGeneralPublicScreenModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -8140,6 +8113,8 @@
 		E85E7A862A4EB0D200B6D00A /* IncomeStatis */ = {
 			isa = PBXGroup;
 			children = (
+				E85E7A892A4EB0D200B6D00A /* XPMineAnchorIncomeStatisViewController.h */,
+				E85E7A912A4EB0D200B6D00A /* XPMineAnchorIncomeStatisViewController.m */,
 				E85E7A962A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.h */,
 				E85E7A8C2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m */,
 				E85E7A922A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.h */,
@@ -8188,8 +8163,6 @@
 				E85E7AB82A4EB0D200B6D00A /* XPGoldIncomeSectionView.m */,
 				E85E7AB02A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.h */,
 				E85E7ABC2A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.m */,
-				23C9DFCA2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.h */,
-				23C9DFCB2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m */,
 				E85E7AA52A4EB0D200B6D00A /* XPGuildHeaderView.h */,
 				E85E7AB22A4EB0D200B6D00A /* XPGuildHeaderView.m */,
 				E85E7AA92A4EB0D200B6D00A /* XPGuildIncomeHeaderView.h */,
@@ -8281,8 +8254,6 @@
 				E85E7AD72A4EB0D200B6D00A /* XPGuildPersonIncomeTableViewCell.m */,
 				E85E7AD92A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.h */,
 				E85E7AD52A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m */,
-				23C9DFCD2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.h */,
-				23C9DFCE2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m */,
 			);
 			path = Income;
 			sourceTree = "<group>";
@@ -8993,10 +8964,6 @@
 				E87E625C2A3F5622002F68C9 /* XPNewHomeViewController.m */,
 				239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */,
 				239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */,
-				23B8D8DC2B860B8800CA472F /* PIHoemCategoryCollectionView.h */,
-				23B8D8DD2B860B8800CA472F /* PIHoemCategoryCollectionView.m */,
-				23B8D8D62B85F8B900CA472F /* PIHoemCategoryTitleCell.h */,
-				23B8D8D72B85F8B900CA472F /* PIHoemCategoryTitleCell.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -9031,8 +8998,6 @@
 				E87DF4BE2A42C8C1009C1185 /* HomeTagModel.m */,
 				23FF42712AA6CC480055733C /* PIHomeItemModel.h */,
 				23FF42722AA6CC480055733C /* PIHomeItemModel.m */,
-				23B8D8D92B85FDDD00CA472F /* PIHomeCategoryTitleModel.h */,
-				23B8D8DA2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -9413,7 +9378,6 @@
 		E8A1E45C276220B100B294CA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */,
 				23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */,
 				23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */,
 				23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */,
@@ -9430,6 +9394,62 @@
 			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 = (
@@ -9661,6 +9681,7 @@
 				E8AEAEE927141ACC0017FCE0 /* MenuContainerView */,
 				E8AEAEE627141ACC0017FCE0 /* MessageContainerView */,
 				186F8B472733F2AE007A17BC /* MicroQueueProtocol.h */,
+				E8A1F78D290641D80099C952 /* MorePlay */,
 				E8DEC9962764A51F0078CB70 /* MoreView */,
 				9B9BBF80288FBF93004E2E74 /* NewUserGift */,
 				E87AE8C2284E1A6B00CAFBB3 /* NewUserGreet */,
@@ -9700,12 +9721,8 @@
 			children = (
 				E8AE427127153A3500BEEBB2 /* XPRoomActivityContainerView.h */,
 				E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */,
-				23C9DFC12B84807A00B51558 /* PIRoomActivityClickView.h */,
-				23C9DFC22B84807A00B51558 /* PIRoomActivityClickView.m */,
-				23C9DFC42B84903500B51558 /* PIRoomActivityChoosePlayView.h */,
-				23C9DFC52B84903500B51558 /* PIRoomActivityChoosePlayView.m */,
-				23C9DFC72B84917B00B51558 /* PIRoomActivityChoosePlayCell.h */,
-				23C9DFC82B84917B00B51558 /* PIRoomActivityChoosePlayCell.m */,
+				9BAC92EC28E6989400147DD8 /* XPRoomActivityPlayView.h */,
+				9BAC92ED28E6989400147DD8 /* XPRoomActivityPlayView.m */,
 				235A45182B04A352009753F5 /* PIRoomActivityWebView.h */,
 				235A45192B04A352009753F5 /* PIRoomActivityWebView.m */,
 				235A451B2B04A452009753F5 /* PIRoomActivityWebCell.h */,
@@ -10568,7 +10585,6 @@
 				E8729EEF2A3B34D30076D80A /* images in Resources */,
 				E80EC86728ACD84000D133C5 /* emoji_11@2x.png in Resources */,
 				E80EC88B28ACD84000D133C5 /* emoji_58@2x.png in Resources */,
-				23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */,
 				E80EC85D28ACD84000D133C5 /* emoji_06@2x.png in Resources */,
 				E80EC83428ACD84000D133C5 /* emoji_128@2x.png in Resources */,
 				E80EC81C28ACD84000D133C5 /* emoji_92@2x.png in Resources */,
@@ -10833,7 +10849,6 @@
 				E839532D276A030F00CF2F24 /* XPMineDressUpListViewController.m in Sources */,
 				E821077B2987D4AB00DE7040 /* MessageFindNewGreetModel.m in Sources */,
 				E85E7BA32A4EC99300B6D00A /* XPMineGiveDiamondDetailsVC.m in Sources */,
-				238A90072BA9729200828123 /* PIUniversalBannerView.m in Sources */,
 				E8B846D826FDE17300A777FE /* XPMineRechargeProtocol.h in Sources */,
 				E88C72A6282921D60047FB2B /* XPRoomBackMusicPlayerView.m in Sources */,
 				E84CBCE72843807500D43221 /* XPMineFriendPresenter.m in Sources */,
@@ -10869,7 +10884,6 @@
 				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 */,
@@ -10975,6 +10989,7 @@
 				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 */,
@@ -11031,13 +11046,13 @@
 				23194DCD2AD14BF000649F51 /* DDASLLogger.m in Sources */,
 				E85E7B492A4EB0D300B6D00A /* XPMineGuildSearchViewController.m in Sources */,
 				9B86D88328192DC000494FCD /* XPRoomRankEntranceView.m in Sources */,
-				238A900A2BA9756600828123 /* PIUniversalBannerModel.m in Sources */,
 				E85E7B012A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m in Sources */,
 				18F404B7276095D700A6C548 /* SessionChatLimitView.m in Sources */,
 				E8788942273A55AD00BF1D57 /* XPGiftUsersView.m in Sources */,
 				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 */,
@@ -11117,9 +11132,7 @@
 				E8998D8B2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m in Sources */,
 				E8DEC9A42764A6600078CB70 /* XPMoreMenuPresenter.m in Sources */,
 				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 */,
@@ -11178,7 +11191,6 @@
 				E81C27AB26EF2D920031E639 /* ThirdUserInfo.m in Sources */,
 				23FF25682ABC3BC00064E904 /* XPHomeGameCell.m in Sources */,
 				E8788950273A699900BF1D57 /* ThemeColor+SendGift.m in Sources */,
-				23B8D8D82B85F8B900CA472F /* PIHoemCategoryTitleCell.m in Sources */,
 				E81C279D26EEEC620031E639 /* YUMIConstant.m in Sources */,
 				238B37AF2AC55A2C00BFC9D5 /* XPTreasureFairyViewController.m in Sources */,
 				238B37DB2AC55A2C00BFC9D5 /* PITreasureFairyBuyElfShardSuccessView.m in Sources */,
@@ -11292,7 +11304,6 @@
 				1464C5F329A4C18000AF7C94 /* XPIAPRechargeViewController.m in Sources */,
 				E85E7B662A4EC35A00B6D00A /* XPIncomeRecordGoldDetailsModel.m in Sources */,
 				9B2EA7CC2804245500ED17BF /* XPAnchorPKPanelUserView.m in Sources */,
-				23EE970A2BA2D39C00475D69 /* PIWebViewSavePhotoView.m in Sources */,
 				2331C1B42A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.m in Sources */,
 				9B85B6DA279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.m in Sources */,
 				E85E7B0D2A4EB0D200B6D00A /* GuildSuperAdminInfoModel.m in Sources */,
@@ -11325,6 +11336,7 @@
 				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 */,
@@ -11338,6 +11350,7 @@
 				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 */,
@@ -11371,6 +11384,7 @@
 				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 */,
@@ -11383,7 +11397,6 @@
 				E8998D8028597B0300C68558 /* XPRoomLuckyBigPrizeView.m in Sources */,
 				E88E4A80297673DC00019A50 /* SessionNavLiveView.m in Sources */,
 				E81060DC298761F100B772F0 /* MessageTextModel.m in Sources */,
-				23C9DFC62B84903500B51558 /* PIRoomActivityChoosePlayView.m in Sources */,
 				235A45232B04BEB6009753F5 /* PIBaseModel.m in Sources */,
 				E8DEC9A82764A68B0078CB70 /* Api+MoreMenu.m in Sources */,
 				9B86D87A2817DD8400494FCD /* XPRoomEnterHideTipView.m in Sources */,
@@ -11456,7 +11469,6 @@
 				18F403EE2758CF2F00A6C548 /* MessageContentImage.m in Sources */,
 				238B37A32AC55A2C00BFC9D5 /* XPTreasureFailyPresenter.m in Sources */,
 				18E7B31E26F0984C0064BC9B /* UserLevelVo.m in Sources */,
-				23B8D8DB2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m in Sources */,
 				2331C1762A5EB71000E1D940 /* ThemeColor+NobleCenter.m in Sources */,
 				1427218C29A75F6F00C7C423 /* HTTPAsyncFileResponse.m in Sources */,
 				E8DD25DA295583920043C7D5 /* XPAnchorRandomPKRuleView.m in Sources */,
@@ -11616,7 +11628,6 @@
 				E84150C227747BF700A7F548 /* FirstRechargeModel.m in Sources */,
 				9B1EF3D227E81C0600554295 /* XPMineDressUpBubbleViewController.m in Sources */,
 				2331C1AB2A60F32D00E1D940 /* CandyTreeResultModel.m in Sources */,
-				23C9DFC32B84807A00B51558 /* PIRoomActivityClickView.m in Sources */,
 				1427218B29A75F6F00C7C423 /* HTTPFileResponse.m in Sources */,
 				E839533C276A0CCD00CF2F24 /* XPMineCarTableViewCell.m in Sources */,
 				2331C1B62A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.m in Sources */,
@@ -11660,6 +11671,7 @@
 				E8098CAA282E03B40090B9F0 /* XPMonentsRecommendPresenter.m in Sources */,
 				E8F63CBB298B648300B338BA /* SessionSayHelloListModel.m in Sources */,
 				9B1B729828002147003FACE9 /* XPMineFansTeamPresenter.m in Sources */,
+				E85E7B1E2A4EB0D200B6D00A /* XPMineAnchorIncomeStatisViewController.m in Sources */,
 				23FF42702AA6C7CF0055733C /* XPNewHomeItemCell.m in Sources */,
 				E87DF4DA2A42C9D9009C1185 /* HomeCollectRoomModel.m in Sources */,
 				E86507E8281A8212006951B0 /* ContentTweetModel.m in Sources */,
@@ -11691,7 +11703,6 @@
 				E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */,
 				E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */,
 				9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */,
-				23B8D8DE2B860B8800CA472F /* PIHoemCategoryCollectionView.m in Sources */,
 				9BE01AE728938AB600B50299 /* XPDressUpShopCardTableViewCell.m in Sources */,
 				E82E75062828E76400C25EF7 /* XPCoreDataManager.m in Sources */,
 				9B8DE0E4289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m in Sources */,
@@ -11773,7 +11784,6 @@
 				E873EB02280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m in Sources */,
 				E872309326E8D31500B90D4F /* LoginVerifCodeView.m in Sources */,
 				E82107872987E49100DE7040 /* MessageRedPacketModel.m in Sources */,
-				23B8D8E12B87715100CA472F /* PIGeneralPublicScreenModel.m in Sources */,
 				23194DD52AD292F200649F51 /* PIPageControl.m in Sources */,
 				23E9EA9E2A84C42B00B792F2 /* SGYProgressView.m in Sources */,
 				E87E91552796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m in Sources */,
@@ -12207,7 +12217,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.14;
+				MARKETING_VERSION = 20.20.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12243,7 +12253,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.14;
+				MARKETING_VERSION = 20.20.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -10,8 +10,6 @@
 #import <NIMSDK/NIMSDK.h>
 #import <ShareSDK/ShareSDK.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
-#import <UserNotifications/UserNotifications.h>
-#import <MOBFoundation/MobSDK+Privacy.h>
 ///Tool
 #import "YUMIConstant.h"
 #import "CustomAttachmentDecoder.h"
@@ -25,8 +23,6 @@
 #import "XCCurrentVCStackManager.h"
 #import "ClientConfig.h"
 #import <Adjust/Adjust.h>
-#import <UserNotifications/UserNotifications.h>
-
 
 #import <Bugly/Bugly.h>
 
@@ -48,24 +44,6 @@ UIKIT_EXTERN NSString * adImageName;
 	[self initEmojiData];
     [self configAdjust];
     [self configBugly];
-    [self registerNot];
-}
--(void)registerNot{
-    if (@available(iOS 10.0, *)) {
-                UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-                [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
-                    if (granted) {
-                        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-                            if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
-                                dispatch_async(dispatch_get_main_queue(), ^{
-                                    [[UIApplication sharedApplication] registerForRemoteNotifications];
-                                });
-                            }
-                        }];
-                    }
-                }];
-            }
-   
 }
 /**
  崩溃收集 Bugly
@@ -95,15 +73,7 @@ UIKIT_EXTERN NSString * adImageName;
 	//推荐在程序启动的时候初始化 NIMSDK
 	NSString *appKey        = KeyWithType(KeyType_NetEase);
 	NIMSDKOption *option    = [NIMSDKOption optionWithAppKey:appKey];
-#ifdef DEBUG
-    option.apnsCername = @"pikoDevelopPush";
-#else
     option.apnsCername = @"newPiko";
-#endif
- 
-    
-
-    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -145,14 +115,6 @@ UIKIT_EXTERN NSString * adImageName;
 //		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
 		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
 	}];
-    NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"];
-    if (isUpload == nil){
-        [MobSDK uploadPrivacyPermissionStatus:YES onResult:^(BOOL success) {
-            
-        }];
-        [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    }
 }
 
 #pragma mark - 表情

YuMi/Appdelegate/AppDelegate.m

@@ -5,8 +5,6 @@
 //  Created by admin on 2023/3/9.
 //
 
-#import <MobLinkPro/MobLink.h>
-#import <MobLinkPro/MLSDKScene.h>
 #import "AppDelegate.h"
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
@@ -22,12 +20,10 @@
 #import "XPLoginViewController.h"
 #import "AccountModel.h"
 #import "YuMi-swift.h"
-#import "SessionViewController.h"
-#import "LoginFullInfoViewController.h"
 @import Firebase;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
-@interface AppDelegate ()<IMLSDKRestoreDelegate>
+@interface AppDelegate ()
 
 @end
 
@@ -62,19 +58,12 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 	}
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
     [FIRApp configure];
-    [MobLink setDelegate:self];
-
+   
    
     return YES;
 }
 
-- (void) IMLSDKWillRestoreScene:(MLSDKScene *)scene Restore:(void (^)(BOOL, RestoreStyle))restoreHandler
-{
-   
 
-    restoreHandler(YES, MLDefault);
-
-}
 
 
 
@@ -113,37 +102,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 - (void)application:(UIApplication *)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 	// 上传devicetoken至云信服务器。
-	[[NIMSDK sharedSDK] updateApnsToken:deviceToken ];
-}
-
-- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
-   
-    NSString *data = userInfo[@"data"];
-    if(data){
-        NSDictionary *dataDic = [data mj_JSONObject];
-        NSString *userId = dataDic[@"uid"];
-        if(userId){
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
-            ClientConfig *config = [ClientConfig shareConfig];
-            config.pushChatId = userId;
-           
-            });
-            return;
-        }
-    }
-    
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        NSString *userId = userInfo[@"uid"];
-        if(userId){
-            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
-            ClientConfig *config = [ClientConfig shareConfig];
-            config.pushChatId = userId;
-        }
-       });
-   
-   
-    
+	[[NIMSDK sharedSDK] updateApnsToken:deviceToken];
 }
 
 ///URL Scheme跳转
@@ -177,12 +136,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
                 [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":uid}];
                 ClientConfig *config = [ClientConfig shareConfig];
                 config.chatId = uid;
-            }else if (type == 8){
-                NSString *inviteCode = paramsDict[@"inviteCode"];
-                if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
-                    ClientConfig *config = [ClientConfig shareConfig];
-                    config.inviteCode = inviteCode;
-                }
             }
             return YES;
         }

YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "1024＊1024.png",
+      "filename" : "1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

YuMi/Assets.xcassets/webView/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/webView/pi_webView_code_bottom.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_webView_code_bottom@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_webView_code_bottom@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/webView/pi_webView_code_btn_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_webView_code_btn_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_webView_code_btn_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/webView/pi_webView_code_code_text.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_webView_code_code_text@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_webView_code_code_text@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/webView/pi_webView_code_top.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_webView_code_top@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_webView_code_top@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_webView_code_top_text@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_webView_code_top_text@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/webView/share_save_icon.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "share_save_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "share_save_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/yna/Activity/pi_room_activity_click_arrow.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_room_activity_click_arrow@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_room_activity_click_arrow@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/yna/Broadcast/pi_room_activity_choose_play_arrow.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_room_activity_choose_play_arrow@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_room_activity_choose_play_arrow@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Config/ClientConfig.h

@@ -29,10 +29,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *__nullable roomId;
 ///用户id，用于外部h5跳转到聊天页面
 @property (nonatomic, copy) NSString *__nullable chatId;
-///用户id，推送跳转到聊天页面
-@property (nonatomic, copy) NSString *__nullable pushChatId;
-///邀请码，从外面进来会进入注册页面，并自动填写这个邀请码
-@property(nonatomic,copy) NSString *inviteCode;
 ///表情---
 @property (nonatomic, copy) NSString *version;
 @property (nonatomic, copy) NSString *zipMd5;

YuMi/CustomUI/ShareView/Model/XPShareItem.h

@@ -26,13 +26,9 @@ typedef enum : NSUInteger {
 	XPShareItemTagCopyLink,
 	///应用好友
 	XPShareItemTagAppFriends,
-    ///保存到相册
-    XPShareItemTagAppSaveAlbum,
 } XPShareItemTag;
 
 @interface XPShareItem : NSObject
-@property(nonatomic,assign) BOOL isShareInvite;
-@property (nonatomic, copy) NSString *inviteTitle;
 @property (nonatomic, copy) NSString *title;
 @property (nonatomic, copy) NSString *imageName;
 @property (nonatomic, copy) NSString *disableImageName;

YuMi/CustomUI/ShareView/XPShareView.h

@@ -12,8 +12,6 @@
 
 @class XPShareView;
 @protocol XCShareViewDelegate <NSObject>
-///点击保存图片到相册
-- (void)shareView:(XPShareView *)shareView savePhoto:(XPShareInfoModel *)shareInfo;
 ///点了取消分享
 - (void)shareViewDidClickCancel:(XPShareView *)shareView;
 ///分享成功

YuMi/CustomUI/ShareView/XPShareView.m

@@ -143,13 +143,6 @@
         [TTPopup dismiss];
         return;
     };
-    if (item.type == XPShareItemTagAppSaveAlbum){
-        [TTPopup dismiss];
-        if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:savePhoto:)]){
-            [self.delegate shareView:self savePhoto:self.shareInfo];
-        }
-        return;
-    }
     if (item.type == XPShareItemTagAppFriends) {
         [TTPopup dismiss];
         XPMineShareViewController * shareVC = [[XPMineShareViewController alloc] init];
@@ -194,14 +187,22 @@
         if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:didSuccess:)]) {
             [self.delegate shareView:self didSuccess:self.shareInfo];
         }
-        return;
-
+        
+//        FBtype = PlatformOfLine;
+//        [shareParams SSDKSetupLineParamsByText:encodedUrl image:nil type:SSDKContentTypeAuto];
+    } else {
+        title = YMLocalizedString(@"XPShareView3");
+        platformType = SSDKPlatformTypeFacebook;
+        FBtype = PlatformOfFB;
+        content = YMLocalizedString(@"XPShareView4");
+        [shareParams SSDKSetupFacebookParamsByText:title image:@"https://pic.lecheng163.com/ananLogo256.png" url:[NSURL URLWithString:urlString] urlTitle:@"title" urlName:@"name" attachementUrl:nil hashtag:@"#Piko" quote:@"Piko" shareType:SSDKFacebookShareTypeNative type:SSDKContentTypeWebPage];
     }
-      if(item.type == XPShareItemTagFaceBook){
+    if(item.type == XPShareItemTagFaceBook){
         FBSDKShareLinkContent*linkContent = [[FBSDKShareLinkContent alloc]init];
         urlString = [urlString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
         linkContent.contentURL= [NSURL URLWithString:urlString];
         linkContent.quote = content;
+            
         FBSDKShareDialog *shareDialog = [[FBSDKShareDialog alloc]initWithViewController:[XCCurrentVCStackManager shareManager].getCurrentVC content:linkContent delegate:self];
         // 需要指定模式，否则会调起web分享
         shareDialog.mode = FBSDKShareDialogModeNative;

YuMi/CustomUI/UIImage/UIImage+Utils.h

@@ -52,5 +52,5 @@ typedef NS_ENUM(NSUInteger, GradientType) {
 
 -(UIImage *)compressWithMaxLength:(NSUInteger)maxLength;
 - (UIImage *)roundedImageWithCornerRadius:(CGFloat)cornerRadius size:(CGSize)size;
-+(UIImage *)getImageFromView:(UIView *)view;
+
 @end

YuMi/CustomUI/UIImage/UIImage+Utils.m

@@ -432,23 +432,4 @@
    UIGraphicsEndImageContext();
    return roundedImage;
 }
-+(UIImage *)getImageFromView:(UIView *)view {
-// 1. 创建一个新的图像上下文，大小与view的bounds相匹配
-UIGraphicsBeginImageContextWithOptions(view.bounds.size, view.opaque, 0.0);
-
-// 2. 获取当前图像上下文
-CGContextRef context = UIGraphicsGetCurrentContext();
-
-// 3. 将view的层级渲染到上下文中
-[view.layer renderInContext:context];
-
-// 4. 从上下文中获取生成的图片
-UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-
-// 5. 结束图像上下文
-UIGraphicsEndImageContext();
-
-// 6. 返回生成的图片
-return image;
-}
 @end

YuMi/CustomUI/VagueImageView/UIImage+ImageEffects.h

@@ -103,6 +103,5 @@
 - (UIImage *)applyTintEffectWithColor:(UIColor *)tintColor;
 
 - (UIImage *)applyBlurWithRadius:(CGFloat)blurRadius tintColor:(UIColor *)tintColor saturationDeltaFactor:(CGFloat)saturationDeltaFactor maskImage:(UIImage *)maskImage;
-///为图片增加毛玻璃,value模糊程度
-+(UIImage *)setBlurImage:(UIImage *)image value:(CGFloat)value;
+
 @end

YuMi/CustomUI/VagueImageView/UIImage+ImageEffects.m

@@ -273,37 +273,6 @@
 
     return outputImage;
 }
-+(UIImage *)setBlurImage:(UIImage *)image value:(CGFloat)value{
 
 
-    CIContext *context = [CIContext contextWithOptions:nil];
-    CIImage * sourceImage = [CIImage imageWithCGImage:image.CGImage];//将图片转换成CIImage
-
-    ///图片仿射滤镜
-
-    CIFilter * clamp = [CIFilter filterWithName:@"CIAffineClamp"];//设置绘制类型
-
-    [clamp setValue:sourceImage forKey:kCIInputImageKey];//设置要绘制的图片
-
-    CIImage *clampResult = [clamp valueForKey:kCIOutputImageKey];
-
-    ///高斯模糊滤镜
-
-    CIFilter* gaussianBlur = [CIFilter filterWithName:@"CIGaussianBlur"];
-
-    [gaussianBlur setValue:clampResult forKey:kCIInputImageKey];
-
-    [gaussianBlur setValue:[NSNumber numberWithFloat:value] forKey:@"inputRadius"];//设置模糊值
-
-    CIImage * gaussianBlurResult = [gaussianBlur valueForKey:kCIOutputImageKey];
-
-    ///转化获取图片
-
-    CGImageRef cgImage = [context createCGImage:gaussianBlurResult fromRect:[sourceImage extent]];
-
-    UIImage * resultImage = [UIImage imageWithCGImage:cgImage];
-    return resultImage;
- 
-}
-
 @end

YuMi/Global/YUMIConstant.m

@@ -97,7 +97,7 @@ NSString * const KeyWithType(Pi_KeyType type) {
 			@(KeyType_NTESQuickLoginBusinessId) : @"sCsa0RnuPYtEeE+efSDuHRYEfCObccfLfAK/Sn1LC8X/YifkZfyHNlCts1syZE3R",///60cdaa83aa654e5ea184de7160b4073d
             @(KeyType_TRTC)                     : @"Phn3JPi/ZvZ7zVM099Q3dg==",///1400600174
 			///h+GaKZVuHTQz0wEHbg8HLaUTL9mCjNDRcRo1OJTESWhiE/lzcnvMEv00/dxu8cOq
-			@(KeyType_NetEase)                  : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///d4d74e9ba6ac3364ccc7526ea4791215
+			@(KeyType_NetEase)                  : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///14ef7a0d0a84cb49bae1c22d78cf1ddf
 			@(keyType_YiDunBussinessId)         : @"tl2ZVgj6Mrf9lhoJ9ikxgu8tHJoloM5pxk+hsHIB4pulU6r531Qc7Ol5X8QR5Jy0",
             @(KeyType_FacePwdEncode)            : @"mjaN83evhuwnbE4yEiLQpvH7sALhxCuJ6aPjPlq5amVpHsQtSdbgri3JoHqf/I9+",///1ea53d260ecf11e7b56e00163e046a26
 			@(KeyType_GuildUidKey)              : @"umyLNHTFzWIPw2FWQcYIeQ==",

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"2.6.4"
+#define PI_App_Version @"2.5.1"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"

YuMi/Modules/YMLogin/View/LoginFullInfoViewController.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface LoginFullInfoViewController : MvpViewController
-@property(nonatomic,copy) NSString *inviteCode;
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m

@@ -24,7 +24,7 @@
 #import "LoginFullInfoPresenter.h"
 #import "LoginFullInfoProtocol.h"
 #import "PILoginManager.h"
-#import "ClientConfig.h"
+
 
 @interface LoginFullInfoViewController ()<LoginFullInfoProtocol>
 
@@ -81,11 +81,6 @@
 	[self initSubViews];
 	[self initSubViewConstraints];
 	[self initEvents];
-    ClientConfig *config = [ClientConfig shareConfig];
-    if (config.inviteCode.length > 0){
-        self.inviteCode = config.inviteCode;
-        config.inviteCode = @"";
-    }
 }
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
@@ -231,10 +226,7 @@
 	}];
 
 }
-- (void)setInviteCode:(NSString *)inviteCode{
-    _inviteCode = inviteCode;
-    self.codeTextField.text = _inviteCode;
-}
+
 ///更新用户信息
 - (void)updateUserInfo {
     [XNDJTDDLoadingTool showOnlyView:self.view];

YuMi/Modules/YMMessage/Model/AttachmentModel.h

@@ -96,7 +96,8 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_Gift_Compound = 93,
 	///涂鸦礼物
 	CustomMessageType_Graffiti_Gift = 94,
-	
+	///星级厨房飘屏
+	CustomMessageType_Graffiti_Star_Kitchen = 95,
     ///免费礼物倒计时重置时间
     CustomMessageType_Free_Gift_Star_Reset_Time = 96,
     ///精灵密藏
@@ -109,14 +110,6 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_Common_H5 = 100,
     ///房间相册
     CustomMessageType_Room_Album = 101,
-    ///守护星球
-    CustomMessageType_Guardian_Planet = 102,
-    ///通用公屏信息
-    CustomMessageType_General_Public_Screen = 103,
-    ///疯狂动物园飘屏
-    CustomMessageType_Graffiti_Star_Kitchen = 104,
-    ///通用飘屏
-    CustomMessageType_General_Floating_Screen = 105,
 };
 
 
@@ -550,11 +543,12 @@ typedef NS_ENUM(NSUInteger, CustomMessageGraffitiGift) {
 
 //first = CustomMessageType_Graffiti_Star_Kitchen
 typedef NS_ENUM(NSUInteger, CustomMessageGraffitiStarKitchen) {
-
+	/// // 星级厨房礼物房间飘屏通知
+	Custom_Message_Sub_Star_Kitchen_Room = 950,
 	/// // 星级厨房礼物全服飘屏通知
-	Custom_Message_Sub_Star_Kitchen_Server = 1041,
+	Custom_Message_Sub_Star_Kitchen_Server = 951,
     /// // 星级厨房礼物全服飘屏通知
-    Custom_Message_Sub_Star_Kitchen_FullScreen = 1042,
+    Custom_Message_Sub_Star_Kitchen_FullScreen = 952,
 };
 ///夺宝精灵 CustomMessageType_Treasure_Fairy = 97,
 typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) {
@@ -622,26 +616,6 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeRoomAlbum) {
     ///所有房间
     Custom_Message_Sub_Room_Album = 1011,
 };
-//CustomMessageType_Guardian_Planet = 102,
-typedef NS_ENUM(NSUInteger, CustomMessageTypeGuardianPlanet) {
-    ///所有房间
-    Custom_Message_Sub_Guardian_Planet_One_Room = 1021,//单房间
-    Custom_Message_Sub_Guardian_Planet_All_Room = 1022,///全部房间
-};
-///通用公屏信息
-//CustomMessageType_General_Public_Screen = 10000,
-typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralPublicScreen) {
-    ///所有房间
-    Custom_Message_Sub_General_Public_Screen_One_Room = 1031,//单房间
-    Custom_Message_Sub_General_Public_Screen_All_Room = 1032,///全部房间
-};
-///通用飘屏
-//CustomMessageType_General_Floating_Screen = 105,
-typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralFloatingScreen) {
-    ///所有房间
-    Custom_Message_Sub_General_Floating_Screen_One_Room = 1051,//单房间
-    Custom_Message_Sub_General_Floating_Screen_All_Room = 1052,///全部房间
-};
 @interface AttachmentModel : PIBaseModel<NIMCustomAttachment>
 @property (nonatomic,assign) int first;
 @property (nonatomic,assign) int second;

YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m

@@ -71,7 +71,7 @@
     
     
     CGFloat desHeight = [model.desc boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin
-                                            attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height + 10;
+                                            attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height;
     [self.subTitleLabel mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(desHeight);
     }];

YuMi/Modules/YMMessage/View/Session/SessionViewController.m

@@ -203,7 +203,7 @@
 - (void)loadAlbumPhotos {
 	@kWeakify(self);
 	[YYUtility checkAssetsLibrayAvailable:^{
-	
+		@kStrongify(self);
 
 	} denied:^{
 
@@ -764,8 +764,6 @@
     [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
         if(code == 200){
             NIMMessage *message = [NIMMessageMaker msgWithText:text];
-            message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
-                                  };
             [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
             return;
         }
@@ -779,8 +777,6 @@
     [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
         if(code == 200){
             NIMMessage *message = [NIMMessageMaker msgWithAudio:recordPath];
-            message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
-                                  };
             [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
             return;
         }
@@ -797,8 +793,6 @@
                 if(code == 200){
                     // 构造出具体会话
                     NIMMessage * message = [NIMMessageMaker msgWithImage:obj];
-                    message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
-                                          };
                     // 发送消息
                     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
                     return;
@@ -991,9 +985,7 @@
 	[TTPopup alertWithConfig:config confirmHandler:^{
 		NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
 		if ([[UIApplication sharedApplication] canOpenURL:url]) {
-            [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
-                
-            }];
+			[[UIApplication sharedApplication] openURL:url];
 		}
 	} cancelHandler:^{
 	}];
@@ -1065,8 +1057,6 @@
 		NIMMessage * message = [NIMMessageMaker msgWithImage:image];
         [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
             if(code == 200){
-                message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
-                                      };
                 [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
                 [view resetChoosePhotos];
                 return;
@@ -1101,8 +1091,6 @@
             if(code == 200){
                 // 构造出具体会话
                 NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto];
-                message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
-                                      };
                 // 发送消息
                 [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
                 return;

YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.h

@@ -145,10 +145,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// 家族个播收入列表
 /// @param completion 完成
 /// @param uid 用户的uid
-/// @param hallId 家族的id
+/// @param clanId 家族的id
 /// @param startTime 开始时间
 /// @param endTime 结束时间
-+ (void)getClanSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid hallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime;
++ (void)getClanSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid clanId:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime;
 
 /// 公会个播收入列表
 /// @param completion 完成

YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.m

@@ -183,8 +183,8 @@
 /// @param clanId 家族的id
 /// @param startTime 开始时间
 /// @param endTime 结束时间
-+ (void)getClanSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid hallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime {
-	[self makeRequest:@"income/singleroom/incomeTotalV2" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, hallId, startTime, endTime, nil];
++ (void)getClanSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid clanId:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime {
+	[self makeRequest:@"income/singleroom/incomeTotalV2" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, clanId, startTime, endTime, nil];
 }
 
 /// 公会个播收入列表

YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.h

@@ -51,8 +51,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) NSString *anchorDiamondNum;
 ///房间收入
 @property (nonatomic,copy) NSString *roomDiamondNum;
-
-@property(nonatomic,assign) NSInteger timeDuration;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.m

@@ -55,7 +55,7 @@
 		[[self getView] getClanAnchorTotalIncomeSuccess:incomeModel];
 	} fail:^(NSInteger code, NSString * _Nullable msg) {
 		[[self getView] getClanAnchorTotalIncomeFail:msg];
-	}] uid:uid hallId:clanId startTime:startTime endTime:endTime];
+	}] uid:uid clanId:clanId startTime:startTime endTime:endTime];
 }
 
 /// 获取公会所有个播的收入记录

YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.h

@@ -1,16 +0,0 @@
-//
-//  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

YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.m

@@ -1,162 +0,0 @@
-//
-//  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;
-        NSInteger h = _userInfo.timeDuration / 60;
-        NSInteger min = _userInfo.timeDuration % 60;
-        if(h <= 0){
-            self.timeView.text = [NSString stringWithFormat:@"%ldmin",_userInfo.timeDuration];
-        }else if(min <= 0 && h > 0){
-            self.timeView.text = [NSString stringWithFormat:@"%ldh",h];
-        }else{
-            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

YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineAnchorIncomeStatisViewController.h

@@ -0,0 +1,17 @@
+//
+//  XPMineAnchorIncomeStatisViewController.h
+//  YuMi
+//
+//  Created by YuMi on 2022/4/11.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XPMineAnchorIncomeStatisViewController : BaseViewController
+///家族的id
+@property (nonatomic,copy) NSString *clanId;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineAnchorIncomeStatisViewController.m

@@ -0,0 +1,148 @@
+//
+//  XPMineAnchorIncomeStatisViewController.m
+//  YuMi
+//
+//  Created by YuMi on 2022/4/11.
+// 家族个播收入统计
+
+#import "XPMineAnchorIncomeStatisViewController.h"
+///Third
+#import <Masonry/Masonry.h>
+#import <JXCategoryView/JXCategoryView.h>
+#import <JXCategoryView/JXCategoryIndicatorBackgroundView.h>
+#import <JXCategoryView/JXCategoryListContainerView.h>
+///Tool
+
+#import "DJDKMIMOMColor.h"
+///View
+#import "XPMineGuildIncomeRecordViewController.h"
+
+@interface XPMineAnchorIncomeStatisViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate>
+///分页标题
+@property (nonatomic, strong) NSArray<NSString *> *titles;
+///分页控件
+@property (nonatomic, strong) JXCategoryTitleView *titleView;
+///分页lineView
+@property (nonatomic, strong) JXCategoryListContainerView *contentView;
+///日
+@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *dayRecordVC;
+///周
+@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *weekRecordVC;
+@end
+
+@implementation XPMineAnchorIncomeStatisViewController
+
+- (void)viewDidLoad {
+	[super viewDidLoad];
+	self.title = YMLocalizedString(@"XPMineAnchorIncomeStatisViewController0");
+	[self initSubViews];
+	[self initSubViewConstraints];
+}
+
+#pragma mark - Private Method
+- (void)initSubViews {
+	[self.view addSubview:self.titleView];
+	[self.view addSubview:self.contentView];
+}
+
+- (void)initSubViewConstraints {
+	[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.top.mas_equalTo(self.view).offset(10);
+		make.left.right.mas_equalTo(self.view);
+		make.height.mas_equalTo(30);
+	}];
+	
+	[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.top.mas_equalTo(self.titleView.mas_bottom);
+		make.left.right.bottom.mas_equalTo(self.view);
+	}];
+}
+
+#pragma mark - JXCategoryViewDelegate
+- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView {
+	return self.titles.count;
+}
+
+- (id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index {
+	if (index == 0) {
+		return self.dayRecordVC;
+	} else {
+		return self.weekRecordVC;
+	}
+}
+
+- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
+	if (index == 0) {
+		self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day;
+	} else {
+		self.weekRecordVC.timeType = GuildIncomeRecrdTimeType_Week;
+	}
+}
+
+#pragma mark - Getters And Setters
+- (void)setClanId:(NSString *)clanId {
+	_clanId = clanId;
+	self.dayRecordVC.clanId = _clanId;
+	self.weekRecordVC.clanId = _clanId;
+	self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day;
+}
+
+- (JXCategoryTitleView *)titleView {
+	if (!_titleView) {
+		_titleView = [[JXCategoryTitleView alloc] init];
+		_titleView.delegate = self;
+		_titleView.titles = self.titles;
+		_titleView.backgroundColor = [DJDKMIMOMColor appBackgroundColor];
+		_titleView.titleColor = [DJDKMIMOMColor secondTextColor];
+		_titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor];
+		_titleView.titleFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16];
+		_titleView.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16];
+		_titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter;
+		_titleView.contentScrollViewClickTransitionAnimationEnabled = NO;
+		_titleView.defaultSelectedIndex = 0;
+		_titleView.cellSpacing = 5;
+		_titleView.cellWidthIncrement = 5;
+		_titleView.listContainer = self.contentView;
+		
+		JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
+		lineView.indicatorColor = [DJDKMIMOMColor appMainColor];
+		lineView.indicatorWidth = 8.f;
+		lineView.indicatorHeight = 4.f;
+		lineView.indicatorCornerRadius = 2.f;
+		_titleView.indicators = @[lineView];
+	}
+	return _titleView;
+}
+
+- (JXCategoryListContainerView *)contentView {
+	if (!_contentView) {
+		_contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
+		_contentView.defaultSelectedIndex = 0;
+	}
+	return _contentView;
+}
+
+- (NSArray<NSString *> *)titles {
+	if (!_titles) {
+		_titles = @[YMLocalizedString(@"XPMineAnchorIncomeStatisViewController1"), YMLocalizedString(@"XPMineAnchorIncomeStatisViewController2")];
+	}
+	return _titles;
+}
+
+- (XPMineGuildIncomeRecordViewController *)dayRecordVC {
+	if (!_dayRecordVC) {
+		_dayRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init];
+		_dayRecordVC.incomeType = GuildIncomeType_Anchor;
+	}
+	return _dayRecordVC;
+}
+
+- (XPMineGuildIncomeRecordViewController *)weekRecordVC {
+	if (!_weekRecordVC) {
+		_weekRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init];
+		_weekRecordVC.incomeType = GuildIncomeType_Anchor;
+	}
+	return _weekRecordVC;
+}
+
+@end

YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m

@@ -32,8 +32,6 @@
 ///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;
@@ -88,12 +86,11 @@
 	} else if(self.incomeType == GuildIncomeType_Hall) {
 		[self.presenter getHallTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr];
 	} else {
-//		if (self.clanId.length > 0) {
-//            [self.presenter getHallAnchorTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr];
-//		} else {
-            [self.presenter getClanAnchorTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr];
-			
-//		}
+		if (self.clanId.length > 0) {
+			[self.presenter getClanAnchorTotalIncome:self.clanId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr];
+		} else {
+			[self.presenter getHallAnchorTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr];
+		}
 	}
 }
 #pragma mark - Private Method
@@ -171,9 +168,6 @@
 }
 
 - (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;
 }
 
@@ -195,8 +189,13 @@
 			cell.userInfo = [self.datasource safeObjectAtIndex1:indexPath.row];
 			return cell;
 		} else if(self.incomeType == GuildIncomeType_Anchor) {
-            PIGuildSingleRoomIncomeCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PIGuildSingleRoomIncomeCell class])];
+			XPGuildSingleRoomIncomeTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])];
+			if (cell == nil) {
+				cell = [[XPGuildSingleRoomIncomeTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])];
+			}
+			
 			cell.userInfo = [self.datasource safeObjectAtIndex1:indexPath.row];
+			cell.rankNumber = indexPath.row;
 			return cell;
 		}
 	}
@@ -218,7 +217,7 @@
 			sectionView.incomeType = self.incomeType;
 			return sectionView;
 		} else {
-            PIGuildAnchorIncomeSectionView * sectionView = [[PIGuildAnchorIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)];
+			XPGuildAnchorIncomeSectionView * sectionView = [[XPGuildAnchorIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)];
 			return sectionView;
 		}
 	}
@@ -329,10 +328,7 @@
 - (void)getClanAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo {
 	[self.tableView.mj_header endRefreshing];
 	self.headerView.totalIncome = incomeInfo.totalDiamond;
-    
-    
 	self.datasource = incomeInfo.incomes;
-
 	[self.tableView reloadData];
 }
 
@@ -409,7 +405,6 @@
 		[_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;
 }

YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.h

@@ -1,16 +0,0 @@
-//
-//  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

YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.m

@@ -1,91 +0,0 @@
-//
-//  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

YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m

@@ -23,6 +23,7 @@
 #import "XPMineGuildViewController.h"
 #import "XPMineGuildSearchViewController.h"
 #import "XPMineClanIncomeStatisViewController.h"
+#import "XPMineAnchorIncomeStatisViewController.h"
 #import "XPMineGuildSuperAdminSetViewController.h"
 #import "XPMineUserInfoViewController.h"
 #import "XPMineMainIncomeStatisViewController.h"

YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m

@@ -476,7 +476,7 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess;
 	self.avatarImageView.imageUrl = clanDetailInfo.hall.ownerAvatar;
 	self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildViewController6"),clanDetailInfo.hall.ownerErbanNo];
     [self.backImageView loadImageWithUrl:clanDetailInfo.hall.ownerAvatar completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
-      self.backImageView.image = [UIImage setBlurImage:image value:1];
+      self.backImageView.image = [self setBlurImage:image];
     }];
 	self.titleLabel.text = clanDetailInfo.hall.hallName;
 	if (clanDetailInfo.manageHall) {
@@ -675,7 +675,38 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess;
     managerList.guildId = self.clanDetailInfo.hall.hallId;
     [self.navigationController pushViewController:managerList animated:YES];
 }
+-(UIImage *)setBlurImage:(UIImage *)image{
 
+
+    CIContext *context = [CIContext contextWithOptions:nil];
+    CIImage * sourceImage = [CIImage imageWithCGImage:image.CGImage];//将图片转换成CIImage
+
+    ///图片仿射滤镜
+
+    CIFilter * clamp = [CIFilter filterWithName:@"CIAffineClamp"];//设置绘制类型
+
+    [clamp setValue:sourceImage forKey:kCIInputImageKey];//设置要绘制的图片
+
+    CIImage *clampResult = [clamp valueForKey:kCIOutputImageKey];
+
+    ///高斯模糊滤镜
+
+    CIFilter* gaussianBlur = [CIFilter filterWithName:@"CIGaussianBlur"];
+
+    [gaussianBlur setValue:clampResult forKey:kCIInputImageKey];
+
+    [gaussianBlur setValue:[NSNumber numberWithFloat:1] forKey:@"inputRadius"];//设置模糊值
+
+    CIImage * gaussianBlurResult = [gaussianBlur valueForKey:kCIOutputImageKey];
+
+    ///转化获取图片
+
+    CGImageRef cgImage = [context createCGImage:gaussianBlurResult fromRect:[sourceImage extent]];
+
+    UIImage * resultImage = [UIImage imageWithCGImage:cgImage];
+    return resultImage;
+ 
+}
 #pragma mark - Getters And Setters
 
 - (UIView *)navView {

YuMi/Modules/YMNewHome/Api/Api+Home.h

@@ -32,13 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
                               tabId:(NSString *)tabId
                             pageNum:(NSString *)pageNum
                            pageSize:(NSString *)pageSize;
-/// 查看推荐列表
-/// @param complection 完成
-/// @param uid 用户的uid
-/// @param tabId tabid
-/// @param pageNum 当前的页数
-/// @param pageSize 一页有多少个
-+ (void)getNewRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize;
+
 /// 搜索
 /// @param complection 完成
 /// @param key 关键字

YuMi/Modules/YMNewHome/Api/Api+Home.m

@@ -15,7 +15,7 @@
 /// @param complection 完成
 /// @param uid 用户的uid
 + (void)homeTagComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid {
-    [self makeRequest:@"home/tag" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, nil];
+    [self makeRequest:@"home/tagV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, nil];
 }
 
 /// 获取首页所有的直播tag
@@ -33,15 +33,7 @@
 + (void)getRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize {
     [self makeRequest:@"home/tab/mapV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, tabId, pageNum, pageSize, nil];
 }
-/// 查看推荐列表
-/// @param complection 完成
-/// @param uid 用户的uid
-/// @param tabId tabid
-/// @param pageNum 当前的页数
-/// @param pageSize 一页有多少个
-+ (void)getNewRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize {
-    [self makeRequest:@"home/tab/homeV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, tabId, pageNum, pageSize, nil];
-}
+
 /// 搜索
 /// @param complection 完成
 /// @param key 关键字

YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h

@@ -46,6 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 //是否为周榜top1
 @property(nonatomic,assign) BOOL isWeekTop1;
 @property(nonatomic,copy) NSString *inRoomUid;
+
 //是否在麦位
 @property(nonatomic,assign) BOOL inMic;
 ///是否在线

YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h

@@ -1,20 +0,0 @@
-//
-//  PIHomeCategoryTitleModel.h
-//  YuMi
-//
-//  Created by duoban on 2024/2/21.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface PIHomeCategoryTitleModel : NSObject
-@property(nonatomic,assign) BOOL isChecked;
-@property(nonatomic,assign) CGFloat checkedWidth;
-@property(nonatomic,assign) CGFloat noCheckedWidth;
-@property(nonatomic,copy) NSString *name;
-@property(nonatomic,copy) NSString *id;
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.m

@@ -1,12 +0,0 @@
-//
-//  PIHomeCategoryTitleModel.m
-//  YuMi
-//
-//  Created by duoban on 2024/2/21.
-//
-
-#import "PIHomeCategoryTitleModel.h"
-
-@implementation PIHomeCategoryTitleModel
-
-@end

YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h

@@ -19,7 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)homeChatPick;
 ///ip检测
 -(void)checkIpRegionAction;
-
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m

@@ -13,7 +13,6 @@
 #import "AccountInfoStorage.h"
 #import "HomeBannerInfoModel.h"
 #import "PIHomeItemModel.h"
-#import "PIHomeCategoryTitleModel.h"
 @implementation XPHomeContainerPresenter
 ///得到首页轮播图
 - (void)getHomeTopBannerList{
@@ -28,15 +27,17 @@
 
 /// 获取所有的房间的tag
 - (void)getHomeTagList {
-    NSString * uid = [AccountInfoStorage instance].getUid;
+	NSString * uid = [[AccountInfoStorage instance] getUid];
+    NSArray<HomeTagModel *> *list = [[AccountInfoStorage instance]getCurrentTagList];
+    if(list.count > 0){
+        [[self getView] getHomeTagListSuccess:list];
+    }
 	[Api homeTagComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
-		NSArray * array = [PIHomeCategoryTitleModel modelsWithArray:data.data];
-        for (PIHomeCategoryTitleModel *model in array) {
-            model.checkedWidth = [UILabel getWidthWithText:model.name height:kGetScaleWidth(44) font:kFontSemibold(16)];
-            model.noCheckedWidth = [UILabel getWidthWithText:model.name height:kGetScaleWidth(44) font:kFontRegular(14)];
+		NSArray * array = [HomeTagModel modelsWithArray:data.data];
+        [[AccountInfoStorage instance]saveTagList:array];
+        if(list.count == 0 || list.count != array.count){
+            [[self getView] getHomeTagListSuccess:array];
         }
-        [[self getView] getHomeTagListSuccess:array];
-        
 	}] uid:uid];
 }
 ///首页改版资源位

YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param tabId id
 /// @param page 当前的页数
 /// @param pageSize 一页有多少个
-- (void)getRecommendRoomList:(NSString *)tabId page:(int)page pageSize:(int)pageSize ;
+- (void)getRecommendRoomList:(NSString *)tabId page:(int)page pageSize:(int)pageSize state:(BOOL)state;
 
 
 /// 获取更多的个播房间

YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.m

@@ -20,15 +20,15 @@
 /// @param tabId id
 /// @param page 当前的页数
 /// @param pageSize 一页有多少个
-- (void)getRecommendRoomList:(NSString *)tabId page:(int)page pageSize:(int)pageSize  {
+- (void)getRecommendRoomList:(NSString *)tabId page:(int)page pageSize:(int)pageSize state:(BOOL)state {
 	NSString * uid = [AccountInfoStorage instance].getUid;
 	NSString * pageStr = [NSString stringWithFormat:@"%d", page];
 	NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize];
-	[Api getNewRecommendListComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
-		NSArray * array = [HomePlayRoomModel modelsWithArray:data.data];
-		[[self getView] getHomeRecommendRoomListSuccess:array ];
+	[Api getRecommendListComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+		NSArray * array = [HomeRecommendRoomModel modelsWithArray:data.data];
+		[[self getView] getHomeRecommendRoomListSuccess:array state:state];
 	}fail:^(NSInteger code, NSString * _Nullable msg) {
-		[[self getView] getHomeRecommendRoomListFail:msg ];
+		[[self getView] getHomeRecommendRoomListFail:msg state:state];
 	}] uid:uid tabId:tabId pageNum:pageStr pageSize:pageSizeStr];
 }
 

YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h

@@ -8,11 +8,11 @@
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
-@class PIHomeCategoryTitleModel;
+@class HomeTagModel;
 @protocol XPHomeContainerProtocol <NSObject>
 @optional
 ///获取所有的tag成功
-- (void)getHomeTagListSuccess:(NSArray<PIHomeCategoryTitleModel *> *)array;
+- (void)getHomeTagListSuccess:(NSArray<HomeTagModel *> *)array;
 ///获取首页轮播图列表成功
 - (void)getHomeTopBannerListSuccess:(NSArray*)list;
 ////首页改版资源位

YuMi/Modules/YMNewHome/Protocol/XPHomeProtocol.h

@@ -12,9 +12,9 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol XPHomeProtocol <NSObject>
 @optional
 ///首页推荐房间的
-- (void)getHomeRecommendRoomListSuccess:(NSArray *)list;
+- (void)getHomeRecommendRoomListSuccess:(NSArray *)list state:(BOOL)state;
 ///首页推荐房间失败
-- (void)getHomeRecommendRoomListFail:(NSString *)message;
+- (void)getHomeRecommendRoomListFail:(NSString *)message state:(BOOL)state;
 ///请求更多个播房成功
 - (void)getHomeMoreAnchorRoomListSuccess:(NSArray *)list;
 ///请求更多个播房失败

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface XPNewHomePartyTableViewCell : UITableViewCell
 
 @property (nonatomic,strong) HomePlayRoomModel *roomInfo;
-
+@property (nonatomic,strong) HomeRecommendRoomModel *roomInfo1;
 @property(nonatomic,weak) id<XPNewHomePartyTableViewCellDelegate>delegate;
 ///声音卡时，svga是否播放动画
 -(void)setPlaySoundStatus:(BOOL)isPlay;

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m

@@ -243,7 +243,14 @@
 -(void)setPlaySoundTime:(NSInteger)time{
     _audioView.voiceDura = @(time).stringValue;
 }
-
+- (void)setRoomInfo1:(HomeRecommendRoomModel *)roomInfo1 {
+	_roomInfo1 = roomInfo1;
+	if (_roomInfo1) {
+		
+		
+		
+	}
+}
 
 -(void)didSelectItemAction{
  

YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h

@@ -1,25 +0,0 @@
-//
-//  PIHoemCategoryCollectionView.h
-//  YuMi
-//
-//  Created by duoban on 2024/2/21.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol PIHoemCategoryCollectionViewDelegate <NSObject>
-
--(void)pi_didSelectItemAtIndex:(NSInteger)index;
-
-@end
-
-
-@interface PIHoemCategoryCollectionView : UIView
-@property(nonatomic,strong) NSMutableArray *titleList;
-@property(nonatomic,assign) NSInteger index;
-@property(nonatomic,weak) id<PIHoemCategoryCollectionViewDelegate>delegate;
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m

@@ -1,104 +0,0 @@
-//
-//  PIHoemCategoryCollectionView.m
-//  YuMi
-//
-//  Created by duoban on 2024/2/21.
-//
-
-#import "PIHoemCategoryCollectionView.h"
-#import "PIHomeCategoryTitleModel.h"
-#import "PIHoemCategoryTitleCell.h"
-@interface PIHoemCategoryCollectionView()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
-@property(nonatomic,strong) UICollectionView *pi_collectionView;
-@end
-@implementation PIHoemCategoryCollectionView
--(instancetype)initWithFrame:(CGRect)frame{
-    self = [super initWithFrame:frame];
-    if(self){
-        [self installUI];
-        [self installConstraints];
-    }
-    return self;
-}
--(void)installUI{
-    [self addSubview:self.pi_collectionView];
-}
--(void)installConstraints{
-    [self.pi_collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self);
-    }];
-}
--(void)setTitleList:(NSMutableArray *)titleList{
-    _titleList = titleList;
-    [self.pi_collectionView reloadData];
-    
-}
-#pragma mark- UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
-    return self.titleList.count;
-}
-- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
-    PIHomeCategoryTitleModel *model = [self.titleList safeObjectAtIndex1:indexPath.row];
-    CGFloat width = model.isChecked ? model.checkedWidth : model.noCheckedWidth;
-    return CGSizeMake(width + kGetScaleWidth(10), kGetScaleWidth(44));
-}
-- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
-    PIHoemCategoryTitleCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIHoemCategoryTitleCell class]) forIndexPath:indexPath];
-    PIHomeCategoryTitleModel *model = [self.titleList safeObjectAtIndex1:indexPath.row];
-    cell.tagModel = model;
-    return cell;
-}
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
-    for (PIHomeCategoryTitleModel *model in self.titleList) {
-        model.isChecked = NO;
-    }
-    PIHomeCategoryTitleModel *selectModel = [self.titleList safeObjectAtIndex1:indexPath.row];
-    selectModel.isChecked = YES;
-    [self.pi_collectionView reloadData];
-    
-    if(self.delegate && [self.delegate respondsToSelector:@selector(pi_didSelectItemAtIndex:)]){
-        [self.delegate pi_didSelectItemAtIndex:indexPath.row];
-    }
-    
-//    int i = [selectModel.id isEqualToString:@"-1"] ? 0 : 1;
-//    if(self.scrolledHandle){
-//        self.scrolledHandle(i);
-//    }
-}
-
-- (void)setIndex:(NSInteger)index{
-    _index = index;
-    for (int i = 0; i < self.titleList.count; i++) {
-        PIHomeCategoryTitleModel *model = [self.titleList safeObjectAtIndex1:i];
-        model.isChecked = NO;
-    }
-    PIHomeCategoryTitleModel *curModel = [self.titleList safeObjectAtIndex1:_index];
-    curModel.isChecked = YES;
-    [self.pi_collectionView reloadData];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.pi_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0] atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
-       });
-}
-#pragma mark - 懒加载
-- (UICollectionView *)pi_collectionView{
-    if (!_pi_collectionView) {
-        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.minimumLineSpacing = kGetScaleWidth(10);
-        layout.minimumInteritemSpacing = kGetScaleWidth(10);
-        layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
-        layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(10), 0, kGetScaleWidth(10));
-
-        _pi_collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
-        _pi_collectionView.dataSource = self;
-        _pi_collectionView.delegate = self;
-        _pi_collectionView.tag = 98777;
-        _pi_collectionView.showsVerticalScrollIndicator = NO;
-        _pi_collectionView.showsHorizontalScrollIndicator = NO;
-        _pi_collectionView.backgroundColor = [UIColor clearColor];
-        [_pi_collectionView registerClass:[PIHoemCategoryTitleCell class] forCellWithReuseIdentifier:NSStringFromClass([PIHoemCategoryTitleCell class])];
-       
-    }
-    return _pi_collectionView;
-}
-
-@end

YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.h

@@ -1,18 +0,0 @@
-//
-//  PIHoemCategoryTitleCell.h
-//  YuMi
-//
-//  Created by duoban on 2024/2/21.
-//
-
-#import <UIKit/UIKit.h>
-#import "PIHomeCategoryTitleModel.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface PIHoemCategoryTitleCell : UICollectionViewCell
-
-
-@property(nonatomic,strong) PIHomeCategoryTitleModel *tagModel;
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.m

@@ -1,67 +0,0 @@
-//
-//  PIHoemCategoryTitleCell.m
-//  YuMi
-//
-//  Created by duoban on 2024/2/21.
-//
-
-#import "PIHoemCategoryTitleCell.h"
-@interface PIHoemCategoryTitleCell()
-@property(nonatomic,strong) UIButton *titleView;
-@property(nonatomic,strong) UIImageView *lineVeiw;
-@end
-@implementation PIHoemCategoryTitleCell
--(instancetype)initWithFrame:(CGRect)frame{
-    self = [super initWithFrame:frame];
-    if(self){
-        [self installUI];
-        [self installConstraints];
-    }
-    return self;
-}
--(void)installUI{
-    [self.contentView addSubview:self.lineVeiw];
-    [self.contentView addSubview:self.titleView];
-}
--(void)installConstraints{
-    [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.centerY.trailing.equalTo(self.contentView);
-        make.height.mas_equalTo(kGetScaleWidth(22));
-    }];
-    [self.lineVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(kGetScaleWidth(36));
-        make.height.mas_equalTo(kGetScaleWidth(8));
-        make.bottom.equalTo(self.titleView.mas_bottom).mas_offset(-kGetScaleWidth(4));
-        make.trailing.equalTo(self.titleView.mas_trailing).mas_offset(-kGetScaleWidth(5));
-    }];
-}
-
--(void)setTagModel:(PIHomeCategoryTitleModel *)tagModel{
-    _tagModel = tagModel;
-    [_titleView setTitle:_tagModel.name forState:UIControlStateNormal];
-    _titleView.selected = _tagModel.isChecked;
-    _titleView.titleLabel.font = _tagModel.isChecked ? kFontSemibold(16):kFontRegular(14);
-    _lineVeiw.hidden = !_tagModel.isChecked;
-}
-
-#pragma mark - 懒加载
-- (UIImageView *)lineVeiw{
-    if(!_lineVeiw){
-        _lineVeiw = [UIImageView new];
-        _lineVeiw.image = kImage(@"home_slider_bg");
-    }
-    return _lineVeiw;
-}
-- (UIButton *)titleView{
-    if(!_titleView){
-        _titleView = [UIButton new];
-        [_titleView setTitle:YMLocalizedString(@"XPNewHomeViewController1") forState:UIControlStateNormal];
-        [_titleView setTitleColor:UIColorFromRGB(0x1F1B4F) forState:UIControlStateSelected];
-        [_titleView setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal];
-        _titleView.titleLabel.font = kFontRegular(14);
-        _titleView.userInteractionEnabled = NO;
-        
-    }
-    return _titleView;
-}
-@end

YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.h

@@ -15,7 +15,6 @@ typedef void(^ScrolledHandle)(NSInteger type);
 @interface PIHoemCategoryTitleView : JXCategoryTitleView
 @property(nonatomic,assign) NSInteger index;
 @property(nonatomic,copy) ScrolledHandle scrolledHandle;
-@property(nonatomic,strong) NSMutableArray *titleList;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m

@@ -6,11 +6,10 @@
 //
 
 #import "PIHoemCategoryTitleView.h"
-#import "PIHoemCategoryTitleCell.h"
-#import "PIHoemCategoryCollectionView.h"
-@interface PIHoemCategoryTitleView()<PIHoemCategoryCollectionViewDelegate>
-
-@property(nonatomic,strong) PIHoemCategoryCollectionView *pi_collectionView;
+@interface PIHoemCategoryTitleView()
+@property(nonatomic,strong) UIButton *fristBnt;
+@property(nonatomic,strong) UIButton *secondBnt;
+@property(nonatomic,strong) UIImageView *lineImage;
 @end
 @implementation PIHoemCategoryTitleView
 -(instancetype)initWithFrame:(CGRect)frame{
@@ -22,40 +21,122 @@
     return self;
 }
 -(void)installUI{
-    [self addSubview:self.pi_collectionView];
+    UIButton *b = [UIButton new];
+    [self addSubview:b];
+    [b mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self);
+    }];
+    [self addSubview:self.lineImage];
+    [self addSubview:self.fristBnt];
+    [self addSubview:self.secondBnt];
     
 }
 -(void)installConstraints{
 
-    [self.pi_collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self);
+    [self.fristBnt mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.leading.mas_equalTo(kGetScaleWidth(15));
+        make.centerY.equalTo(self);
+        make.height.mas_equalTo(kGetScaleWidth(22));
+    }];
+    [self.secondBnt mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.leading.equalTo(self.fristBnt.mas_trailing).mas_offset(kGetScaleWidth(24));
+        make.centerY.equalTo(self);
+        make.height.mas_equalTo(kGetScaleWidth(22));
+    }];
+    [self.lineImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(kGetScaleWidth(36));
+        make.height.mas_equalTo(kGetScaleWidth(8));
+        make.bottom.equalTo(self.fristBnt.mas_bottom).mas_offset(-kGetScaleWidth(4));
+        make.trailing.equalTo(self.fristBnt.mas_trailing);
     }];
 }
--(void)setTitleList:(NSMutableArray *)titleList{
-    _titleList = titleList;
-    self.pi_collectionView.titleList = titleList;
+-(void)chooseItem:(UIButton *)sender{
+    self.fristBnt.titleLabel.font = sender == self.fristBnt ? kFontSemibold(16):kFontRegular(14);
+    self.secondBnt.titleLabel.font = sender != self.fristBnt ? kFontSemibold(16):kFontRegular(14);
+    self.fristBnt.selected = sender == self.fristBnt;
+    self.secondBnt.selected = sender != self.fristBnt;
+    if(self.fristBnt == sender){
+
+        if(self.scrolledHandle){
+            self.scrolledHandle(0);
+        }
+        [self.lineImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(kGetScaleWidth(36));
+            make.height.mas_equalTo(kGetScaleWidth(8));
+            make.bottom.equalTo(self.fristBnt.mas_bottom).mas_offset(-kGetScaleWidth(4));
+            make.trailing.equalTo(self.fristBnt.mas_trailing);
+        }];
+        return;
+    }
+
+    if(self.scrolledHandle){
+        self.scrolledHandle(1);
+    }
+    [self.lineImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(kGetScaleWidth(36));
+        make.height.mas_equalTo(kGetScaleWidth(8));
+        make.bottom.equalTo(self.secondBnt.mas_bottom).mas_offset(-kGetScaleWidth(4));
+        make.trailing.equalTo(self.secondBnt.mas_trailing);
+        
+    }];
 }
-
-
 - (void)setIndex:(NSInteger)index{
     _index = index;
-    self.pi_collectionView.index = _index;
-}
-#pragma mark - PIHoemCategoryCollectionViewDelegate
-- (void)pi_didSelectItemAtIndex:(NSInteger)index{
-    if(self.scrolledHandle){
-        self.scrolledHandle(index);
+    self.fristBnt.titleLabel.font = _index == 0 ? kFontSemibold(16):kFontRegular(14);
+    self.secondBnt.titleLabel.font = _index == 1 ? kFontSemibold(16):kFontRegular(14);
+    self.fristBnt.selected = _index == 0;
+    self.secondBnt.selected = _index == 1;
+    if(_index == 0){
+        [self.lineImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(kGetScaleWidth(36));
+            make.height.mas_equalTo(kGetScaleWidth(8));
+            make.bottom.equalTo(self.fristBnt.mas_bottom).mas_offset(-kGetScaleWidth(4));
+            make.trailing.equalTo(self.fristBnt.mas_trailing);
+        }];
+        return;
     }
+    [self.lineImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(kGetScaleWidth(36));
+        make.height.mas_equalTo(kGetScaleWidth(8));
+        make.bottom.equalTo(self.secondBnt.mas_bottom).mas_offset(-kGetScaleWidth(4));
+        make.trailing.equalTo(self.secondBnt.mas_trailing);
+        
+    }];
 }
 #pragma mark - 懒加载
-- (PIHoemCategoryCollectionView *)pi_collectionView{
-    if (!_pi_collectionView) {
-
-        _pi_collectionView = [[PIHoemCategoryCollectionView alloc] initWithFrame:CGRectZero ];
-        _pi_collectionView.delegate = self;
-
+- (UIButton *)fristBnt{
+    if(!_fristBnt){
+        _fristBnt = [UIButton new];
+        [_fristBnt setTitle:YMLocalizedString(@"XPNewHomeViewController0") forState:UIControlStateNormal];
+        [_fristBnt setTitleColor:UIColorFromRGB(0x1F1B4F) forState:UIControlStateSelected];
+        [_fristBnt setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal];
+        _fristBnt.selected = YES;
+        _fristBnt.titleLabel.font = kFontSemibold(16);
+        [_fristBnt addTarget:self action:@selector(chooseItem:) forControlEvents:UIControlEventTouchUpInside];
+        [_fristBnt setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
     }
-    return _pi_collectionView;
+    return _fristBnt;
+}
+
+- (UIButton *)secondBnt{
+    if(!_secondBnt){
+        _secondBnt = [UIButton new];
+        [_secondBnt setTitle:YMLocalizedString(@"XPNewHomeViewController1") forState:UIControlStateNormal];
+        [_secondBnt setTitleColor:UIColorFromRGB(0x1F1B4F) forState:UIControlStateSelected];
+        [_secondBnt setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal];
+        _secondBnt.titleLabel.font = kFontRegular(14);
+        [_secondBnt addTarget:self action:@selector(chooseItem:) forControlEvents:UIControlEventTouchUpInside];
+        [_secondBnt setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
+        
+    }
+    return _secondBnt;
+}
+- (UIImageView *)lineImage{
+    if(!_lineImage){
+        _lineImage = [UIImageView new];
+        _lineImage.image = kImage(@"home_slider_bg");
+    }
+    return _lineImage;
 }
 //- (void)layoutSubviews{
 //    [super layoutSubviews];
@@ -64,7 +145,7 @@
 //    //如果向下取整导致了你的页面异常，请自己重新设置JXCategoryView的高度，保证为整数即可。
 //
 //        CGRect targetFrame = CGRectMake(0, 0, self.bounds.size.width - kGetScaleWidth(159), floor(self.bounds.size.height));
-//        self.pi_collectionView.frame = targetFrame;
+//        self.collectionView.frame = targetFrame;
 //    
 //   
 //}

YuMi/Modules/YMNewHome/View/XPHomePartyViewController.h

@@ -7,7 +7,6 @@
 
 #import "MvpViewController.h"
 #import <JXPagingView/JXPagerView.h>
-#import "PIHomeCategoryTitleModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 
@@ -15,12 +14,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface XPHomePartyViewController : MvpViewController<JXPagerViewListViewDelegate>
 @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView);
+///模块的 ID
+@property (nonatomic,copy) NSString *pi_tabId;
+///是否是个播
+@property (nonatomic,assign) BOOL isAnchor;
+@property(nonatomic,copy) HeaderRefreshComplete refreshComplete;
 
-@property(nonatomic,strong) PIHomeCategoryTitleModel *tagModel;
-
-
-
-
+- (void)headerRefresh;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m

@@ -54,7 +54,6 @@
 
 	
 }
-
 #pragma mark - Private Method
 - (void)initSubViews {
 	self.view.backgroundColor = [UIColor clearColor];
@@ -65,11 +64,6 @@
 	[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.edges.mas_equalTo(self.view);
 	}];
-    MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(fooderRefresh)];
-    footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor];
-    footer.stateLabel.font = [UIFont systemFontOfSize:10.0];
-    self.collectionView.mj_footer = footer;
-    
 }
 
 
@@ -77,23 +71,12 @@
 
 #pragma mark - 刷新的fangfa
 - (void)headerRefresh {
-    if([self.tagModel.id isEqualToString:@"-1"]){
-        [self.presenter getHomePersonalRoomList];
-    }else{
-        self.page = 1;
-        [self.presenter getRecommendRoomList:self.tagModel.id page:self.page pageSize:20];
-    }
+	
+    [self.presenter getHomePersonalRoomList];
+	
 }
 
--(void)fooderRefresh{
-    if([self.tagModel.id isEqualToString:@"-1"]){
-        [self.collectionView.mj_footer endRefreshing];
-       
-    }else{
-        self.page++;
-        [self.presenter getRecommendRoomList:self.tagModel.id page:self.page pageSize:20];
-    }
-}
+
 
 #pragma mark - UICollectionViewDelegate And UICollectionViewDataSource
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
@@ -133,7 +116,9 @@
 
 #pragma mark - XPHomeProtocol
 - (void)getHomePersonalRoomListSuccess:(NSArray *)list{
-    [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil];
+    if(self.refreshComplete){
+        self.refreshComplete();
+    }
     for (HomePlayRoomModel *model in list) {
         model.width = [UILabel getWidthWithText:@(model.onlineNum).stringValue height:kGetScaleWidth(12) font:kFontBold(10)]+1;
     }
@@ -141,27 +126,11 @@
     [self.collectionView reloadData];
 }
 - (void)getHomePersonalRoomListFail{
-    [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil];
+    if(self.refreshComplete){
+        self.refreshComplete();
+    }
 }
 
-- (void)getHomeRecommendRoomListSuccess:(NSArray *)list{
-    [self.collectionView.mj_footer endRefreshing];
-    for (HomePlayRoomModel *model in list) {
-        model.width = [UILabel getWidthWithText:@(model.onlineNum).stringValue height:kGetScaleWidth(12) font:kFontBold(10)]+1;
-    }
-    if(self.page == 1){
-        self.datasource = [NSMutableArray arrayWithArray:list];
-    }else{
-        [self.datasource addObjectsFromArray:list];
-    }
-    [self.collectionView reloadData];
-    [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil];
-}
-
-- (void)getHomeRecommendRoomListFail:(NSString *)message{
-    [self.collectionView.mj_footer endRefreshing];
-    [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil];
-}
 #pragma mark - JXPagingViewListViewDelegate
 - (UIScrollView *)listScrollView {
     return self.collectionView;
@@ -183,8 +152,16 @@
 
 #pragma mark - Getters And Setters
 
--(void)setTagModel:(PIHomeCategoryTitleModel *)tagModel{
-    _tagModel = tagModel;
+- (void)setIsAnchor:(BOOL)isAnchor {
+	_isAnchor = isAnchor;
+	if (_isAnchor) {
+		dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+			[self headerRefresh];
+		});
+	}
+}
+- (void)setPi_tabId:(NSString *)pi_tabId{
+    _pi_tabId = pi_tabId;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self headerRefresh];
     });
@@ -192,7 +169,6 @@
 
 
 
-
 - (UICollectionView *)collectionView{
     if (!_collectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
@@ -203,7 +179,6 @@
         _collectionView.backgroundColor = [UIColor clearColor];
         _collectionView.dataSource = self;
         _collectionView.delegate = self;
-        _collectionView.tag = 78574;
         [_collectionView registerClass:[XPNewHomePartyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPNewHomePartyCollectionViewCell class])];
         [_collectionView registerClass:[XPGuildEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class])];
     }

YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.h

@@ -7,7 +7,6 @@
 
 #import "MvpViewController.h"
 #import <JXPagingView/JXPagerView.h>
-#import "PIHomeCategoryTitleModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol XPHomeRecommendViewControllerDelegate <NSObject>
@@ -20,7 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView);
 @property(nonatomic,weak) id<XPHomeRecommendViewControllerDelegate>delegate;
 @property(nonatomic,copy) HeaderRefreshComplete refreshComplete;
-@property(nonatomic,strong) PIHomeCategoryTitleModel *tagModel;
 - (void)headerRefresh;
 @end