更换图片logo

Podfile

@@ -4,7 +4,7 @@ source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 target 'YuMi' do
   use_frameworks!
   #pag动画
-  pod 'libpag'
+  pod 'libpag', '~> 4.3.21'
   pod 'Bugly'
   pod 'Adjust', '~> 4.31.0'
   pod 'Firebase/Analytics'
@@ -46,36 +46,32 @@ target 'YuMi' do
   #上传音乐
   pod 'CocoaAsyncSocket',:modular_headers => true
   #声网
-  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'
+  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'	
-	#上传图片
-	pod 'Qiniu'
-	#内购
-	pod 'IAPHelper'
 	#持久化存储
-	pod 'SSKeychain'
+  pod 'SSKeychain'
-	pod 'Base64'
+  pod 'Base64'
   #pop动画
   pod 'pop', '~> 1.0.12'
   #云信
   pod 'NIMSDK_LITE', '~> 9.2.8'
-	pod 'GKCycleScrollView', '~> 1.2.0'
+  pod 'GKCycleScrollView', '~> 1.2.0'
-	pod 'SVGAPlayer'
+  pod 'SVGAPlayer'
-
+  pod 'GoogleSignIn'
-	pod 'GoogleSignIn'
+  pod 'mob_linksdk_pro'
-	#pod 'mob_linksdk_pro'
+  pod 'mob_sharesdk'
-	pod 'mob_sharesdk'
+  pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
+  #pod 'mob_sharesdk/ShareSDKPlatforms/Line'
-	#pod 'mob_sharesdk/ShareSDKPlatforms/Line'
+  pod 'mob_sharesdk/ShareSDKExtension'
-	pod 'mob_sharesdk/ShareSDKExtension'
   
   pod 'UMCommon'
-	pod 'UMDevice'
+  pod 'UMDevice'
   pod 'lottie-ios'
   pod 'WeexSDK'
   pod 'ZLCollectionViewFlowLayout'
   pod 'WMZDropDownMenu'
   pod 'TABAnimated'
-  pod 'YuMi',:path=>'yum'	
+  pod 'YuMi',:path=>'yum'
+  pod 'QCloudCOSXML'	
 end
 
 post_install do |installer|

YuMi.xcodeproj/project.pbxproj

@@ -210,6 +210,7 @@
 		235A451A2B04A352009753F5 /* PIRoomActivityWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A45192B04A352009753F5 /* PIRoomActivityWebView.m */; };
 		235A451D2B04A452009753F5 /* PIRoomActivityWebCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */; };
 		235A45232B04BEB6009753F5 /* PIBaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A45222B04BEB6009753F5 /* PIBaseModel.m */; };
+		23630BA62BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23630BA52BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m */; };
 		236896A02AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 2368969F2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m */; };
 		2369F9912A89CE0E00563B48 /* PIUserSexView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2369F9902A89CE0E00563B48 /* PIUserSexView.m */; };
 		2369F9932A8B21EB00563B48 /* pi_treasure_fairy_gift_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = 2369F9922A8B21EA00563B48 /* pi_treasure_fairy_gift_bg.svga */; };
@@ -231,11 +232,14 @@
 		236B2E592AA18E13003967A8 /* XPMIneGameCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E552AA18E12003967A8 /* XPMIneGameCollectionViewCell.m */; };
 		236B2E5A2AA18E13003967A8 /* XPMineGameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */; };
 		236B2E5D2AA19169003967A8 /* HomeLittleGameRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E5C2AA19169003967A8 /* HomeLittleGameRoomModel.m */; };
+		236BA4982BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */; };
 		237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; };
 		237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; };
 		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 */; };
@@ -301,6 +305,7 @@
 		239141C92AE1358F00322CA9 /* PIInputEntireServerScrollingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */; };
 		239141CC2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */; };
 		23942E912A86424500D0ECC2 /* XPLoginAuthCodeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */; };
+		23959FE72BB15C930085A282 /* UploadFileModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23959FE62BB15C930085A282 /* UploadFileModel.m */; };
 		2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */ = {isa = PBXBuildFile; fileRef = 2396FCE32B22BE5D0014021D /* pi_area_info.json */; };
 		239BEEDB2AA1E058005CDA94 /* PIHoemCategoryTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */; };
 		23A03F2D2B4408CD0094227A /* pi_room_lucky_gift.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */; };
@@ -359,6 +364,7 @@
 		23D8DEF22AC5633300644637 /* PIIAPRegulate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */; };
 		23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */; };
 		23E56B3C2B03564B00C8DAC9 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */; };
+		23E7FE9C2BB6CD42008F6800 /* XPNobleCenterWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E7FE9B2BB6CD42008F6800 /* XPNobleCenterWindow.m */; };
 		23E9E9972A80C3A100B792F2 /* XPMineGuildPersonalBillRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */; };
 		23E9E9982A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9962A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m */; };
 		23E9E99B2A80C40000B792F2 /* XPMineGuildPersonalBillRecordHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9992A80C3FF00B792F2 /* XPMineGuildPersonalBillRecordHeadView.m */; };
@@ -402,6 +408,15 @@
 		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 */; };
+		23F9636A2BB6919D00F440A6 /* PINobleRebateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F963692BB6919D00F440A6 /* PINobleRebateModel.m */; };
+		23FE47D52BB3C64600F09D23 /* PINobleCenterTitleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47D42BB3C64600F09D23 /* PINobleCenterTitleCell.m */; };
+		23FE47D82BB3CEAF00F09D23 /* PINobleCenterTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47D72BB3CEAF00F09D23 /* PINobleCenterTitleView.m */; };
+		23FE47DB2BB4171C00F09D23 /* PINobleCenterListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47DA2BB4171C00F09D23 /* PINobleCenterListView.m */; };
+		23FE47E12BB41CF200F09D23 /* PINobleCenterListReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47E02BB41CF200F09D23 /* PINobleCenterListReusableView.m */; };
+		23FE47E42BB41EBF00F09D23 /* PINobleCenterListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47E32BB41EBF00F09D23 /* PINobleCenterListCell.m */; };
+		23FE47E72BB4378700F09D23 /* PINobleCenterListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47E62BB4378700F09D23 /* PINobleCenterListModel.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 */; };
@@ -904,7 +919,6 @@
 		E83ABF03280EC90C00322EE4 /* ContentApplicationShareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABF02280EC90C00322EE4 /* ContentApplicationShareModel.m */; };
 		E83ABF06280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABF05280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m */; };
 		E83DB47A27462C4500D8CBD1 /* XPGiftBigPrizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */; };
-		E83DB47D2746372300D8CBD1 /* XPRoomGiftBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB47C2746372300D8CBD1 /* XPRoomGiftBannerView.m */; };
 		E83DB481274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */; };
 		E83DB4842746661800D8CBD1 /* XPRoomGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB4832746661800D8CBD1 /* XPRoomGiftBroadcastView.m */; };
 		E8412F9627795E34006E1101 /* XPRoomInviteFansView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412F9527795E34006E1101 /* XPRoomInviteFansView.m */; };
@@ -1258,7 +1272,6 @@
 		E89D60BA271D643A001F8895 /* Api+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60B9271D643A001F8895 /* Api+Room.m */; };
 		E89D60BD271D647A001F8895 /* XPRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60BC271D647A001F8895 /* XPRoomPresenter.m */; };
 		E89D60C1271D64B9001F8895 /* RoomInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60C0271D64B9001F8895 /* RoomInfoModel.m */; };
-		E89DA66427005932008483C1 /* XPIAPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA66327005932008483C1 /* XPIAPHelper.m */; };
 		E89DA66727006443008483C1 /* RechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA66627006443008483C1 /* RechargeStorage.m */; };
 		E89DA67227008D59008483C1 /* WalletInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA67127008D59008483C1 /* WalletInfoModel.m */; };
 		E89DA67527009ACD008483C1 /* XPMineRechargeNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA67427009ACD008483C1 /* XPMineRechargeNavView.m */; };
