diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 28814b5a..1fbd30d7 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -32,13 +32,6 @@ 1427219629A75F6F00C7C423 /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215A29A75F6F00C7C423 /* DDData.m */; }; 1427219729A75F6F00C7C423 /* DDRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215D29A75F6F00C7C423 /* DDRange.m */; }; 1427219829A75F6F00C7C423 /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215F29A75F6F00C7C423 /* HTTPServer.m */; }; - 142721A829A75F6F00C7C423 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427217729A75F6F00C7C423 /* DDTTYLogger.m */; }; - 142721A929A75F6F00C7C423 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427217A29A75F6F00C7C423 /* DDASLLogger.m */; }; - 142721AA29A75F6F00C7C423 /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427217F29A75F6F00C7C423 /* ContextFilterLogFormatter.m */; }; - 142721AB29A75F6F00C7C423 /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427218029A75F6F00C7C423 /* DispatchQueueLogFormatter.m */; }; - 142721AC29A75F6F00C7C423 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427218129A75F6F00C7C423 /* DDLog.m */; }; - 142721AD29A75F6F00C7C423 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427218329A75F6F00C7C423 /* DDAbstractDatabaseLogger.m */; }; - 142721AE29A75F6F00C7C423 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427218429A75F6F00C7C423 /* DDFileLogger.m */; }; 142721AF29A75F6F00C7C423 /* SJXCSMIPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427218629A75F6F00C7C423 /* SJXCSMIPHelper.m */; }; 142721B229A7647F00C7C423 /* XPBlankViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 142721B129A7647F00C7C423 /* XPBlankViewController.m */; }; 1464C5EA29A45FC300AF7C94 /* XPButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5E929A45FC300AF7C94 /* XPButton.m */; }; @@ -130,6 +123,14 @@ 18F404BB2760982000A6C548 /* ChatLimitModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404BA2760982000A6C548 /* ChatLimitModel.m */; }; 18F404C3276098F100A6C548 /* Api+Message.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404C2276098F100A6C548 /* Api+Message.m */; }; 18F404C927609A4300A6C548 /* MessagePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404C827609A4300A6C548 /* MessagePresenter.m */; }; + 23194DBB2AD13EAB00649F51 /* PILoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DBA2AD13EAB00649F51 /* PILoginManager.m */; }; + 23194DCC2AD14BF000649F51 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DBD2AD14BF000649F51 /* DDTTYLogger.m */; }; + 23194DCD2AD14BF000649F51 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC02AD14BF000649F51 /* DDASLLogger.m */; }; + 23194DCE2AD14BF000649F51 /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC52AD14BF000649F51 /* ContextFilterLogFormatter.m */; }; + 23194DCF2AD14BF000649F51 /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC62AD14BF000649F51 /* DispatchQueueLogFormatter.m */; }; + 23194DD02AD14BF000649F51 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC72AD14BF000649F51 /* DDLog.m */; }; + 23194DD12AD14BF000649F51 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */; }; + 23194DD22AD14BF000649F51 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DCA2AD14BF000649F51 /* DDFileLogger.m */; }; 2323E0372ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 2323E0362ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m */; }; 232C43EA2AB15F4100D4B2ED /* XPRoomTarrowBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */; }; 232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */; }; @@ -1448,20 +1449,6 @@ 1427215F29A75F6F00C7C423 /* HTTPServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPServer.m; sourceTree = ""; }; 1427217329A75F6F00C7C423 /* SJXCSMIPHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SJXCSMIPHelper.h; sourceTree = ""; }; 1427217429A75F6F00C7C423 /* MyHTTPConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyHTTPConnection.h; sourceTree = ""; }; - 1427217729A75F6F00C7C423 /* DDTTYLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDTTYLogger.m; sourceTree = ""; }; - 1427217829A75F6F00C7C423 /* DDLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLog.h; sourceTree = ""; }; - 1427217929A75F6F00C7C423 /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDAbstractDatabaseLogger.h; sourceTree = ""; }; - 1427217A29A75F6F00C7C423 /* DDASLLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDASLLogger.m; sourceTree = ""; }; - 1427217B29A75F6F00C7C423 /* DDFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDFileLogger.h; sourceTree = ""; }; - 1427217D29A75F6F00C7C423 /* ContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextFilterLogFormatter.h; sourceTree = ""; }; - 1427217E29A75F6F00C7C423 /* DispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchQueueLogFormatter.h; sourceTree = ""; }; - 1427217F29A75F6F00C7C423 /* ContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextFilterLogFormatter.m; sourceTree = ""; }; - 1427218029A75F6F00C7C423 /* DispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DispatchQueueLogFormatter.m; sourceTree = ""; }; - 1427218129A75F6F00C7C423 /* DDLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDLog.m; sourceTree = ""; }; - 1427218229A75F6F00C7C423 /* DDTTYLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDTTYLogger.h; sourceTree = ""; }; - 1427218329A75F6F00C7C423 /* DDAbstractDatabaseLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDAbstractDatabaseLogger.m; sourceTree = ""; }; - 1427218429A75F6F00C7C423 /* DDFileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDFileLogger.m; sourceTree = ""; }; - 1427218529A75F6F00C7C423 /* DDASLLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogger.h; sourceTree = ""; }; 1427218629A75F6F00C7C423 /* SJXCSMIPHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SJXCSMIPHelper.m; sourceTree = ""; }; 142721B029A7647F00C7C423 /* XPBlankViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPBlankViewController.h; sourceTree = ""; }; 142721B129A7647F00C7C423 /* XPBlankViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPBlankViewController.m; sourceTree = ""; }; @@ -1655,6 +1642,22 @@ 18F404C6276099DF00A6C548 /* MessageProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageProtocol.h; sourceTree = ""; }; 18F404C727609A4300A6C548 /* MessagePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessagePresenter.h; sourceTree = ""; }; 18F404C827609A4300A6C548 /* MessagePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessagePresenter.m; sourceTree = ""; }; + 23194DB92AD13EAB00649F51 /* PILoginManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PILoginManager.h; sourceTree = ""; }; + 23194DBA2AD13EAB00649F51 /* PILoginManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PILoginManager.m; sourceTree = ""; }; + 23194DBD2AD14BF000649F51 /* DDTTYLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDTTYLogger.m; sourceTree = ""; }; + 23194DBE2AD14BF000649F51 /* DDLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLog.h; sourceTree = ""; }; + 23194DBF2AD14BF000649F51 /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDAbstractDatabaseLogger.h; sourceTree = ""; }; + 23194DC02AD14BF000649F51 /* DDASLLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDASLLogger.m; sourceTree = ""; }; + 23194DC12AD14BF000649F51 /* DDFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDFileLogger.h; sourceTree = ""; }; + 23194DC32AD14BF000649F51 /* ContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextFilterLogFormatter.h; sourceTree = ""; }; + 23194DC42AD14BF000649F51 /* DispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchQueueLogFormatter.h; sourceTree = ""; }; + 23194DC52AD14BF000649F51 /* ContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextFilterLogFormatter.m; sourceTree = ""; }; + 23194DC62AD14BF000649F51 /* DispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DispatchQueueLogFormatter.m; sourceTree = ""; }; + 23194DC72AD14BF000649F51 /* DDLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDLog.m; sourceTree = ""; }; + 23194DC82AD14BF000649F51 /* DDTTYLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDTTYLogger.h; sourceTree = ""; }; + 23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDAbstractDatabaseLogger.m; sourceTree = ""; }; + 23194DCA2AD14BF000649F51 /* DDFileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDFileLogger.m; sourceTree = ""; }; + 23194DCB2AD14BF000649F51 /* DDASLLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogger.h; sourceTree = ""; }; 2323E0352ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "FBSDKSettings+PISDKSettings.h"; path = "YuMi/Appdelegate/FBSDKSettings+PISDKSettings.h"; sourceTree = SOURCE_ROOT; }; 2323E0362ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "FBSDKSettings+PISDKSettings.m"; path = "YuMi/Appdelegate/FBSDKSettings+PISDKSettings.m"; sourceTree = SOURCE_ROOT; }; 232C43E82AB15F4100D4B2ED /* XPRoomTarrowBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTarrowBannerView.h; sourceTree = ""; }; @@ -4132,40 +4135,11 @@ 1427217529A75F6F00C7C423 /* Vendor */ = { isa = PBXGroup; children = ( - 1427217629A75F6F00C7C423 /* CocoaLumberjack */, + 23194DBC2AD14BF000649F51 /* CocoaLumberjack */, ); path = Vendor; sourceTree = ""; }; - 1427217629A75F6F00C7C423 /* CocoaLumberjack */ = { - isa = PBXGroup; - children = ( - 1427217729A75F6F00C7C423 /* DDTTYLogger.m */, - 1427217829A75F6F00C7C423 /* DDLog.h */, - 1427217929A75F6F00C7C423 /* DDAbstractDatabaseLogger.h */, - 1427217A29A75F6F00C7C423 /* DDASLLogger.m */, - 1427217B29A75F6F00C7C423 /* DDFileLogger.h */, - 1427217C29A75F6F00C7C423 /* Extensions */, - 1427218129A75F6F00C7C423 /* DDLog.m */, - 1427218229A75F6F00C7C423 /* DDTTYLogger.h */, - 1427218329A75F6F00C7C423 /* DDAbstractDatabaseLogger.m */, - 1427218429A75F6F00C7C423 /* DDFileLogger.m */, - 1427218529A75F6F00C7C423 /* DDASLLogger.h */, - ); - path = CocoaLumberjack; - sourceTree = ""; - }; - 1427217C29A75F6F00C7C423 /* Extensions */ = { - isa = PBXGroup; - children = ( - 1427217D29A75F6F00C7C423 /* ContextFilterLogFormatter.h */, - 1427217E29A75F6F00C7C423 /* DispatchQueueLogFormatter.h */, - 1427217F29A75F6F00C7C423 /* ContextFilterLogFormatter.m */, - 1427218029A75F6F00C7C423 /* DispatchQueueLogFormatter.m */, - ); - path = Extensions; - sourceTree = ""; - }; 14D8767E29A750A300E1DD7F /* YMWeb */ = { isa = PBXGroup; children = ( @@ -4682,6 +4656,8 @@ children = ( 189DD76026E60DDC00AB55B1 /* Api+Login.h */, 189DD76126E60DDC00AB55B1 /* Api+Login.m */, + 23194DB92AD13EAB00649F51 /* PILoginManager.h */, + 23194DBA2AD13EAB00649F51 /* PILoginManager.m */, ); path = Api; sourceTree = ""; @@ -4855,6 +4831,35 @@ path = Protocol; sourceTree = ""; }; + 23194DBC2AD14BF000649F51 /* CocoaLumberjack */ = { + isa = PBXGroup; + children = ( + 23194DBD2AD14BF000649F51 /* DDTTYLogger.m */, + 23194DBE2AD14BF000649F51 /* DDLog.h */, + 23194DBF2AD14BF000649F51 /* DDAbstractDatabaseLogger.h */, + 23194DC02AD14BF000649F51 /* DDASLLogger.m */, + 23194DC12AD14BF000649F51 /* DDFileLogger.h */, + 23194DC22AD14BF000649F51 /* Extensions */, + 23194DC72AD14BF000649F51 /* DDLog.m */, + 23194DC82AD14BF000649F51 /* DDTTYLogger.h */, + 23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */, + 23194DCA2AD14BF000649F51 /* DDFileLogger.m */, + 23194DCB2AD14BF000649F51 /* DDASLLogger.h */, + ); + path = CocoaLumberjack; + sourceTree = ""; + }; + 23194DC22AD14BF000649F51 /* Extensions */ = { + isa = PBXGroup; + children = ( + 23194DC32AD14BF000649F51 /* ContextFilterLogFormatter.h */, + 23194DC42AD14BF000649F51 /* DispatchQueueLogFormatter.h */, + 23194DC52AD14BF000649F51 /* ContextFilterLogFormatter.m */, + 23194DC62AD14BF000649F51 /* DispatchQueueLogFormatter.m */, + ); + path = Extensions; + sourceTree = ""; + }; 2331C12F2A5EB71000E1D940 /* Noble */ = { isa = PBXGroup; children = ( @@ -10305,7 +10310,6 @@ E8B846D826FDE17300A777FE /* XPMineRechargeProtocol.h in Sources */, E88C72A6282921D60047FB2B /* XPRoomBackMusicPlayerView.m in Sources */, E84CBCE72843807500D43221 /* XPMineFriendPresenter.m in Sources */, - 142721A829A75F6F00C7C423 /* DDTTYLogger.m in Sources */, E82D5C7D276B343300858D6D /* YYAnimatedImageView+ImageShow.m in Sources */, E80E09B32A42071D00CD2BE7 /* XPRoomStarKitchenBannerView.m in Sources */, E8B846C726FDB45000A777FE /* XPMineUserInfoAlbumProtocol.h in Sources */, @@ -10332,7 +10336,6 @@ E8D34D5028080362009C4835 /* XPMineDataGiftTableViewCell.m in Sources */, E87C54BE2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.m in Sources */, E85E7B322A4EB0D300B6D00A /* XPGuildAnchorIncomeSectionView.m in Sources */, - 142721AC29A75F6F00C7C423 /* DDLog.m in Sources */, E83953222769F33B00CF2F24 /* XPRoomFunctionContainerView.m in Sources */, E87C0AA027D9DE6400CB2241 /* RoomFaceSendInfoModel.m in Sources */, 1464C5F629A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m in Sources */, @@ -10413,7 +10416,6 @@ 9BBC028E2786FA060007C24B /* NobleCardModel.m in Sources */, 9BCB99A628F582EC00466D64 /* XPMineCollectRoomEditCell.m in Sources */, E8E70D7E26F2F19D00F03460 /* Api+Mine.m in Sources */, - 142721AE29A75F6F00C7C423 /* DDFileLogger.m in Sources */, E85E7B3B2A4EB0D300B6D00A /* XPGuildSearchSuperAdminTableViewCell.m in Sources */, E8751E6E28A64F990056EF44 /* XPSailingEmptyTableViewCell.m in Sources */, E87E625A2A3F560B002F68C9 /* XPHomeRecommendViewController.m in Sources */, @@ -10487,6 +10489,7 @@ E8DEC9A12764A5D20078CB70 /* XPRoomMoreItemModel.m in Sources */, E80EC81028ACD84000D133C5 /* QExtendBoardView.m in Sources */, 9B87B3CD2926473D00085110 /* XPSessionListHeadFriendCell.m in Sources */, + 23194DCD2AD14BF000649F51 /* DDASLLogger.m in Sources */, E85E7B492A4EB0D300B6D00A /* XPMineGuildSearchViewController.m in Sources */, 9B86D88328192DC000494FCD /* XPRoomRankEntranceView.m in Sources */, E85E7B012A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m in Sources */, @@ -10594,8 +10597,8 @@ 23E9EAB22A84C9DE00B792F2 /* XPMineUserInfoTagViewCell.m in Sources */, 9B42869C28C1FD3D009034D2 /* XPOpenRedPacketCell.m in Sources */, 9BFE992E288142FD009DA429 /* RoomClassifyModel.m in Sources */, - 142721AB29A75F6F00C7C423 /* DispatchQueueLogFormatter.m in Sources */, 2331C1B72A60F32D00E1D940 /* XPCandyRankContainerView.m in Sources */, + 23194DCE2AD14BF000649F51 /* ContextFilterLogFormatter.m in Sources */, E8A88D3027E85EEA00CA8837 /* RoomPKInfoModel.m in Sources */, E85E7B022A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m in Sources */, E8AB633328AE51470023B0D2 /* XPSailingPrizeView.m in Sources */, @@ -10740,6 +10743,7 @@ E818DD1C2A4896EE00F163F7 /* XPLoginAraeViewController.m in Sources */, E8D4824A278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m in Sources */, E85E7B432A4EB0D300B6D00A /* XPMineExchangeAuthorityHeadView.m in Sources */, + 23194DD02AD14BF000649F51 /* DDLog.m in Sources */, 189DD73F26E21C3F00AB55B1 /* YYUtility+Carrier.m in Sources */, 238B37AE2AC55A2C00BFC9D5 /* TreasureFairyFragmentModel.m in Sources */, E87AE7F9277AABE50037823A /* XPRoomTagListViewController.m in Sources */, @@ -10802,6 +10806,7 @@ E8395331276A03AE00CF2F24 /* Api+DressUp.m in Sources */, E8B3E8092848B871009746AB /* InviteUserInfoModel.m in Sources */, E85E7B352A4EB0D300B6D00A /* XPClanMemberTableViewCell.m in Sources */, + 23194DBB2AD13EAB00649F51 /* PILoginManager.m in Sources */, E8DEC99E2764A5B60078CB70 /* XPRoomMoreMenuViewController.m in Sources */, E82325F2274E2DE6003A3332 /* XPUserCardViewController.m in Sources */, E85E7B512A4EB0D300B6D00A /* Api+Guild.m in Sources */, @@ -10810,7 +10815,6 @@ E8F65C222869A36F009BB5B9 /* ContentShareMonentsModel.m in Sources */, 9B6E856E281AABAB0041A321 /* XPRoomRecommendModel.m in Sources */, E84A2E992A52817E00D6AF8A /* XPIncomeRecordView.m in Sources */, - 142721AD29A75F6F00C7C423 /* DDAbstractDatabaseLogger.m in Sources */, E801274B27E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.m in Sources */, 2331C1B02A60F32D00E1D940 /* XPCandyTreeMoreView.m in Sources */, E8412FB02779CB4D006E1101 /* XPRoomSettingPresenter.m in Sources */, @@ -10884,7 +10888,6 @@ 189DD67E26E1FD8900AB55B1 /* UIImage+Utils.m in Sources */, E82D5C73276AE94800858D6D /* CarModel.m in Sources */, E85E7B0B2A4EB0D200B6D00A /* XPGuildSetNamePresenter.m in Sources */, - 142721AA29A75F6F00C7C423 /* ContextFilterLogFormatter.m in Sources */, E87E62762A3F5907002F68C9 /* XPNewHomePlayTableViewCell.m in Sources */, 186A534726FC6ED900D67B2C /* TTAlertConfig.m in Sources */, 18F403EE2758CF2F00A6C548 /* MessageContentImage.m in Sources */, @@ -10902,7 +10905,6 @@ E85E7BB02A4EC99300B6D00A /* Api+GiveDiamond.m in Sources */, E874B88B27215EAF003954B9 /* MicroQueueModel.m in Sources */, 9B1B72B828003772003FACE9 /* XPAnchorPKPresenter.m in Sources */, - 142721A929A75F6F00C7C423 /* DDASLLogger.m in Sources */, E8EE827D272B9A2300A17217 /* XPRoomSendTextView.m in Sources */, E8AB631928ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m in Sources */, 9BD63FAE277EE97A006EB744 /* XPReleaseRadioPresenter.m in Sources */, @@ -10911,6 +10913,7 @@ 238B37DA2AC55A2C00BFC9D5 /* PITreasureFairyBuyElfShardInputNumView.m in Sources */, E8751E6B28A64C6E0056EF44 /* XPSailingRankTableViewCell.m in Sources */, 9B1B72B528003664003FACE9 /* Api+AnchorPk.m in Sources */, + 23194DCC2AD14BF000649F51 /* DDTTYLogger.m in Sources */, E8EEB90626FC5772007C6EBA /* XPMineUserInfoEditViewController.m in Sources */, 23E9EA912A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.m in Sources */, E8B846D626FDE01B00A777FE /* XPMineRechargePresenter.m in Sources */, @@ -11025,6 +11028,7 @@ E84A2EAB2A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.m in Sources */, E82107812987D7F300DE7040 /* MessageMonentsModel.m in Sources */, E81366E726F0A49E0076364C /* NSString+Utils.m in Sources */, + 23194DD22AD14BF000649F51 /* DDFileLogger.m in Sources */, E8EEB90126FC31B6007C6EBA /* XPMineUserInfoPresenter.m in Sources */, E81A65312834E53600F55894 /* XPMonentsLatestViewController.m in Sources */, 18F404BB2760982000A6C548 /* ChatLimitModel.m in Sources */, @@ -11156,6 +11160,7 @@ 9B7B605B27BB53060070BB72 /* XPAnchorAudienceUpMicView.m in Sources */, 238B37D02AC55A2C00BFC9D5 /* XPTreasureFairySummonGiftView.m in Sources */, 14DCAD0E299B6AD900A7DD31 /* XPForgetPwdViewController.m in Sources */, + 23194DD12AD14BF000649F51 /* DDAbstractDatabaseLogger.m in Sources */, 9BE9F0FF27FED76500667200 /* XPAnchorFansTaskModel.m in Sources */, E85E7BAA2A4EC99300B6D00A /* XPMineGiveDiamondPwdView.m in Sources */, 23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */, @@ -11395,6 +11400,7 @@ 9BE01AD128927AC000B50299 /* XPDressUpShopViewController.m in Sources */, E8D34D6728084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m in Sources */, 23E9E9AA2A80FDF100B792F2 /* XPNewMineHallIncomeCell.m in Sources */, + 23194DCF2AD14BF000649F51 /* DispatchQueueLogFormatter.m in Sources */, E8A30BE328534A28003B4873 /* XPSessionFindNewViewController.m in Sources */, 140A7F52299CC69000841594 /* XPTabBar.m in Sources */, E85E7B0C2A4EB0D200B6D00A /* XPGuildMangerListPresenter.m in Sources */, diff --git a/YuMi/Global/YUMIConstant.h b/YuMi/Global/YUMIConstant.h index c0ed0838..7bfd2234 100644 --- a/YuMi/Global/YUMIConstant.h +++ b/YuMi/Global/YUMIConstant.h @@ -16,7 +16,6 @@ UIKIT_EXTERN NSString * const kVisitorUnReadCountNotificationKey; UIKIT_EXTERN NSString * const kHadShowNewUserGiftKey; UIKIT_EXTERN NSString * const kRedPacketHistory; UIKIT_EXTERN NSString * const kTuWenMessageHistory;///图文消息已读记录 -UIKIT_EXTERN NSString * const kTeenagerStatusChange; UIKIT_EXTERN NSString * const kRoomQuickMessageCloseCount; UIKIT_EXTERN NSString * const kLoginMethod; typedef NS_ENUM(NSUInteger, Pi_KeyType) { diff --git a/YuMi/Global/YUMIConstant.m b/YuMi/Global/YUMIConstant.m index d23a41e6..0a3341cb 100644 --- a/YuMi/Global/YUMIConstant.m +++ b/YuMi/Global/YUMIConstant.m @@ -24,7 +24,6 @@ NSString * const kFromSearchToHomeViewKey = @"pr5yHog50uSsZLKj2nA6Ono3Mq/bLTDyng NSString * const kTabShowAnchorCardKey = @"MIO0LwD8MCBISnBOps47VF1waAwY+/XFOm2C3luic/k="; //tab展示主播卡片 NSString * const kRedPacketHistory = @"nwKkblakw5CH37vvs9YcSjHhVHcOoeZMmE09gg7Ymhk"; NSString * const kTuWenMessageHistory = @"AMRtf6yOWYapbYqqOBK+m5IUPsFN5hfbOpPkrYvOr1E=";//图文消息已读记录 -NSString * const kTeenagerStatusChange = @"Pn5RRk7StcSdlVksgBaunx8mADfiSN1UnkpU7FSBGis=";//青少年状态改变 NSString * const kRoomQuickMessageCloseCount = @"bUi7KnisS+mmUMj45e9s4VycnvRvBViGvd/ouRS4SHo=";//房间快捷发言关闭次数 NSString * const kShieldingNotification = @"a1NoaWVsZGluZ05vdGlmaWNhdGlvbg==";///屏蔽房间 NSString * const kRoomKickoutTime = @"a1Jvb21LaWNrb3V0VGltZQ==";///被踢时间 @@ -35,6 +34,7 @@ NSString * const kGiveDiamondDailyNum = @"a0dpdmVEaWFtb25kRGFpbHlOdW0="; NSString * const kShowFirstRechargeView = @"a1Nob3dGaXJzdFJlY2hhcmdlVmlldw=="; ///邀请成员成功 NSString * const kInviteMemeberSuccess = @"a0ludml0ZU1lbWViZXJTdWNjZXNz"; +NSString * const kUserFirstRegisterKey = @"kUserFirstRegisterKey"; ///登录方式 NSString * const kLoginMethod = @"a0xvZ2luTWV0aG9k"; NSString * const kRequestRicket = @"a1JlcXVlc3RSaWNrZXQ="; diff --git a/YuMi/Modules/YMLogin/Api/PILoginManager.h b/YuMi/Modules/YMLogin/Api/PILoginManager.h new file mode 100644 index 00000000..1fbf390e --- /dev/null +++ b/YuMi/Modules/YMLogin/Api/PILoginManager.h @@ -0,0 +1,20 @@ +// +// PILoginManager.h +// YuMi +// +// Created by duoban on 2023/10/7. +// + +#import +#import "MvpViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface PILoginManager : NSObject +///登录，是否手机isLoginPhone ++(void)loginWithVC:(MvpViewController *)VC isLoginPhone:(BOOL)isLoginPhone; +///登录成功，回到首页 ++(void)jumpToHomeVCWithInviteCode:(NSString *)inviteCode; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/Api/PILoginManager.m b/YuMi/Modules/YMLogin/Api/PILoginManager.m new file mode 100644 index 00000000..85efb051 --- /dev/null +++ b/YuMi/Modules/YMLogin/Api/PILoginManager.m @@ -0,0 +1,103 @@ +// +// PILoginManager.m +// YuMi +// +// Created by duoban on 2023/10/7. +// + +#import "PILoginManager.h" +///api +#import "Api+Main.h" +///vc +#import "LoginFullInfoViewController.h" +#import "TabbarViewController.h" +#import "BaseNavigationController.h" +#import "LoginVerifCodeViewController.h" +///Model +#import "ThirdUserInfo.h" +#import "AccountModel.h" +#import "UserInfoModel.h" +@implementation PILoginManager ++(void)loginWithVC:(MvpViewController *)VC isLoginPhone:(BOOL)isLoginPhone{ + AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo]; + HomeUserModel *homeUserModel = [HomeUserModel new]; + if (accountModel == nil || accountModel.uid == nil || accountModel.access_token == nil) { + [XNDJTDDLoadingTool hideOnlyView:VC.view]; + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"LoginPresenter1")]; + return; + } + __block UserInfoModel *userInfo; + dispatch_group_t group = dispatch_group_create(); + dispatch_queue_t queue =dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0); + dispatch_group_enter(group); + dispatch_async(queue, ^{ + [Api requestTicket:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + if(code == 200){ + NSArray *tickets = [data.data valueForKey:@"tickets"]; + NSString *ticket = [tickets[0] valueForKey:@"ticket"]; + homeUserModel.ticket = ticket; + [[AccountInfoStorage instance] saveTicket:ticket]; + } + 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]; + homeUserModel.nick = userInfo.nick; + homeUserModel.avatar = userInfo.avatar; + homeUserModel.isBindPhone = userInfo.isBindPhone; + } + dispatch_group_leave(group); + } uid:accountModel.uid]; + }); + + __block NSString *isFlag = @""; + + if(isLoginPhone == YES){ + dispatch_group_enter(group); + dispatch_async(queue, ^{ + [Api requestAuthorizationCodeInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + if(code == 200){ + isFlag = [data.data boolValue] == YES ? @"1" : @"0" ; + }else{ + isFlag = @"2"; + } + dispatch_group_leave(group); + }]; + }); + } + dispatch_group_notify(group, dispatch_get_main_queue(), ^{ + [XNDJTDDLoadingTool hideOnlyView:VC.view]; + if ([[AccountInfoStorage instance] getTicket].length <= 0 || userInfo == nil || [isFlag isEqualToString:@"2"]) { + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"LoginPresenter1")]; + return; + } + [[AccountInfoStorage instance]saveHomeUserInfo:homeUserModel]; + if (userInfo.nick == nil || userInfo.avatar == nil) { + if([isFlag isEqualToString:@"0"]){ + LoginVerifCodeViewController *lvc = [[LoginVerifCodeViewController alloc] init]; + lvc.type = VerifCodeType_AreaCode; + [VC.navigationController pushViewController:lvc animated:YES]; + }else{ + LoginFullInfoViewController * FullVC = [[LoginFullInfoViewController alloc] init]; + [VC.navigationController pushViewController:FullVC animated:YES]; + } + return; + } + [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"PKIDLoginViewController0")]; + [PILoginManager jumpToHomeVCWithInviteCode:@""]; + }); + + +} ++(void)jumpToHomeVCWithInviteCode:(NSString *)inviteCode{ + TabbarViewController *vc = [[TabbarViewController alloc] init]; + vc.isFormLogin = YES; + vc.inviteCode = inviteCode; + BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc]; + kWindow.rootViewController = bnc; +} +@end diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m index 171533fc..fd89df1e 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m @@ -11,7 +11,7 @@ #import #import "XPLoginInputView.h" - +#import "PILoginManager.h" #import "XPLoginPwdViewController.h" #import "XPLoginAraeViewController.h" #import "LoginVerifCodePresent.h" @@ -231,23 +231,13 @@ [[NSUserDefaults standardUserDefaults]setValue:@(ThirdLoginType_Phone) forKey:@"kLoginSuccessType"]; [[NSUserDefaults standardUserDefaults]synchronize]; [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController1")]; - UIViewController *vc = self.presentingViewController; - while (vc.presentingViewController) { - vc = vc.presentingViewController; - } - [vc dismissViewControllerAnimated:YES completion:nil]; - [self.navigationController popToRootViewControllerAnimated:NO]; + [PILoginManager loginWithVC:self isLoginPhone:YES]; } - (void)loginSuccess { [XNDJTDDLoadingTool hideOnlyView:self.view]; [[NSUserDefaults standardUserDefaults]removeObjectForKey:@"kLoginSuccessType"]; [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController1")]; - UIViewController *vc = self.presentingViewController; - while (vc.presentingViewController) { - vc = vc.presentingViewController; - } - [vc dismissViewControllerAnimated:YES completion:nil]; - [self.navigationController popToRootViewControllerAnimated:NO]; + [PILoginManager loginWithVC:self isLoginPhone:NO]; } - (void)loginFailWithMsg:(NSString *)msg{ [self showErrorToast:msg]; diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 886ceaad..172fbd0f 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -26,7 +26,7 @@ #import "AESUtils.h" #import "LoginPresenter.h" #import "LoginProtocol.h" - +#import "PILoginManager.h" UIKIT_EXTERN NSString * const kYouMiNumberCountKey; NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; @@ -287,7 +287,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; } #pragma mark - LoginProtocol - (void)loginSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; + [PILoginManager loginWithVC:self isLoginPhone:NO]; [self showSuccessToast:YMLocalizedString(@"XPLoginViewController4")]; } diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.h b/YuMi/Modules/YMTabbar/View/TabbarViewController.h index b26858be..272113a4 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.h +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.h @@ -6,6 +6,8 @@ // @interface TabbarViewController : UITabBarController - +@property (nonatomic,assign) BOOL isFormLogin; +///邀请码 +@property (nonatomic,copy) NSString *inviteCode; @end diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m index 9b476809..015c7c80 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m @@ -95,12 +95,11 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; { NSTimer * timer; } - +///用户信息 +@property (nonatomic,strong) HomeUserModel *userInfo; @property (nonatomic, strong) MainPresenter *presenter; ///房间最小化 @property (nonatomic,strong) XPMiniRoomView *roomMineView; -///邀请码 -@property (nonatomic,copy) NSString *inviteCode; ///需要显示新用户充值优惠弹窗 @property (nonatomic, assign) BOOL needShowNewUserRecharge; ///需要展示主播卡片(首次） @@ -113,8 +112,6 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; @property (nonatomic, strong) XPTaskCompleteTipView *taskTipView; ///全服广播 年度飘屏 @property (nonatomic,strong) NSMutableArray *giftBroadcastQueue; -///青少年模式 -@property (nonatomic, assign) BOOL parentMode; ///是否是的第一次链接网络 @property (nonatomic,assign) BOOL isFirstReachability; ///是否刷新了 @@ -128,7 +125,13 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; @end @implementation TabbarViewController - +- (void)dealloc{ + [[NSNotificationCenter defaultCenter]removeObserver:self]; + [[NIMSDK sharedSDK].loginManager removeDelegate:self]; + [[NIMSDK sharedSDK].chatManager removeDelegate:self]; + [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; + [[NIMSDK sharedSDK].broadcastManager removeDelegate:self]; +} - (void)viewDidLoad { [super viewDidLoad]; @@ -163,7 +166,6 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; }]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showNewUserRecharge) name:kNewUserRechargeKey object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showAnchorCardKey:) name:kTabShowAnchorCardKey object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(teenagerStatusChange:) name:kTeenagerStatusChange object:nil]; @@ -232,7 +234,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; } }); } - if (self.needShowAnchorCard && !self.delayShowAnchorCard && !self.parentMode) { + if (self.needShowAnchorCard && !self.delayShowAnchorCard) { [self.presenter getAnchorCardInfo]; [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kHadLaunchApp];///第一次弹主播卡片 [[NSUserDefaults standardUserDefaults] synchronize]; @@ -251,7 +253,8 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; [self.navigationController presentViewController:nav animated:YES completion:nil]; return; } - if (userInfo.nick == nil || userInfo.avatar == nil) { + self.userInfo = userInfo; + if ((userInfo.nick == nil || userInfo.avatar == nil) && self.isFormLogin == NO) { id type = [[NSUserDefaults standardUserDefaults]valueForKey:@"kLoginSuccessType"]; if(type != nil && [type intValue] == ThirdLoginType_Phone){ [self.presenter getAuthorizationCodeInfo]; @@ -286,10 +289,22 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; [item setBadgeValue:[NSString stringWithFormat:@"%ld",unreadCount]]; } } - self.parentMode = userInfo.parentMode; - for (BaseViewController *vc in self.viewControllers) { - vc.parentMode = self.parentMode; + + +} +-(void)loginIng{ + if ((self.userInfo.nick == nil || self.userInfo.avatar == nil) && self.isFormLogin == NO) { + [self completeUserInfo]; + return; } + [self initTabs:YES]; + if (self.inviteCode.length <= 0) { + [self initQuickEnterRoom]; + } + if (self.inviteCode) { + self.inviteCode = nil; + } + [self monentsUnReadCount]; } - (void)getAuthorizationCodeInfoWithPhonefail{ [self completeUserInfo]; @@ -378,7 +393,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; } - (void)checkInviteUserInfoSuccess:(InviteUserInfoModel *)inviteInfo { - if (inviteInfo && inviteInfo.isInRoom && !self.parentMode) { + if (inviteInfo && inviteInfo.isInRoom) { [XPRoomViewController openRoom:inviteInfo.roomUid fromNick:inviteInfo.inviteNick fromType:inviteInfo.fromType fromUid:inviteInfo.inviteUid viewController:self]; } else { //不在房间 [self.presenter getShortCutRecommendRoom]; @@ -386,9 +401,6 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; } - (void)getShortCutRecommendRoomSuccces:(NSString *)roomUid { - if (self.parentMode) { - return; - } if (roomUid.length > 0) { [XPRoomViewController openRoom:roomUid viewController:self]; } @@ -432,7 +444,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; XPLoginViewController *lvc = [[XPLoginViewController alloc] init]; BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:lvc]; nav.modalPresentationStyle = UIModalPresentationFullScreen; - [self.navigationController presentViewController:nav animated:YES completion:nil]; + kWindow.rootViewController = nav; XPAdImageTool.shareImageTool.isImLogin = NO; } @@ -445,9 +457,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; ///获取主播卡片信息成功 - (void)getAnchorCardInfoSuccess:(XPTabAnchorCardModel *)cardInfo { - if (self.parentMode) { - return; - } + if (!self.anchorCardView.superview && cardInfo && self.isViewLoaded && self.view.window) { self.anchorCardView.frame = CGRectMake(0, -90-kStatusBarHeight, KScreenWidth, 90); [UIView animateWithDuration:0.5 animations:^{ @@ -541,7 +551,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; #pragma mark - NIMChatManagerDelegate - (void)onRecvMessages:(NSArray *)messages { - if (self.parentMode || ![ClientConfig shareConfig].canOpen || [AccountInfoStorage instance].getTicket.length == 0) { + if (![ClientConfig shareConfig].canOpen || [AccountInfoStorage instance].getTicket.length == 0) { return; } for (NIMMessage * message in messages) { @@ -571,7 +581,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; - (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)broadcastMessage { - if (![ClientConfig shareConfig].canOpen) { + if (![ClientConfig shareConfig].canOpen || [AccountInfoStorage instance].getUid.length == 0) { return; } if (broadcastMessage.content) { @@ -788,9 +798,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; } #pragma mark -NIMSystemNotificationManagerDelegate - (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification { - if (self.parentMode) { - return; - } + if (notification.receiverType == NIMSessionTypeP2P) { if (notification.content != nil) { NSData *jsonData = [notification.content dataUsingEncoding:NSUTF8StringEncoding]; @@ -834,19 +842,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; return [[NSUserDefaults standardUserDefaults] valueForKey:kHadLaunchApp]; } -///青少年模式改变 -- (void)teenagerStatusChange:(NSNotification *)noti { - NSDictionary * dic = noti.object; - self.parentMode = [[dic objectForKey:@"parentMode"] boolValue]; - for (BaseViewController *vc in self.viewControllers) { - vc.parentMode = self.parentMode; - } - if ([XPRoomMiniManager shareManager].getRoomInfo && self.parentMode) { - [[RtcManager instance] exitRoom]; - [[NIMSDK sharedSDK].chatroomManager exitChatroom:[NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId] completion:nil]; - [self.roomMineView hiddenRoomMiniView]; - } -} + - (BOOL)canShowAnchorCard { if ([[XPRoomMiniManager shareManager] getRoomInfo]) {//在房间时不弹 diff --git a/YuMi/Structure/Base/BaseViewController.h b/YuMi/Structure/Base/BaseViewController.h index 31946886..b0d5ba99 100644 --- a/YuMi/Structure/Base/BaseViewController.h +++ b/YuMi/Structure/Base/BaseViewController.h @@ -43,8 +43,7 @@ NS_ASSUME_NONNULL_BEGIN // 是否隐藏导航 默认是不隐藏的 @property(nonatomic,assign,getter=isHiddenNavBar) BOOL hiddenNavBar; -///是否青少年模式 -@property (nonatomic, assign) BOOL parentMode; + /** 显示/隐藏导航 */ diff --git a/YuMi/Structure/MVP/Model/AccountInfoStorage.h b/YuMi/Structure/MVP/Model/AccountInfoStorage.h index 71ac74fd..879396b2 100644 --- a/YuMi/Structure/MVP/Model/AccountInfoStorage.h +++ b/YuMi/Structure/MVP/Model/AccountInfoStorage.h @@ -8,7 +8,7 @@ #import -@class AccountModel, ThirdUserInfo, HomeTagModel; +@class AccountModel, ThirdUserInfo, HomeTagModel,HomeUserModel; @interface AccountInfoStorage : NSObject @property (nonatomic, strong, readonly) AccountModel *accountModel; @@ -27,6 +27,9 @@ - (AccountModel *)getCurrentAccountInfo; - (void)saveAccountInfo:(AccountModel *)accountInfo; +///用于判断是否填写用户资料，没有将跳到用户填写用户资料界面 +- (HomeUserModel *)getCurrentHomeUserInfo; +- (void)saveHomeUserInfo:(HomeUserModel *)homeUserInfo; - (void)saveTicket:(NSString *)ticket; - (NSString *)getTicket; - (NSString *)getUid; diff --git a/YuMi/Structure/MVP/Model/AccountInfoStorage.m b/YuMi/Structure/MVP/Model/AccountInfoStorage.m index 3c3169b5..601b9cc9 100644 --- a/YuMi/Structure/MVP/Model/AccountInfoStorage.m +++ b/YuMi/Structure/MVP/Model/AccountInfoStorage.m @@ -7,6 +7,9 @@ // #define kFileName @"AccountInfo.data" #define kDataKey @"accountInfo" +#define kHomeUserDataKey @"homeUserInfo" +#define kHomeUserName @"HomeUserModel.data" + #import "AccountInfoStorage.h" #import "AccountModel.h" #import "HomeTagModel.h" @@ -14,7 +17,7 @@ #define kTagListDataKey @"homeaaNewTagModel" #define kTagListDataName @"HomeTagNewModel.data" @interface AccountInfoStorage() - +@property (nonatomic,strong) HomeUserModel *homeUserInfo; @property (nonatomic, copy) NSString *ticket; @property (nonatomic, strong) AccountModel *accountModel; @property (nonatomic,strong) NSArray *tagList; @@ -70,7 +73,39 @@ static AccountInfoStorage *_instance = nil; [archiver finishEncoding]; [data writeToFile:[self getFilePath] atomically:YES]; } - +- (HomeUserModel *)getCurrentHomeUserInfo +{ + if (self.homeUserInfo != nil) { + return self.homeUserInfo; + } + NSData *data = [[NSData alloc] initWithContentsOfFile:[self getHomeUserFilePath]]; + + NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:data]; + //解档出数据模型 + self.homeUserInfo = [unarchiver decodeObjectForKey:kHomeUserDataKey]; + [unarchiver finishDecoding];//一定不要忘记finishDecoding，否则会报错 + return self.homeUserInfo; +} +- (void)saveHomeUserInfo:(HomeUserModel *)homeUserInfo +{ + if (homeUserInfo == nil) { + homeUserInfo = [[HomeUserModel alloc] init]; + } + self.homeUserInfo = homeUserInfo; + NSMutableData *data = [[NSMutableData alloc] init]; + NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data]; + [archiver encodeObject:homeUserInfo forKey:kHomeUserDataKey]; + [archiver finishEncoding]; + [data writeToFile:[self getHomeUserFilePath] atomically:YES]; +} +-(NSString *) getHomeUserFilePath{ + NSArray *array = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSString *path = [[array objectAtIndex:0] stringByAppendingPathComponent:kHomeUserName]; + if (![[NSFileManager defaultManager] fileExistsAtPath:path]) { + [[NSFileManager defaultManager] createFileAtPath:path contents:nil attributes:nil]; + } + return path; +} - (void)saveTicket:(NSString *)t { self.ticket = t; diff --git a/YuMi/Structure/MVP/Model/AccountModel.h b/YuMi/Structure/MVP/Model/AccountModel.h index 7554dc34..77921608 100644 --- a/YuMi/Structure/MVP/Model/AccountModel.h +++ b/YuMi/Structure/MVP/Model/AccountModel.h @@ -20,5 +20,12 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic , assign) NSNumber *expires_in; @end - +@interface HomeUserModel : NSObject +@property (nonatomic,copy)NSString *nick; +@property (nonatomic,copy)NSString *avatar; +@property (nonatomic,assign)BOOL isBindPhone; +@property (nonatomic,copy) NSString *ticket; +@property (nonatomic,assign) BOOL isGetUserInfoSuccess; +@property (nonatomic,assign) BOOL isRequestRicketSuccess; +@end NS_ASSUME_NONNULL_END diff --git a/YuMi/Structure/MVP/Model/AccountModel.m b/YuMi/Structure/MVP/Model/AccountModel.m index 7ec4be4c..331487af 100644 --- a/YuMi/Structure/MVP/Model/AccountModel.m +++ b/YuMi/Structure/MVP/Model/AccountModel.m @@ -10,3 +10,6 @@ @implementation AccountModel @end +@implementation HomeUserModel + +@end diff --git a/YuMi/Structure/MVP/View/MvpViewController.m b/YuMi/Structure/MVP/View/MvpViewController.m index 278a28a3..79cc28f9 100644 --- a/YuMi/Structure/MVP/View/MvpViewController.m +++ b/YuMi/Structure/MVP/View/MvpViewController.m @@ -46,7 +46,7 @@ XPLoginViewController *loginVC = [[XPLoginViewController alloc] init]; BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:loginVC]; nav.modalPresentationStyle = UIModalPresentationFullScreen; - [self.navigationController presentViewController:nav animated:YES completion:nil]; + kWindow.rootViewController = nav; } - (void)accountCanceled:(NSDictionary *)data {