@@ -1336,12 +1349,10 @@
 		E8B825C726EA0D9A009E8E9F /* LoginVerifCodeProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8B825C626EA0995009E8E9F /* LoginVerifCodeProtocol.h */; };
 		E8B825CA26EA1231009E8E9F /* LoginVerifCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825C826EA1231009E8E9F /* LoginVerifCodeViewController.m */; };
 		E8B825CD26EA18C8009E8E9F /* DJDKMIMOMColor.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825CC26EA18C8009E8E9F /* DJDKMIMOMColor.m */; };
-		E8B846BC26FD7C1200A777FE /* UploadImage.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846BB26FD7C1200A777FE /* UploadImage.m */; };
 		E8B846BF26FD827900A777FE /* XPMineUserInfoAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846BE26FD827900A777FE /* XPMineUserInfoAlbumViewController.m */; };
 		E8B846C226FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C126FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m */; };
 		E8B846C526FDB41A00A777FE /* XPMineUserInfolbumPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C426FDB41A00A777FE /* XPMineUserInfolbumPresenter.m */; };
 		E8B846C726FDB45000A777FE /* XPMineUserInfoAlbumProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C626FDB44100A777FE /* XPMineUserInfoAlbumProtocol.h */; };
-		E8B846CB26FDD7CD00A777FE /* XPMineRechargeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846CA26FDD7CD00A777FE /* XPMineRechargeViewController.m */; };
 		E8B846CF26FDD96100A777FE /* XPMineRechageHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846CE26FDD96100A777FE /* XPMineRechageHeadView.m */; };
 		E8B846D326FDDBE600A777FE /* XPMineRechargeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846D226FDDBE600A777FE /* XPMineRechargeTableViewCell.m */; };
 		E8B846D626FDE01B00A777FE /* XPMineRechargePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846D526FDE01B00A777FE /* XPMineRechargePresenter.m */; };
@@ -1886,6 +1897,8 @@
 		235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityWebCell.m; sourceTree = "<group>"; };
 		235A45212B04BEB6009753F5 /* PIBaseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIBaseModel.h; sourceTree = "<group>"; };
 		235A45222B04BEB6009753F5 /* PIBaseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIBaseModel.m; sourceTree = "<group>"; };
+		23630BA42BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGiftSuperGiftBroadcastView.h; sourceTree = "<group>"; };
+		23630BA52BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGiftSuperGiftBroadcastView.m; sourceTree = "<group>"; };
 		2368969E2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomGiftBroadcastWindow.h; sourceTree = "<group>"; };
 		2368969F2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomGiftBroadcastWindow.m; sourceTree = "<group>"; };
 		2369F98F2A89CE0E00563B48 /* PIUserSexView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUserSexView.h; sourceTree = "<group>"; };
@@ -1928,6 +1941,8 @@
 		236B2E582AA18E12003967A8 /* XPMIneGameCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMIneGameCollectionViewCell.h; sourceTree = "<group>"; };
 		236B2E5B2AA19168003967A8 /* HomeLittleGameRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeLittleGameRoomModel.h; sourceTree = "<group>"; };
 		236B2E5C2AA19169003967A8 /* HomeLittleGameRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeLittleGameRoomModel.m; sourceTree = "<group>"; };
+		236BA4962BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINoblePrivilegeEmptyCell.h; sourceTree = "<group>"; };
+		236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINoblePrivilegeEmptyCell.m; sourceTree = "<group>"; };
 		237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = "<group>"; };
 		237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = "<group>"; };
 		237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = "<group>"; };
@@ -1939,6 +1954,10 @@
 		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>"; };
@@ -2070,6 +2089,8 @@
 		239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIReceiveRedPacketSuccessView.m; sourceTree = "<group>"; };
 		23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAuthCodeVC.h; sourceTree = "<group>"; };
 		23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAuthCodeVC.m; sourceTree = "<group>"; };
+		23959FE52BB15C930085A282 /* UploadFileModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UploadFileModel.h; sourceTree = "<group>"; };
+		23959FE62BB15C930085A282 /* UploadFileModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UploadFileModel.m; sourceTree = "<group>"; };
 		2396FCE32B22BE5D0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = "<group>"; };
 		239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleView.h; sourceTree = "<group>"; };
 		239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleView.m; sourceTree = "<group>"; };
@@ -2177,6 +2198,8 @@
 		23E45C032AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionDiscoverNewTableViewCell.h; sourceTree = "<group>"; };
 		23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionDiscoverNewTableViewCell.m; sourceTree = "<group>"; };
 		23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
+		23E7FE9A2BB6CD42008F6800 /* XPNobleCenterWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterWindow.h; sourceTree = "<group>"; };
+		23E7FE9B2BB6CD42008F6800 /* XPNobleCenterWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterWindow.m; sourceTree = "<group>"; };
 		23E9E9932A80C39E00B792F2 /* XPMineGuildPersonalBillStatisVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillStatisVC.h; sourceTree = "<group>"; };
 		23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillRecordVC.m; sourceTree = "<group>"; };
 		23E9E9952A80C3A000B792F2 /* XPMineGuildPersonalBillRecordVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillRecordVC.h; sourceTree = "<group>"; };
@@ -2258,6 +2281,23 @@
 		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>"; };
+		23F963682BB6919D00F440A6 /* PINobleRebateModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleRebateModel.h; sourceTree = "<group>"; };
+		23F963692BB6919D00F440A6 /* PINobleRebateModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleRebateModel.m; sourceTree = "<group>"; };
+		23FE47D32BB3C64600F09D23 /* PINobleCenterTitleCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterTitleCell.h; sourceTree = "<group>"; };
+		23FE47D42BB3C64600F09D23 /* PINobleCenterTitleCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterTitleCell.m; sourceTree = "<group>"; };
+		23FE47D62BB3CEAF00F09D23 /* PINobleCenterTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterTitleView.h; sourceTree = "<group>"; };
+		23FE47D72BB3CEAF00F09D23 /* PINobleCenterTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterTitleView.m; sourceTree = "<group>"; };
+		23FE47D92BB4171C00F09D23 /* PINobleCenterListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListView.h; sourceTree = "<group>"; };
+		23FE47DA2BB4171C00F09D23 /* PINobleCenterListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListView.m; sourceTree = "<group>"; };
+		23FE47DF2BB41CF200F09D23 /* PINobleCenterListReusableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListReusableView.h; sourceTree = "<group>"; };
+		23FE47E02BB41CF200F09D23 /* PINobleCenterListReusableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListReusableView.m; sourceTree = "<group>"; };
+		23FE47E22BB41EBF00F09D23 /* PINobleCenterListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListCell.h; sourceTree = "<group>"; };
+		23FE47E32BB41EBF00F09D23 /* PINobleCenterListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListCell.m; sourceTree = "<group>"; };
+		23FE47E52BB4378700F09D23 /* PINobleCenterListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListModel.h; sourceTree = "<group>"; };
+		23FE47E62BB4378700F09D23 /* PINobleCenterListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListModel.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>"; };
@@ -3100,8 +3140,6 @@
 		E83ABF05280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentLevelUpgradeView.m; sourceTree = "<group>"; };
 		E83DB47827462C4500D8CBD1 /* XPGiftBigPrizeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftBigPrizeModel.h; sourceTree = "<group>"; };
 		E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftBigPrizeModel.m; sourceTree = "<group>"; };
-		E83DB47B2746372300D8CBD1 /* XPRoomGiftBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftBannerView.h; sourceTree = "<group>"; };
-		E83DB47C2746372300D8CBD1 /* XPRoomGiftBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGiftBannerView.m; sourceTree = "<group>"; };
 		E83DB47F274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftBannerUserInfoModel.h; sourceTree = "<group>"; };
 		E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftBannerUserInfoModel.m; sourceTree = "<group>"; };
 		E83DB4822746661800D8CBD1 /* XPRoomGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftBroadcastView.h; sourceTree = "<group>"; };
@@ -3838,8 +3876,6 @@
 		E89D60BE271D648D001F8895 /* XPRoomProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomProtocol.h; sourceTree = "<group>"; };
 		E89D60BF271D64B9001F8895 /* RoomInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomInfoModel.h; sourceTree = "<group>"; };
 		E89D60C0271D64B9001F8895 /* RoomInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomInfoModel.m; sourceTree = "<group>"; };
-		E89DA66227005931008483C1 /* XPIAPHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPHelper.h; sourceTree = "<group>"; };
-		E89DA66327005932008483C1 /* XPIAPHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPHelper.m; sourceTree = "<group>"; };
 		E89DA66527006443008483C1 /* RechargeStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RechargeStorage.h; sourceTree = "<group>"; };
 		E89DA66627006443008483C1 /* RechargeStorage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RechargeStorage.m; sourceTree = "<group>"; };
 		E89DA67027008D59008483C1 /* WalletInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WalletInfoModel.h; sourceTree = "<group>"; };
@@ -3998,8 +4034,6 @@
 		E8B825C926EA1231009E8E9F /* LoginVerifCodeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginVerifCodeViewController.h; sourceTree = "<group>"; };
 		E8B825CB26EA18C8009E8E9F /* DJDKMIMOMColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DJDKMIMOMColor.h; sourceTree = "<group>"; };
 		E8B825CC26EA18C8009E8E9F /* DJDKMIMOMColor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DJDKMIMOMColor.m; sourceTree = "<group>"; };
-		E8B846BA26FD7C1200A777FE /* UploadImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UploadImage.h; sourceTree = "<group>"; };
-		E8B846BB26FD7C1200A777FE /* UploadImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UploadImage.m; sourceTree = "<group>"; };
 		E8B846BD26FD827900A777FE /* XPMineUserInfoAlbumViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumViewController.h; sourceTree = "<group>"; };
 		E8B846BE26FD827900A777FE /* XPMineUserInfoAlbumViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoAlbumViewController.m; sourceTree = "<group>"; };
 		E8B846C026FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumCollectionViewCell.h; sourceTree = "<group>"; };
@@ -4007,8 +4041,6 @@
 		E8B846C326FDB41A00A777FE /* XPMineUserInfolbumPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfolbumPresenter.h; sourceTree = "<group>"; };
 		E8B846C426FDB41A00A777FE /* XPMineUserInfolbumPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfolbumPresenter.m; sourceTree = "<group>"; };
 		E8B846C626FDB44100A777FE /* XPMineUserInfoAlbumProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumProtocol.h; sourceTree = "<group>"; };
-		E8B846C926FDD7CD00A777FE /* XPMineRechargeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechargeViewController.h; sourceTree = "<group>"; };
-		E8B846CA26FDD7CD00A777FE /* XPMineRechargeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineRechargeViewController.m; sourceTree = "<group>"; };
 		E8B846CD26FDD96100A777FE /* XPMineRechageHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechageHeadView.h; sourceTree = "<group>"; };
 		E8B846CE26FDD96100A777FE /* XPMineRechageHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineRechageHeadView.m; sourceTree = "<group>"; };
 		E8B846D126FDDBE600A777FE /* XPMineRechargeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechargeTableViewCell.h; sourceTree = "<group>"; };
@@ -4357,6 +4389,8 @@
 				E80E09AC2A41336500CD2BE7 /* XPWebViewNavView.m */,
 				18E7B33026F317A20064BC9B /* XPWebViewController.h */,
 				18E7B33126F317A20064BC9B /* XPWebViewController.m */,
+				23EE97082BA2D39C00475D69 /* PIWebViewSavePhotoView.h */,
+				23EE97092BA2D39C00475D69 /* PIWebViewSavePhotoView.m */,
 			);
 			path = YMWeb;
 			sourceTree = "<group>";
@@ -4820,7 +4854,6 @@
 				E82D5C77276B25B000858D6D /* SpriteSheetManager */,
 				E865964E2701A1A900846EBD /* StatisticsService */,
 				E89DA6612700590A008483C1 /* IAPHelper */,
-				E8B846B926FD7BE600A777FE /* UploadImage */,
 				E8EEB8EA26FC2050007C6EBA /* SDPhotoBrowser */,
 				2331C1BA2A60F67F00E1D940 /* UILabel */,
 				E81366E426F0A4820076364C /* NSString */,
@@ -5203,6 +5236,8 @@
 			children = (
 				2331C1382A5EB71000E1D940 /* NobleAuthInfo.h */,
 				2331C13D2A5EB71000E1D940 /* NobleAuthInfo.m */,
+				23F963682BB6919D00F440A6 /* PINobleRebateModel.h */,
+				23F963692BB6919D00F440A6 /* PINobleRebateModel.m */,
 				2331C13E2A5EB71000E1D940 /* NobleCenterModel.h */,
 				2331C13A2A5EB71000E1D940 /* NobleCenterModel.m */,
 				2331C13B2A5EB71000E1D940 /* NobleInfo.h */,
@@ -5211,6 +5246,8 @@
 				2331C13C2A5EB71000E1D940 /* NobleLevelUpModel.m */,
 				2331C13F2A5EB71000E1D940 /* NobleRechargeModel.h */,
 				2331C1392A5EB71000E1D940 /* NobleRechargeModel.m */,
+				23FE47E52BB4378700F09D23 /* PINobleCenterListModel.h */,
+				23FE47E62BB4378700F09D23 /* PINobleCenterListModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -5252,6 +5289,8 @@
 				2331C1592A5EB71000E1D940 /* XPNoblePrivilegeCell.m */,
 				2331C14B2A5EB71000E1D940 /* XPNoblePrivilegeContentCell.h */,
 				2331C1562A5EB71000E1D940 /* XPNoblePrivilegeContentCell.m */,
+				236BA4962BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.h */,
+				236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */,
 				2331C1472A5EB71000E1D940 /* XPNobleSettingNavView.h */,
 				2331C1522A5EB71000E1D940 /* XPNobleSettingNavView.m */,
 				2331C14E2A5EB71000E1D940 /* XPNobleUpgradeLevelView.h */,
@@ -5260,6 +5299,18 @@
 				2331C17D2A5ECCF600E1D940 /* XPNobleCenterPayView.m */,
 				2331C17F2A5ECD3800E1D940 /* XPNobleCenterPayCell.h */,
 				2331C1802A5ECD3800E1D940 /* XPNobleCenterPayCell.m */,
+				23FE47D32BB3C64600F09D23 /* PINobleCenterTitleCell.h */,
+				23FE47D42BB3C64600F09D23 /* PINobleCenterTitleCell.m */,
+				23FE47D62BB3CEAF00F09D23 /* PINobleCenterTitleView.h */,
+				23FE47D72BB3CEAF00F09D23 /* PINobleCenterTitleView.m */,
+				23FE47D92BB4171C00F09D23 /* PINobleCenterListView.h */,
+				23FE47DA2BB4171C00F09D23 /* PINobleCenterListView.m */,
+				23FE47DF2BB41CF200F09D23 /* PINobleCenterListReusableView.h */,
+				23FE47E02BB41CF200F09D23 /* PINobleCenterListReusableView.m */,
+				23FE47E22BB41EBF00F09D23 /* PINobleCenterListCell.h */,
+				23FE47E32BB41EBF00F09D23 /* PINobleCenterListCell.m */,
+				23E7FE9A2BB6CD42008F6800 /* XPNobleCenterWindow.h */,
+				23E7FE9B2BB6CD42008F6800 /* XPNobleCenterWindow.m */,
 			);
 			path = SubViews;
 			sourceTree = "<group>";
@@ -6115,8 +6166,10 @@
 		9B33E3C827D85379003B0E62 /* File */ = {
 			isa = PBXGroup;
 			children = (
-				9B33E3C927D85379003B0E62 /* UploadFile.m */,
 				9B33E3CA27D85379003B0E62 /* UploadFile.h */,
+				9B33E3C927D85379003B0E62 /* UploadFile.m */,
+				23959FE52BB15C930085A282 /* UploadFileModel.h */,
+				23959FE62BB15C930085A282 /* UploadFileModel.m */,
 			);
 			path = File;
 			sourceTree = "<group>";
@@ -7484,8 +7537,6 @@
 				E8C21500274B76F60079E6BF /* XPRoomAnimationHitView.m */,
 				9B8DE0E2289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.h */,
 				9B8DE0E3289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m */,
-				E83DB47B2746372300D8CBD1 /* XPRoomGiftBannerView.h */,
-				E83DB47C2746372300D8CBD1 /* XPRoomGiftBannerView.m */,
 				232C43E82AB15F4100D4B2ED /* XPRoomTarrowBannerView.h */,
 				232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */,
 				E83DB4822746661800D8CBD1 /* XPRoomGiftBroadcastView.h */,
@@ -7516,6 +7567,8 @@
 				F1D8556E2931FC86008C418F /* XPRoomYearActivityView.m */,
 				E80E09B12A42071C00CD2BE7 /* XPRoomStarKitchenBannerView.h */,
 				E80E09B22A42071D00CD2BE7 /* XPRoomStarKitchenBannerView.m */,
+				238A90052BA9729200828123 /* PIUniversalBannerView.h */,
+				238A90062BA9729200828123 /* PIUniversalBannerView.m */,
 			);
 			path = AnimationView;
 			sourceTree = "<group>";
@@ -7669,6 +7722,8 @@
 				E80E09B52A42078F00CD2BE7 /* XPRoomStarKitchenModel.m */,
 				23BA16592A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.h */,
 				23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */,
+				238A90082BA9756600828123 /* PIUniversalBannerModel.h */,
+				238A90092BA9756600828123 /* PIUniversalBannerModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -8780,6 +8835,8 @@
 				E8901CF528B38D89001E9A92 /* XPGraffitiGiftView.m */,
 				9B4D449128F15765002572D5 /* XPGiftLuckyGiftBroadcastView.h */,
 				9B4D449228F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m */,
+				23630BA42BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.h */,
+				23630BA52BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m */,
 				E8D4DE422940462C00EC788D /* XPGiftTwelveStarBroadcastView.h */,
 				E8D4DE432940462C00EC788D /* XPGiftTwelveStarBroadcastView.m */,
 			);
@@ -9385,8 +9442,6 @@
 		E89DA6612700590A008483C1 /* IAPHelper */ = {
 			isa = PBXGroup;
 			children = (
-				E89DA66227005931008483C1 /* XPIAPHelper.h */,
-				E89DA66327005932008483C1 /* XPIAPHelper.m */,
 				E89DA66527006443008483C1 /* RechargeStorage.h */,
 				E89DA66627006443008483C1 /* RechargeStorage.m */,
 			);
@@ -9396,6 +9451,7 @@
 		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 */,
@@ -9845,20 +9901,9 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
-		E8B846B926FD7BE600A777FE /* UploadImage */ = {
-			isa = PBXGroup;
-			children = (
-				E8B846BA26FD7C1200A777FE /* UploadImage.h */,
-				E8B846BB26FD7C1200A777FE /* UploadImage.m */,
-			);
-			path = UploadImage;
-			sourceTree = "<group>";
-		};
 		E8B846C826FDD79700A777FE /* Recharge */ = {
 			isa = PBXGroup;
 			children = (
-				E8B846C926FDD7CD00A777FE /* XPMineRechargeViewController.h */,
-				E8B846CA26FDD7CD00A777FE /* XPMineRechargeViewController.m */,
 				1464C5F129A4C18000AF7C94 /* XPIAPRechargeViewController.h */,
 				1464C5F229A4C18000AF7C94 /* XPIAPRechargeViewController.m */,
 				1464C5F429A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.h */,
@@ -10550,6 +10595,7 @@
 				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 */,
@@ -10814,6 +10860,7 @@
 				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 */,
@@ -10855,7 +10902,6 @@
 				E85E7B112A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m in Sources */,
 				9BD2ECD2288F833B00F5CD9A /* XPMineFootPrintModel.m in Sources */,
 				E824546626F5FF6000BE8163 /* XPMineResetPayPasswordProtocol.h in Sources */,
-				E89DA66427005932008483C1 /* XPIAPHelper.m in Sources */,
 				23D321E22ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m in Sources */,
 				E824545E26F5EF2200BE8163 /* XPMineVerifIdentityProtocol.h in Sources */,
 				E824545326F5CEAD00BE8163 /* XPMineModifPayProtocol.h in Sources */,
@@ -10992,6 +11038,7 @@
 				9B7D80502753AA9D003DAC0C /* UITableView+NIMScrollToBottom.m in Sources */,
 				E8AFF7E3298CA1E500FBDE32 /* SessionSayHelloCountModel.m in Sources */,
 				E8998D7A2859784200C68558 /* XPSVGAPlayer.m in Sources */,
+				23FE47D82BB3CEAF00F09D23 /* PINobleCenterTitleView.m in Sources */,
 				9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */,
 				E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */,
 				23CEFC4E2AFB8FC100576D89 /* BSNSDictionary.m in Sources */,
@@ -11011,6 +11058,7 @@
 				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 */,
@@ -11022,7 +11070,6 @@
 				238B37BD2AC55A2C00BFC9D5 /* XPTreasureFairyTrialsContentView.m in Sources */,
 				E85E7B262A4EB0D300B6D00A /* XPMineGuildViewController.m in Sources */,
 				E85E7B672A4EC35A00B6D00A /* XPBindExtractInfoModel.m in Sources */,
-				E8B846CB26FDD7CD00A777FE /* XPMineRechargeViewController.m in Sources */,
 				E86596512701A1C000846EBD /* StatisticsService.m in Sources */,
 				23CEFC5E2AFB8FC100576D89 /* BSRealTimeView.m in Sources */,
 				E824544026F58F9400BE8163 /* XPMinePayPwdViewController.m in Sources */,
@@ -11186,6 +11233,7 @@
 				E87DF4BF2A42C8C1009C1185 /* HomeTagModel.m in Sources */,
 				23FF25652ABC3B3C0064E904 /* XPHomeGameView.m in Sources */,
 				E88863D3278ED4C0004BCFAB /* Timestamp.m in Sources */,
+				23E7FE9C2BB6CD42008F6800 /* XPNobleCenterWindow.m in Sources */,
 				E8A3540A28FEC0510014A784 /* XPWishGiftListView.m in Sources */,
 				238B37BF2AC55A2C00BFC9D5 /* XPTreasureFairyStoreResultView.m in Sources */,
 				E88863CF278EC393004BCFAB /* XPAcrossRoomPKPrizeView.m in Sources */,
@@ -11231,6 +11279,7 @@
 				E8E70D8326F2F51A00F03460 /* XPMineHeadView.m in Sources */,
 				E80EC81128ACD84000D133C5 /* QEmotionHelper.m in Sources */,
 				E8EEB90C26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m in Sources */,
+				23630BA62BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m in Sources */,
 				18E7B31826F097E00064BC9B /* UserInfoModel.m in Sources */,
 				E87DF4F22A42CBEC009C1185 /* XPHomeUserView.m in Sources */,
 				E83ABEF6280E9AD800322EE4 /* MessageContentUnSupportView.m in Sources */,
@@ -11271,12 +11320,14 @@
 				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 */,
 				189DD68426E1FDBB00AB55B1 /* XNDJTDDLoadingTool.m in Sources */,
 				9B1B72AF280031F8003FACE9 /* XPAnchorPKSelectRoomView.m in Sources */,
 				E818DD1C2A4896EE00F163F7 /* XPLoginAraeViewController.m in Sources */,
+				23959FE72BB15C930085A282 /* UploadFileModel.m in Sources */,
 				E8D4824A278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m in Sources */,
 				E85E7B432A4EB0D300B6D00A /* XPMineExchangeAuthorityHeadView.m in Sources */,
 				23194DD02AD14BF000649F51 /* DDLog.m in Sources */,
@@ -11365,6 +11416,7 @@
 				235A45232B04BEB6009753F5 /* PIBaseModel.m in Sources */,
 				E8DEC9A82764A68B0078CB70 /* Api+MoreMenu.m in Sources */,
 				9B86D87A2817DD8400494FCD /* XPRoomEnterHideTipView.m in Sources */,
+				23FE47E12BB41CF200F09D23 /* PINobleCenterListReusableView.m in Sources */,
 				E8AC721026F43955007D6E91 /* UIImageConstant.m in Sources */,
 				E85E7B122A4EB0D200B6D00A /* GuildIncomeRecordModel.m in Sources */,
 				E81C27A026EEF83D0031E639 /* YUMIHtmlUrl.m in Sources */,
@@ -11476,6 +11528,7 @@
 				E8B825CD26EA18C8009E8E9F /* DJDKMIMOMColor.m in Sources */,
 				E8751E5F28A62A970056EF44 /* XPSailingPresenter.m in Sources */,
 				E84A2E962A5280F900D6AF8A /* XPExchangeDiamondsView.m in Sources */,
+				23F9636A2BB6919D00F440A6 /* PINobleRebateModel.m in Sources */,
 				E8DAC5AC2858305A00012CFD /* XPRoomMessageBubbleView.m in Sources */,
 				1427218929A75F6F00C7C423 /* HTTPDataResponse.m in Sources */,
 				E8B9843028AB90200022D026 /* XPMoentsTopicListView.m in Sources */,
@@ -11528,6 +11581,7 @@
 				9B335B492925D8A00048A116 /* XPAnchorPKSelectTypeController.m in Sources */,
 				E8098CAE282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m in Sources */,
 				E85E7B4F2A4EB0D300B6D00A /* XPMineExchangeAuthorityVC.m in Sources */,
+				23FE47DB2BB4171C00F09D23 /* PINobleCenterListView.m in Sources */,
 				E84A2E932A527EC800D6AF8A /* XPIncomeRecordPresent.m in Sources */,
 				236B2E432AA07D06003967A8 /* NSString+RW.m in Sources */,
 				E85E7B172A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m in Sources */,
@@ -11536,6 +11590,7 @@
 				E8D34D5A28082357009C4835 /* UserGiftWallInfoModel.m in Sources */,
 				E82107842987E35300DE7040 /* MessageMonentsAutoModel.m in Sources */,
 				189DD52E26DE255300AB55B1 /* AppDelegate.m in Sources */,
+				23FE47E42BB41EBF00F09D23 /* PINobleCenterListCell.m in Sources */,
 				E83DB4842746661800D8CBD1 /* XPRoomGiftBroadcastView.m in Sources */,
 				E8778AF82988F4E200CF139B /* XPSessionSayHelloHeaderView.m in Sources */,
 				E84150C527747E0900A7F548 /* FirstRechargeRewardModel.m in Sources */,
@@ -11739,6 +11794,7 @@
 				23D321D52ADD0F05006B259C /* Api+PhotoAlbum.m in Sources */,
 				23E9EA842A84B6FD00B792F2 /* XPMineUserInfoTagModel.m in Sources */,
 				E8998D852859B4FA00C68558 /* XPMineUserInfoGiftView.m in Sources */,
+				23FE47E72BB4378700F09D23 /* PINobleCenterListModel.m in Sources */,
 				186A536B26FC6F2E00D67B2C /* XPShareItemCell.m in Sources */,
 				237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */,
 				23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */,
@@ -11746,7 +11802,6 @@
 				E8B846C526FDB41A00A777FE /* XPMineUserInfolbumPresenter.m in Sources */,
 				9BFB101F2897CC4300B3985E /* XPAnchorCardView.m in Sources */,
 				1427218F29A75F6F00C7C423 /* HTTPConnection.m in Sources */,
-				E83DB47D2746372300D8CBD1 /* XPRoomGiftBannerView.m in Sources */,
 				9BAA5FED277A1BBE007453F3 /* XPPrivacyViewController.m in Sources */,
 				E873EB02280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m in Sources */,
 				E872309326E8D31500B90D4F /* LoginVerifCodeView.m in Sources */,
@@ -11790,7 +11845,6 @@
 				E81060E229876E9100B772F0 /* MessageImageModel.m in Sources */,
 				E839533F276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.m in Sources */,
 				E80E09AE2A41336500CD2BE7 /* XPWebViewNavView.m in Sources */,
-				E8B846BC26FD7C1200A777FE /* UploadImage.m in Sources */,
 				E85E7B2D2A4EB0D300B6D00A /* XPGuildHeaderView.m in Sources */,
 				E85E7B542A4EB4AD00B6D00A /* XPMineGuildListModel.m in Sources */,
 				9BCE6144277D657600CC0358 /* XPReleaseRadioTableViewCell.m in Sources */,
@@ -11955,6 +12009,7 @@
 				2305F3382AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.m in Sources */,
 				E874B88827215D39003954B9 /* MicroStateModel.m in Sources */,
 				23E9EABB2A84CCBE00B792F2 /* XPMineDataSkillDataCollectionViewCell.m in Sources */,
+				23FE47D52BB3C64600F09D23 /* PINobleCenterTitleCell.m in Sources */,
 				E877A7F427842EF800EFACED /* XPRoomDatingVipUpMicView.m in Sources */,
 				E896EF9F2771AE7B00AD2CC1 /* XPMineAttentionViewController.m in Sources */,
 				E89D60C1271D64B9001F8895 /* RoomInfoModel.m in Sources */,
@@ -12011,6 +12066,7 @@
 				E80EC80E28ACD84000D133C5 /* QKeyboardBaseManager.m in Sources */,
 				23E9EA792A8385CC00B792F2 /* XPTreasureFairyGiftView.m in Sources */,
 				149839C7299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m in Sources */,
+				236BA4982BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m in Sources */,
 				E88C729C2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.m in Sources */,
 				E85E7B0A2A4EB0D200B6D00A /* XPGuildManagerPerPresenter.m in Sources */,
 				9B85F3562806DD8A006EDF51 /* XPAnchorPKFinishView.m in Sources */,
@@ -12185,7 +12241,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.10;
+				MARKETING_VERSION = 20.20.16;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12221,7 +12277,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.10;
+				MARKETING_VERSION = 20.20.16;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -11,7 +11,7 @@
 #import <ShareSDK/ShareSDK.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
 #import <UserNotifications/UserNotifications.h>
-
+#import <MOBFoundation/MobSDK+Privacy.h>
 ///Tool
 #import "YUMIConstant.h"
 #import "CustomAttachmentDecoder.h"
@@ -27,7 +27,6 @@
 #import <Adjust/Adjust.h>
 #import <UserNotifications/UserNotifications.h>
 
-
 #import <Bugly/Bugly.h>
 
 #import "YuMi-swift.h"
@@ -49,6 +48,7 @@ UIKIT_EXTERN NSString * adImageName;
     [self configAdjust];
     [self configBugly];
     [self registerNot];
+  
 }
 -(void)registerNot{
     if (@available(iOS 10.0, *)) {
@@ -67,6 +67,7 @@ UIKIT_EXTERN NSString * adImageName;
             }
    
 }
+
 /**
  崩溃收集 Bugly
  */
@@ -100,7 +101,10 @@ UIKIT_EXTERN NSString * adImageName;
 #else
     option.apnsCername = @"newPiko";
 #endif
-   
+ 
+    
+
+    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -142,6 +146,14 @@ 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,6 +5,8 @@
 //  Created by admin on 2023/3/9.
 //
 
+#import <MobLinkPro/MobLink.h>
+#import <MobLinkPro/MLSDKScene.h>
 #import "AppDelegate.h"
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
@@ -21,10 +23,11 @@
 #import "AccountModel.h"
 #import "YuMi-swift.h"
 #import "SessionViewController.h"
+#import "LoginFullInfoViewController.h"
 @import Firebase;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
-@interface AppDelegate ()
+@interface AppDelegate ()<IMLSDKRestoreDelegate>
 
 @end
 
@@ -59,12 +62,23 @@ 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
+{
+    NSString *inviteCode = scene.params[@"inviteCode"];
+    if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
+        ClientConfig *config = [ClientConfig shareConfig];
+        config.inviteCode = inviteCode;
+    }
 
+    restoreHandler(YES, MLDefault);
+
+}
 
 
 
@@ -116,7 +130,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
             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.chatId = userId;
+            config.pushChatId = userId;
            
             });
             return;
@@ -126,9 +140,9 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     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}];
+            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
             ClientConfig *config = [ClientConfig shareConfig];
-            config.chatId = userId;
+            config.pushChatId = userId;
         }
        });
    
@@ -167,6 +181,12 @@ 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/jm/Noble/mine_noble_center_tag_diamond.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_bg.imageset/Contents.json

@@ -1,16 +1,15 @@
 {
   "images" : [
     {
+      "filename" : "noble_privilege_list_bg.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "noble_privilege_list_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "noble_privilege_list_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_left_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_noble_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_rebate_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_rigth_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_banner_low_bg@2x.png",
+      "filename" : "pi_gift_diamond_add@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_banner_low_bg@3x.png",
+      "filename" : "pi_gift_diamond_add@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/middle/pi_gift_gold.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_banner_high_bg@2x.png",
+      "filename" : "pi_gift_gold@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_banner_high_bg@3x.png",
+      "filename" : "pi_gift_gold@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_banner_middle_bg@2x.png",
+      "filename" : "room_gift_super_gift_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_banner_middle_bg@3x.png",
+      "filename" : "room_gift_super_gift_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/webView/Contents.json

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

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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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/FirstRecharge/pi_new_gift_first_recharge_bg.imageset/Contents.json

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

YuMi/Config/ClientConfig.h

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

YuMi/CustomUI/ShareView/XPShareView.m

@@ -143,6 +143,13 @@
         [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];
@@ -187,22 +194,14 @@
         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,6 @@ typedef NS_ENUM(NSUInteger, GradientType) {
 
 -(UIImage *)compressWithMaxLength:(NSUInteger)maxLength;
 - (UIImage *)roundedImageWithCornerRadius:(CGFloat)cornerRadius size:(CGSize)size;
-
++(UIImage *)getImageFromView:(UIView *)view;
++ (NSString *)getImageTypeWithImageData: (NSData *)data;
 @end

YuMi/CustomUI/UIImage/UIImage+Utils.m

@@ -432,4 +432,71 @@
    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;
+}
++ (NSString *)getImageTypeWithImageData:(NSData *)data {
+    
+    uint8_t c;
+    
+    [data getBytes:&c length:1];
+    
+    switch (c) {
+            
+        case 0xFF:
+            
+            return @"jpeg";
+            
+        case 0x89:
+            
+            return @"png";
+            
+        case 0x47:
+            
+            return @"gif";
+            
+        case 0x49:
+            
+        case 0x4D:
+            
+            return @"tiff";
+            
+        case 0x52:
+            
+            if ([data length] < 12) {
+                
+                return nil;
+                
+            }
+            
+            NSString *testString = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(0, 12)] encoding:NSASCIIStringEncoding];
+            
+            if ([testString hasPrefix:@"RIFF"] && [testString hasSuffix:@"WEBP"]) {
+                
+                return @"webp";
+                
+            }
+            
+            return nil;
+            
+    }
+    
+    return nil;
+}
 @end

YuMi/CustomUI/UIImageView/NetImageView.h

@@ -11,7 +11,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void(^LoadCompletion)(UIImage *image, NSURL * url);
+typedef void(^LoadCompletion)(UIImage *_Nullable image, NSURL * url);
+typedef void(^LoadFail)(NSError *error);
 
 typedef NS_ENUM(NSInteger, NetImageState){
     NetImageStateUnload = 1,
@@ -30,7 +31,7 @@ typedef NS_ENUM(NSInteger, NetImageState){
 
 - (void)loadImage:(LoadCompletion _Nullable)completion;
 - (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion _Nullable)completion;
-
+- (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion)completion fail:(LoadFail)fail;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/CustomUI/UIImageView/NetImageView.m

@@ -72,12 +72,30 @@
         }
     }];
 }
-
+- (void)loadImage:(LoadCompletion)completion fail:(LoadFail)fail{
+    self.state = NetImageStateLoading;
+    [self sd_setImageWithURL:[NSURL URLWithString:_innerConfigedUrl] placeholderImage:self.config.placeHolder options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+        if (error) {
+            self.state = NetImageStateUnload;
+            if (fail){
+                fail(error);
+            }
+        } else {
+            self.state = NetImageStateLoaded;
+            if (completion) {
+                completion(image, imageURL);
+            };
+        }
+    }];
+}
 - (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion)completion {
     [self initImageUrl:imageUrl];
     [self loadImage:completion];
 }
-
+- (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion)completion fail:(LoadFail)fail{
+    [self initImageUrl:imageUrl];
+    [self loadImage:completion fail:fail];
+}
 - (NetImageConfig *)config {
     if (!_config) {
         _config = [[NetImageConfig alloc] init];

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",///14ef7a0d0a84cb49bae1c22d78cf1ddf
+			@(KeyType_NetEase)                  : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///d4d74e9ba6ac3364ccc7526ea4791215
 			@(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.0"
+#define PI_App_Version @"2.6.6"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"

YuMi/Info.plist

@@ -49,7 +49,7 @@
 			<string>Editor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>pikoApp</string>
+				<string>pikoapp</string>
 			</array>
 		</dict>
 	</array>
@@ -96,10 +96,10 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>“Piko”需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>“Piko”需要您的同意,才可以进行定位服务，推荐附近好友</string>
 	<key>NSLocalNetworkUsageDescription</key>
 	<string>此App将可发现和连接到您所用网络上的设备。</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>“Piko”需要您的同意,才可以进行定位服务，推荐附近好友</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>“Piko”需要您的同意,才可以进行语音聊天</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>

YuMi/Modules/YMLogin/Api/PILoginManager.m

@@ -38,23 +38,22 @@
                 NSString *ticket = [tickets[0] valueForKey:@"ticket"];
                 homeUserModel.ticket = ticket;
                 [[AccountInfoStorage instance] saveTicket:ticket];
+                
+                [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+                    if(code == 200){
+                        userInfo = [UserInfoModel modelWithDictionary:data.data];
+                        [AccountInfoStorage instance].name = userInfo.nick;
+                        homeUserModel.nick = userInfo.nick;
+                        homeUserModel.avatar = userInfo.avatar;
+                        homeUserModel.isBindPhone = userInfo.isBindPhone;
+                    }
+                    dispatch_group_leave(group);
+                } uid:accountModel.uid];
+                return;
             }
             dispatch_group_leave(group);
         } access_token:accountModel.access_token issue_type:@"multi"];
     });
-    dispatch_group_enter(group);
-    dispatch_async(queue, ^{
-        [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-            if(code == 200){
-                userInfo = [UserInfoModel modelWithDictionary:data.data];
-                [AccountInfoStorage instance].name = userInfo.nick;
-                homeUserModel.nick = userInfo.nick;
-                homeUserModel.avatar = userInfo.avatar;
-                homeUserModel.isBindPhone = userInfo.isBindPhone;
-            }
-            dispatch_group_leave(group);
-        } uid:accountModel.uid];
-    });
     
   
 

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,6 +81,11 @@
 	[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 {
@@ -226,7 +231,10 @@
 	}];
 
 }
-
+- (void)setInviteCode:(NSString *)inviteCode{
+    _inviteCode = inviteCode;
+    self.codeTextField.text = _inviteCode;
+}
 ///更新用户信息
 - (void)updateUserInfo {
     [XNDJTDDLoadingTool showOnlyView:self.view];

YuMi/Modules/YMMessage/Model/AttachmentModel.h

@@ -96,8 +96,7 @@ 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,
     ///精灵密藏
@@ -114,6 +113,13 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_Guardian_Planet = 102,
     ///通用公屏信息
     CustomMessageType_General_Public_Screen = 103,
+    ///疯狂动物园飘屏
+    CustomMessageType_Graffiti_Star_Kitchen = 104,
+   
+    ///超级礼物
+    CustomMessageType_Super_Gift = 106,
+    ///通用飘屏
+    CustomMessageType_General_Floating_Screen = 107,
 };
 
 
@@ -547,12 +553,11 @@ 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 = 951,
+	Custom_Message_Sub_Star_Kitchen_Server = 1041,
     /// // 星级厨房礼物全服飘屏通知
-    Custom_Message_Sub_Star_Kitchen_FullScreen = 952,
+    Custom_Message_Sub_Star_Kitchen_FullScreen = 1042,
 };
 ///夺宝精灵 CustomMessageType_Treasure_Fairy = 97,
 typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) {
@@ -634,6 +639,20 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralPublicScreen) {
     Custom_Message_Sub_General_Public_Screen_All_Room = 1032,///全部房间
 };
 
+///超级礼物
+//CustomMessageType_Super_Gift = 106,
+typedef NS_ENUM(NSUInteger, CustomMessageTypeSuperGift) {
+    ///所有房间
+    Custom_Message_Sub_Super_Gift = 1061,
+   
+};
+///通用飘屏
+//CustomMessageType_General_Floating_Screen = 105,
+typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralFloatingScreen) {
+    ///所有房间
+    Custom_Message_Sub_General_Floating_Screen_One_Room = 1071,//单房间
+    Custom_Message_Sub_General_Floating_Screen_All_Room = 1072,///全部房间
+};
 @interface AttachmentModel : PIBaseModel<NIMCustomAttachment>
 @property (nonatomic,assign) int first;
 @property (nonatomic,assign) int second;

YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m

@@ -20,52 +20,53 @@
 @implementation XPSessionFindNewEmptyTableViewCell
 
 - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-	if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
-		[self initSubViews];
+        [self initSubViews];
-		[self initSubViewConstraints];
+        [self initSubViewConstraints];
-	}
+    }
-	return self;
+    return self;
 }
 
 #pragma mark - Private Method
 - (void)initSubViews {
-	self.backgroundColor = [UIColor clearColor];
+    self.backgroundColor = [UIColor clearColor];
-	self.selectionStyle = UITableViewCellSelectionStyleNone;
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
-	[self.contentView addSubview:self.emptyImageView];
+    [self.contentView addSubview:self.emptyImageView];
-	[self.contentView addSubview:self.titleLabel];
+    [self.contentView addSubview:self.titleLabel];
 }
 
 - (void)initSubViewConstraints {
-	[self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.centerX.mas_equalTo(self.contentView);
+        make.centerX.mas_equalTo(self.contentView);
-		make.top.mas_equalTo(self.contentView).offset(250);
+        make.top.mas_equalTo(self.contentView).offset(250);
-		make.size.mas_equalTo(CGSizeMake(100, 100));
+        make.size.mas_equalTo(CGSizeMake(100, 100));
-	}];
+    }];
-	
+    
-	[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20);
+        make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20);
-		make.left.right.mas_equalTo(self.contentView);
+        make.left.right.mas_equalTo(self.contentView);
-	}];
+    }];
 }
 #pragma mark - Getters And Setters
 - (UIImageView *)emptyImageView {
-	if (!_emptyImageView) {
+    if (!_emptyImageView) {
-		_emptyImageView = [[UIImageView alloc] init];
+        _emptyImageView = [[UIImageView alloc] init];
-		_emptyImageView.userInteractionEnabled = YES;
+        _emptyImageView.userInteractionEnabled = YES;
-		_emptyImageView.image = [UIImageConstant defalutEmptyPlaceholder];
+        _emptyImageView.image = [UIImageConstant defalutEmptyPlaceholder];
-		_emptyImageView.layer.masksToBounds = YES;
+        _emptyImageView.layer.masksToBounds = YES;
-		_emptyImageView.contentMode = UIViewContentModeScaleAspectFit;
+        _emptyImageView.contentMode = UIViewContentModeScaleAspectFit;
-	}
+    }
-	return _emptyImageView;
+    return _emptyImageView;
 }
 
 - (UILabel *)titleLabel {
-	if (!_titleLabel) {
+    if (!_titleLabel) {
-		_titleLabel = [[UILabel alloc] init];
+        _titleLabel = [[UILabel alloc] init];
-		_titleLabel.text = YMLocalizedString(@"XPSessionFindNewEmptyTableViewCell0");
+        _titleLabel.text = YMLocalizedString(@"XPSessionFindNewEmptyTableViewCell0");
-		_titleLabel.font = [UIFont systemFontOfSize:16];
+        _titleLabel.font = [UIFont systemFontOfSize:16];
-		_titleLabel.textAlignment = NSTextAlignmentCenter;
+        _titleLabel.textAlignment = NSTextAlignmentCenter;
-		_titleLabel.textColor = [DJDKMIMOMColor secondTextColor];
+        _titleLabel.textColor = [DJDKMIMOMColor secondTextColor];
-	}
+    }
-	return _titleLabel;
+    return _titleLabel;
-}@end
+}
+@end

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

@@ -25,7 +25,7 @@
 ///View
 #import "XPRoomViewController.h"
 #import "XPWebViewController.h"
-#import "XPMineRechargeViewController.h"
+
 #import "XPIAPRechargeViewController.h"
 #import "XPMineUserInfoViewController.h"
 #import "XPMineSimpleUserInfoViewController.h"
@@ -33,6 +33,7 @@
 #import "XPDressUpShopViewController.h"
 #import "XPMineLoginPasswordViewController.h"
 #import "XPMonentTopicContainerViewController.h"
+#import "XPNobleCenterViewController.h"
 ///P
 #import "RoomHostDelegate.h"
 @interface MessageContentTextClickable()
@@ -143,7 +144,6 @@
 		case SecretaryRouterType_Purse:
 		case SecretaryRouterType_Recharge:
 		{
-//			XPMineRechargeViewController * rechargeVC = [[XPMineRechargeViewController alloc] init];
             XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init];
                 rechargeVC.type = @"4";
 			[[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES];
@@ -246,6 +246,12 @@
             [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:topicVC animated:YES];
         }
             break;
+        case SecretaryRouterType_Nobel_Center:
+        {
+            XPNobleCenterViewController *nobleCenter = [XPNobleCenterViewController new];
+            [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:nobleCenter animated:YES];
+            break;
+        }
         default:
             break;
     }

YuMi/Modules/YMMine/Api/Api+Mine.h

@@ -112,9 +112,7 @@ NS_ASSUME_NONNULL_BEGIN
                                      password:(NSString *)password
                                        status:(NSNumber *)status
                                           uid:(NSString *)uid;
-/// 上传七牛获取token
+
-/// @param complection 完成
-+ (void)qiniuUpLoadImage:(HttpRequestHelperCompletion)complection;
 
 /// 上传用户图像到服务器
 /// @param complection 完成
@@ -345,6 +343,8 @@ NS_ASSUME_NONNULL_BEGIN
 ///   - roomUid: 房间id
 ///   - type: 1=房间
 +(void)requestUnmaskingFromBlackRoomList:(HttpRequestHelperCompletion)completion objId:(NSString *)objId type:(NSString *)type ;
+///得到腾讯存储信息
++ (void)getQCloudInfo:(HttpRequestHelperCompletion)completion;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/Api/Api+Mine.m

@@ -133,13 +133,11 @@
     [self  makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, password,status,uid, nil];
 }
 
-/// 上传七牛获取token
-/// @param completion 完成
-+ (void)qiniuUpLoadImage:(HttpRequestHelperCompletion)completion {
-    NSString * fang = [NSString stringFromBase64String:@"cWluaXUvdXBsb2FkL2dldFVwbG9hZFRva2Vu"];///qiniu/upload/getUploadToken
-    [self  makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
-}
 
+///得到腾讯存储信息
++ (void)getQCloudInfo:(HttpRequestHelperCompletion)completion{
+    [self  makeRequest:@"tencent/cos/getToken" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
+}
 
 /// 上传用户图像到服务器
 /// @param completion 完成

YuMi/Modules/YMMine/Model/Recharge/RechargeListModel.h

@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 //充值banner位数据
 @property(nonatomic,copy) NSString *bannerUrl;
 @property(nonatomic,copy) NSString *linkUrl;
+
 @end
 
 

YuMi/Modules/YMMine/Model/Recharge/WalletInfoModel.h

@@ -16,7 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, copy)NSString *goldNum;
 //钻石数量
 @property(nonatomic, copy)NSString *diamonds;
-
+//金币数量
+@property(nonatomic, assign) double golds;
 @property(nonatomic, copy)NSString *chargeGoldNum;
 
 @property(nonatomic, assign)NSInteger amount;
@@ -26,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, copy)NSString *depositNum;
 /// 是否有钻石转增功能
 @property (nonatomic, assign) BOOL sendGold;
+//是否可以在送礼时合并使用金币
+@property(nonatomic,assign) BOOL canGoldSendGift;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m

@@ -10,7 +10,7 @@
 #import "Api+Mine.h"
 ///Tool
 #import "AccountInfoStorage.h"
-#import "UploadImage.h"
+#import "UploadFile.h"
 ///Model
 #import "XPMineUserInfoEditModel.h"
 #import "UserInfoModel.h"
@@ -122,16 +122,14 @@
 /// 上传头像
 /// @param avatar  头像
 - (void)uploadAvatar:(UIImage *)avatar {
-    [Api qiniuUpLoadImage:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+    NSData *data = UIImageJPEGRepresentation(avatar, 0.5);
-        NSString *key = data.data[@"key"];
+    NSString *format = [UIImage getImageTypeWithImageData:data];
-        NSString *token = data.data[@"token"];
+    NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format];
-        [UploadImage uploadImage:avatar named:key token:token success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) {
+    [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) {
-            NSString *url = resp[@"path"];
+        [[self getView] uploadImageSuccess:key];
-            [[self getView] uploadImageSuccess:url];
+    } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) {
-        } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) {
+               
-            [[self getView] showErrorToast:YMLocalizedString(@"XPMineUserInfoEditPresenter0")];
+    }];
-        }];
-    }]];
 }
 
 ///获取地区列表

YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.m

@@ -69,18 +69,12 @@
 /// 上传声音文件
 /// @param filePath 文件路径
 - (void)uploadVoice:(NSString *)filePath {
-    [Api qiniuUpLoadImage:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+    NSString *name = [NSString stringWithFormat:@"file/%@",[NSString createUUID]];
-        NSString *key = data.data[@"key"];
+    [[UploadFile share]QCloudUploadFile:filePath named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) {
-        NSString *token = data.data[@"token"];
+        [[self getView] uploadVoiceFileToThirdSuccess:key];
-        [UploadFile uploadFile:filePath named:key token:token success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) {
-            NSString *url = resp[@"path"];
-            [[self getView] uploadVoiceFileToThirdSuccess:url];
         } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) {
             [[self getView] uploadVoiceFileFail:message];
         }];
-    } fail:^(NSInteger code, NSString * _Nullable msg) {
-        [[self getView] uploadVoiceFileFail:msg];
-    }showLoading:NO]];
 }
 -(void)saveSoundWithUrl:(NSString *)audioUrl second:(NSString *)second{
     [Api saveSoundCardInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) {

YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.m

@@ -12,7 +12,7 @@
 #import "UserInfoModel.h"
 ///Tool
 #import "AccountInfoStorage.h"
-#import "UploadImage.h"
+#import "UploadFile.h"
 ///P
 #import "XPMineUserInfoAlbumProtocol.h"
 
@@ -40,16 +40,15 @@
 /// 相册
 /// @param albumImage  相册的image
 - (void)uploadAlbumImage:(UIImage *)albumImage {
-	[Api qiniuUpLoadImage:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+    
-		NSString *key = data.data[@"key"];
+    NSData *data = UIImageJPEGRepresentation(albumImage, 0.5);
-		NSString *token = data.data[@"token"];
+    NSString *format = [UIImage getImageTypeWithImageData:data];
-		[UploadImage uploadImage:albumImage named:key token:token success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) {
+    NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format];
-			NSString *url = resp[@"path"];
+    [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) {
-			[[self getView] uploadAlbumImageToThirdSuccess:url];
+        [[self getView] uploadAlbumImageToThirdSuccess:key];
-		} failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) {
+    } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) {
-			[[self getView] showErrorToast:YMLocalizedString(@"XPMineUserInfolbumPresenter0")];
+               
-		}];
+    }];
-	} showLoading:YES]];
 }
 
 

YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m

@@ -27,7 +27,7 @@
 #import "XPWebViewController.h"
 #import "XPMineDressUpViewController.h"
 #import "XPDressUpShopCardViewController.h"
-#import "XPMineRechargeViewController.h"
+
 #import "XPIAPRechargeViewController.h"
 
 @interface XPDressUpShopViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, SDCycleScrollViewDelegate>
@@ -233,7 +233,6 @@
 }
 
 - (void)rechargeButtonAction:(UIButton *)sender {
-//    XPMineRechargeViewController *vc = [[XPMineRechargeViewController alloc] init];
     XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init];
     rechargeVC.type = @"4";
     [self.navigationController pushViewController:rechargeVC animated:YES];

YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h

@@ -14,9 +14,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// 贵族中心等级列表
 /// @param completion 完成
 + (void)nobleCenterLevelList:(HttpRequestHelperCompletion)completion;
-
+///领取返利钻石
++ (void)getNobleCenterDiamond:(HttpRequestHelperCompletion)completion returnProfitRecordId:(NSString *)returnProfitRecordId;
 ///获取开通贵族产品列表
-+ (void)getChargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType;
++ (void)getChargeList:(HttpRequestHelperCompletion)completion type:(NSString *)type;
 
 /// 苹果下单
 /// @param completion 完成
@@ -45,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 使用钻石开通贵族
 /// @param complection 完成回调
 /// @param roomUid 房主的uid
-+(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid;
++(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m

@@ -14,10 +14,13 @@
 + (void)nobleCenterLevelList:(HttpRequestHelperCompletion)completion {
     [self makeRequest:@"vip/getVipPageInfo" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
 }
-
+///领取返利钻石
++ (void)getNobleCenterDiamond:(HttpRequestHelperCompletion)completion returnProfitRecordId:(NSString *)returnProfitRecordId{
+    [self makeRequest:@"vip/returnProfit/receive" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, returnProfitRecordId,nil];
+}
 ///获取开通贵族产品列表
-+ (void)getChargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType {
++ (void)getChargeList:(HttpRequestHelperCompletion)completion type:(NSString *)type  {
-    [self makeRequest:@"chargeprod/listV2" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, channelType, nil];
+    [self makeRequest:@"chargeprod/getVipList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, type, nil];
 }
 
 /// 苹果下单
@@ -56,11 +59,14 @@
 /// 使用钻石开通贵族
 /// @param complection 完成回调
 /// @param roomUid 房主的uid
-+(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid {
++(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel{
     NSMutableDictionary * dic = [NSMutableDictionary dictionary];
     if (roomUid.length > 0) {
         [dic setValue:roomUid forKey:@"roomUid"];
     }
+    if (vipLevel.length > 0){
+        [dic setValue:vipLevel forKey:@"vipLevel"];
+    }
     [HttpRequestHelper request:@"vip/openWithDiamond" method:HttpRequestHelperMethodPOST params:dic completion:complection];
 }
 @end

YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.h

@@ -31,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///status
 @property (nonatomic,  assign) NSInteger status;
 
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+#import "PINobleRebateModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface NobleInfo : PIBaseModel
@@ -29,7 +29,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *vipLogo;
 ///贵族名称
 @property (nonatomic, copy) NSString *vipName;
+///返钻
+@property(nonatomic,copy) NSArray<PINobleRebateModel *> *returnProfits;
 
+@property(nonatomic,assign) BOOL isReturnProfit;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.m

@@ -9,4 +9,10 @@
 
 @implementation NobleInfo
 
++ (NSDictionary *)objectClassInArray {
+    return @{
+        @"returnProfits": [PINobleRebateModel class],
+    };
+}
+
 @end

YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.h

@@ -0,0 +1,18 @@
+//
+//  PINobleCenterListModel.h
+//  YuMi
+//
+//  Created by duoban on 2024/3/27.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PINobleCenterListModel : NSObject
+
+
+
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.m

@@ -0,0 +1,12 @@
+//
+//  PINobleCenterListModel.m
+//  YuMi
+//
+//  Created by duoban on 2024/3/27.
+//
+
+#import "PINobleCenterListModel.h"
+
+@implementation PINobleCenterListModel
+
+@end

YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.h

@@ -0,0 +1,23 @@
+//
+//  PINobleRebateModel.h
+//  YuMi
+//
+//  Created by duoban on 2024/3/29.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PINobleRebateModel : NSObject
+@property(nonatomic,copy) NSString *id;
+@property(nonatomic,assign) BOOL isReceive;
+@property(nonatomic,copy) NSString *profitAmount;
+@property(nonatomic,copy) NSString *profitDate;
+@property(nonatomic,assign) int seqNo;
+@property(nonatomic,assign) int vipLevel;
+@property(nonatomic,assign) BOOL isReach;
+@property(nonatomic,copy) NSString *returnProfitRecordId;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.m

@@ -0,0 +1,12 @@
+//
+//  PINobleRebateModel.m
+//  YuMi
+//
+//  Created by duoban on 2024/3/29.
+//
+
+#import "PINobleRebateModel.h"
+
+@implementation PINobleRebateModel
+
+@end