From 7d6fe95f6549dc09be6755fd3415d6f3c6fdb927 Mon Sep 17 00:00:00 2001 From: chenguilong <598604202@qq.com> Date: Wed, 19 Jan 2022 16:04:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=94=B9?= =?UTF-8?q?=E7=89=88=EF=BC=88=E8=B4=A6=E6=88=B7=E3=80=81=E8=B5=9B=E4=BA=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=8D=A1=E5=85=A5=E5=8F=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile.lock | 2 +- xplan-ios.xcodeproj/project.pbxproj | 81 +++++++--- .../Mine/mine_head_bg.imageset/Contents.json | 22 +++ .../mine_head_bg.imageset/mine_head_bg@2x.png | Bin 0 -> 25394 bytes .../mine_head_bg.imageset/mine_head_bg@3x.png | Bin 0 -> 50068 bytes .../Contents.json | 22 +++ .../mine_normal_invite_friend@2x.png | Bin 0 -> 1211 bytes .../mine_normal_invite_friend@3x.png | Bin 0 -> 1675 bytes .../Contents.json | 22 +++ .../mine_normal_match_manage@2x.png | Bin 0 -> 2507 bytes .../mine_normal_match_manage@3x.png | Bin 0 -> 3743 bytes .../Contents.json | 22 +++ .../mine_normal_my_account@2x.png | Bin 0 -> 2682 bytes .../mine_normal_my_account@3x.png | Bin 0 -> 3738 bytes .../Contents.json | 22 +++ .../mine_normal_my_clan@2x.png | Bin 0 -> 1192 bytes .../mine_normal_my_clan@3x.png | Bin 0 -> 1505 bytes .../Contents.json | 22 +++ .../mine_normal_my_collect@2x.png | Bin 0 -> 936 bytes .../mine_normal_my_collect@3x.png | Bin 0 -> 1287 bytes .../mine_normal_my_dressup@2x.png | Bin 1948 -> 1484 bytes .../mine_normal_my_dressup@3x.png | Bin 3873 -> 2065 bytes .../Contents.json | 22 +++ .../mine_normal_my_guild@2x.png | Bin 0 -> 1143 bytes .../mine_normal_my_guild@3x.png | Bin 0 -> 1556 bytes .../mine_normal_my_room@2x.png | Bin 2139 -> 860 bytes .../mine_normal_my_room@3x.png | Bin 4104 -> 1172 bytes .../mine_normal_real_name_authentic@2x.png | Bin 791 -> 987 bytes .../mine_normal_real_name_authentic@3x.png | Bin 1354 -> 1093 bytes .../Contents.json | 22 +++ .../mine_normal_relevance@2x.png | Bin 0 -> 1086 bytes .../mine_normal_relevance@3x.png | Bin 0 -> 1404 bytes .../Contents.json | 22 +++ .../mine_normal_skill_card@2x.png | Bin 0 -> 3184 bytes .../mine_normal_skill_card@3x.png | Bin 0 -> 6130 bytes .../mine_normal_teenager@2x.png | Bin 809 -> 1180 bytes .../mine_normal_teenager@3x.png | Bin 1326 -> 1589 bytes .../Contents.json | 22 +++ .../mine_normal_visitor@2x.png | Bin 0 -> 928 bytes .../mine_normal_visitor@3x.png | Bin 0 -> 1243 bytes xplan-ios/Main/Mine/Model/XPMineItemModel.h | 6 +- xplan-ios/Main/Mine/Presenter/XPMinePresent.h | 6 +- xplan-ios/Main/Mine/Presenter/XPMinePresent.m | 74 +++++---- xplan-ios/Main/Mine/Protocol/XPMineProtocol.h | 3 + ...l.h => XPMineHeadItemCollectionViewCell.h} | 2 +- ...l.m => XPMineHeadItemCollectionViewCell.m} | 12 +- .../View/Cell/XPMineHeadItemTableViewCell.h | 28 ++++ .../View/Cell/XPMineHeadItemTableViewCell.m | 105 +++++++++++++ .../Mine/View/Cell/XPMineMatchTableViewCell.h | 26 ---- .../Mine/View/Cell/XPMineMatchTableViewCell.m | 101 ------------- .../Mine/View/Cell/XPMineMenuTableViewCell.m | 22 +-- .../Presenter/XPMatchManagePresenter.h | 19 +++ .../Presenter/XPMatchManagePresenter.m | 50 +++++++ .../Protocol/XPMatchManageProtocol.h | 18 +++ .../View/XPMatchManageTableViewCell.h | 19 +++ .../View/XPMatchManageTableViewCell.m | 108 ++++++++++++++ .../View/XPMatchManageViewController.h | 16 ++ .../View/XPMatchManageViewController.m | 140 ++++++++++++++++++ .../Mine/View/SubViews/XPMineAccountView.h | 27 ---- .../Main/Mine/View/SubViews/XPMineHeadView.m | 38 +---- .../Main/Mine/View/XPMineViewController.m | 57 ++++--- 61 files changed, 882 insertions(+), 298 deletions(-) create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/mine_head_bg@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/mine_head_bg@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_invite_friend.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_invite_friend.imageset/mine_normal_invite_friend@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_invite_friend.imageset/mine_normal_invite_friend@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_match_manage.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_match_manage.imageset/mine_normal_match_manage@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_match_manage.imageset/mine_normal_match_manage@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/mine_normal_my_account@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/mine_normal_my_account@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_clan.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_clan.imageset/mine_normal_my_clan@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_clan.imageset/mine_normal_my_clan@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/mine_normal_my_collect@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/mine_normal_my_collect@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/mine_normal_my_guild@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/mine_normal_my_guild@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_relevance.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_relevance.imageset/mine_normal_relevance@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_relevance.imageset/mine_normal_relevance@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/mine_normal_skill_card@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/mine_normal_skill_card@3x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/mine_normal_visitor@2x.png create mode 100644 xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/mine_normal_visitor@3x.png rename xplan-ios/Main/Mine/View/Cell/{XPMineMatchCollectionViewCell.h => XPMineHeadItemCollectionViewCell.h} (79%) rename xplan-ios/Main/Mine/View/Cell/{XPMineMatchCollectionViewCell.m => XPMineHeadItemCollectionViewCell.m} (83%) create mode 100644 xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.h create mode 100644 xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.m delete mode 100644 xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.h delete mode 100644 xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.m create mode 100644 xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.h create mode 100644 xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.m create mode 100644 xplan-ios/Main/Mine/View/MatchManage/Protocol/XPMatchManageProtocol.h create mode 100644 xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.h create mode 100644 xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.m create mode 100644 xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.h create mode 100644 xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.m delete mode 100644 xplan-ios/Main/Mine/View/SubViews/XPMineAccountView.h diff --git a/Podfile.lock b/Podfile.lock index 5babd586..8bf84631 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -205,4 +205,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 8120dbc8eb506e124ccb97e8ce2ecf2420ac8b5f -COCOAPODS: 1.11.0 +COCOAPODS: 1.11.2 diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index 53d04f67..ac4bc39f 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -133,6 +133,10 @@ 9B8585D3278837CE00D7D5C6 /* NobleLevelUpModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B8585D2278837CE00D7D5C6 /* NobleLevelUpModel.m */; }; 9B8585F52788699400D7D5C6 /* FBKVOController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B8585F42788699400D7D5C6 /* FBKVOController.m */; }; 9BA41F2527CBB7950043B11F /* UIColor+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA41F2427CBB7950043B11F /* UIColor+Extension.m */; }; + 9B92A33C2797E38100AD168F /* XPMineHeadItemTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B92A33B2797E38100AD168F /* XPMineHeadItemTableViewCell.m */; }; + 9B92A3442797EE6500AD168F /* XPMatchManagePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B92A3432797EE6500AD168F /* XPMatchManagePresenter.m */; }; + 9B92A3472797EECD00AD168F /* XPMatchManageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B92A3462797EECD00AD168F /* XPMatchManageViewController.m */; }; + 9B92A34A2797F35E00AD168F /* XPMatchManageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B92A3492797F35E00AD168F /* XPMatchManageTableViewCell.m */; }; 9BAA5FED277A1BBE007453F3 /* XPPrivacyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */; }; 9BAA5FF0277A23F4007453F3 /* XPPermissionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */; }; 9BB549592782E6A30090CD26 /* XPNobleCenterPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BB549582782E6A30090CD26 /* XPNobleCenterPresenter.m */; }; @@ -480,9 +484,7 @@ E8E70D7A26F2F16600F03460 /* XPMinePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D7926F2F16600F03460 /* XPMinePresent.m */; }; E8E70D7E26F2F19D00F03460 /* Api+Mine.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D7D26F2F19D00F03460 /* Api+Mine.m */; }; E8E70D8326F2F51A00F03460 /* XPMineHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8226F2F51A00F03460 /* XPMineHeadView.m */; }; - E8E70D8626F2F55C00F03460 /* XPMineAccountView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8526F2F55C00F03460 /* XPMineAccountView.m */; }; - E8E70D8926F2F58F00F03460 /* XPMineMatchTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8826F2F58F00F03460 /* XPMineMatchTableViewCell.m */; }; - E8E70D8C26F2F5A500F03460 /* XPMineMatchCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8B26F2F5A500F03460 /* XPMineMatchCollectionViewCell.m */; }; + E8E70D8C26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8B26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m */; }; E8E70D8F26F2F5DB00F03460 /* XPMineMenuTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8E26F2F5DB00F03460 /* XPMineMenuTableViewCell.m */; }; E8E70D9226F2F60C00F03460 /* XPMineItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D9126F2F60C00F03460 /* XPMineItemModel.m */; }; E8E7DAE82744F5EF00C631CC /* XPGiftStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E7DAE72744F5EF00C631CC /* XPGiftStorage.m */; }; @@ -759,6 +761,15 @@ 9B8585F42788699400D7D5C6 /* FBKVOController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBKVOController.m; sourceTree = ""; }; 9BA41F2327CBB7950043B11F /* UIColor+Extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+Extension.h"; sourceTree = ""; }; 9BA41F2427CBB7950043B11F /* UIColor+Extension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Extension.m"; sourceTree = ""; }; + 9B92A33A2797E38100AD168F /* XPMineHeadItemTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadItemTableViewCell.h; sourceTree = ""; }; + 9B92A33B2797E38100AD168F /* XPMineHeadItemTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadItemTableViewCell.m; sourceTree = ""; }; + 9B92A3412797EE1200AD168F /* XPMatchManageProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMatchManageProtocol.h; sourceTree = ""; }; + 9B92A3422797EE6500AD168F /* XPMatchManagePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMatchManagePresenter.h; sourceTree = ""; }; + 9B92A3432797EE6500AD168F /* XPMatchManagePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMatchManagePresenter.m; sourceTree = ""; }; + 9B92A3452797EECD00AD168F /* XPMatchManageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMatchManageViewController.h; sourceTree = ""; }; + 9B92A3462797EECD00AD168F /* XPMatchManageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMatchManageViewController.m; sourceTree = ""; }; + 9B92A3482797F35E00AD168F /* XPMatchManageTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMatchManageTableViewCell.h; sourceTree = ""; }; + 9B92A3492797F35E00AD168F /* XPMatchManageTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMatchManageTableViewCell.m; sourceTree = ""; }; 9BAA5FEB277A1BBE007453F3 /* XPPrivacyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPrivacyViewController.h; sourceTree = ""; }; 9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPrivacyViewController.m; sourceTree = ""; }; 9BAA5FEE277A23F4007453F3 /* XPPermissionsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPermissionsViewController.h; sourceTree = ""; }; @@ -1453,12 +1464,8 @@ E8E70D7D26F2F19D00F03460 /* Api+Mine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Mine.m"; sourceTree = ""; }; E8E70D8126F2F51A00F03460 /* XPMineHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadView.h; sourceTree = ""; }; E8E70D8226F2F51A00F03460 /* XPMineHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadView.m; sourceTree = ""; }; - E8E70D8426F2F55C00F03460 /* XPMineAccountView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAccountView.h; sourceTree = ""; }; - E8E70D8526F2F55C00F03460 /* XPMineAccountView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAccountView.m; sourceTree = ""; }; - E8E70D8726F2F58F00F03460 /* XPMineMatchTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineMatchTableViewCell.h; sourceTree = ""; }; - E8E70D8826F2F58F00F03460 /* XPMineMatchTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMatchTableViewCell.m; sourceTree = ""; }; - E8E70D8A26F2F5A500F03460 /* XPMineMatchCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineMatchCollectionViewCell.h; sourceTree = ""; }; - E8E70D8B26F2F5A500F03460 /* XPMineMatchCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMatchCollectionViewCell.m; sourceTree = ""; }; + E8E70D8A26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadItemCollectionViewCell.h; sourceTree = ""; }; + E8E70D8B26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadItemCollectionViewCell.m; sourceTree = ""; }; E8E70D8D26F2F5DB00F03460 /* XPMineMenuTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineMenuTableViewCell.h; sourceTree = ""; }; E8E70D8E26F2F5DB00F03460 /* XPMineMenuTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMenuTableViewCell.m; sourceTree = ""; }; E8E70D9026F2F60C00F03460 /* XPMineItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineItemModel.h; sourceTree = ""; }; @@ -2349,6 +2356,27 @@ 9BC5C8F5277B0263007C8719 /* XPNobleCenterListViewController.m */, 9BEE3D0C27853BD000C83219 /* ThemeColor+NobleCenter.h */, 9BEE3D0D27853BD000C83219 /* ThemeColor+NobleCenter.m */, + ); + path = View; + sourceTree = ""; + }; + 9B92A33D2797ED4600AD168F /* MatchManage */ = { + isa = PBXGroup; + children = ( + 9B92A3402797EDE900AD168F /* Protocol */, + 9B92A33F2797EDE400AD168F /* Presenter */, + 9B92A33E2797EDDE00AD168F /* View */, + ); + path = MatchManage; + sourceTree = ""; + }; + 9B92A33E2797EDDE00AD168F /* View */ = { + isa = PBXGroup; + children = ( + 9B92A3452797EECD00AD168F /* XPMatchManageViewController.h */, + 9B92A3462797EECD00AD168F /* XPMatchManageViewController.m */, + 9B92A3482797F35E00AD168F /* XPMatchManageTableViewCell.h */, + 9B92A3492797F35E00AD168F /* XPMatchManageTableViewCell.m */, ); path = View; sourceTree = ""; @@ -2358,6 +2386,15 @@ children = ( 9BB549572782E6A30090CD26 /* XPNobleCenterPresenter.h */, 9BB549582782E6A30090CD26 /* XPNobleCenterPresenter.m */, + ); + path = Presenter; + sourceTree = ""; + }; + 9B92A33F2797EDE400AD168F /* Presenter */ = { + isa = PBXGroup; + children = ( + 9B92A3422797EE6500AD168F /* XPMatchManagePresenter.h */, + 9B92A3432797EE6500AD168F /* XPMatchManagePresenter.m */, ); path = Presenter; sourceTree = ""; @@ -2436,6 +2473,14 @@ isa = PBXGroup; children = ( 9BD63FB1277EF14A006EB744 /* XPReleaseRadioProtocol.h */, + ); + path = Protocol; + sourceTree = ""; + }; + 9B92A3402797EDE900AD168F /* Protocol */ = { + isa = PBXGroup; + children = ( + 9B92A3412797EE1200AD168F /* XPMatchManageProtocol.h */, ); path = Protocol; sourceTree = ""; @@ -4007,6 +4052,7 @@ children = ( E896EF912771AA6C00AD2CC1 /* Friend */, 9BC5C8EA277AFEDC007C8719 /* Noble */, + 9B92A33D2797ED4600AD168F /* MatchManage */, E83953232769FF2400CF2F24 /* DressUp */, E8E70D8026F2F3C500F03460 /* Cell */, E8E70D7F26F2F39000F03460 /* SubViews */, @@ -4112,8 +4158,6 @@ E8E70D8226F2F51A00F03460 /* XPMineHeadView.m */, E896EFB02771C93B00AD2CC1 /* XPMineFriendNumberView.h */, E896EFB12771C93B00AD2CC1 /* XPMineFriendNumberView.m */, - E8E70D8426F2F55C00F03460 /* XPMineAccountView.h */, - E8E70D8526F2F55C00F03460 /* XPMineAccountView.m */, E824544126F58FCE00BE8163 /* XPMinePayPwdInputView.h */, E824544226F58FCE00BE8163 /* XPMinePayPwdInputView.m */, E824544C26F5BC1A00BE8163 /* XPMineModifPayPwdView.h */, @@ -4130,16 +4174,16 @@ E896EFA32771AEC500AD2CC1 /* Friend */, E8B846D026FDDBCD00A777FE /* Recharge */, E8EEB8F826FC285B007C6EBA /* MineInfo */, - E8E70D8726F2F58F00F03460 /* XPMineMatchTableViewCell.h */, - E8E70D8826F2F58F00F03460 /* XPMineMatchTableViewCell.m */, - E8E70D8A26F2F5A500F03460 /* XPMineMatchCollectionViewCell.h */, - E8E70D8B26F2F5A500F03460 /* XPMineMatchCollectionViewCell.m */, + E8E70D8A26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.h */, + E8E70D8B26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m */, E8E70D8D26F2F5DB00F03460 /* XPMineMenuTableViewCell.h */, E8E70D8E26F2F5DB00F03460 /* XPMineMenuTableViewCell.m */, E8AC721426F46B06007D6E91 /* XPMineSettingTableViewCell.h */, E8AC721526F46B06007D6E91 /* XPMineSettingTableViewCell.m */, E8AC723026F49710007D6E91 /* XPMineNotificationTableViewCell.h */, E8AC723126F49710007D6E91 /* XPMineNotificationTableViewCell.m */, + 9B92A33A2797E38100AD168F /* XPMineHeadItemTableViewCell.h */, + 9B92A33B2797E38100AD168F /* XPMineHeadItemTableViewCell.m */, ); path = Cell; sourceTree = ""; @@ -4422,7 +4466,6 @@ E8A03DFC276350A60098D9EA /* XPCandyTreeGiftView.m in Sources */, 189DD73E26E21C3F00AB55B1 /* YYUtility.m in Sources */, E87A26FD27587E17002DDC7A /* HomeTagModel.m in Sources */, - E8E70D8926F2F58F00F03460 /* XPMineMatchTableViewCell.m in Sources */, E88B5CA826FB089C00DA9178 /* XPMineTeenagePwdViewController.m in Sources */, E81C1B2F277071670020D1E4 /* XPArrangeMicInfoModel.m in Sources */, 9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */, @@ -4438,6 +4481,7 @@ E8AC723526F49939007D6E91 /* XPMineNotificaPresenter.m in Sources */, E80DE40A277568D300BE5BCB /* ThemeColor+FirstRecharge.m in Sources */, 9BC5C8ED277AFF63007C8719 /* XPNobleCenterViewController.m in Sources */, + 9B92A34A2797F35E00AD168F /* XPMatchManageTableViewCell.m in Sources */, 18EE3FE22750C29D00A452BF /* NIMBadgeView.m in Sources */, E82EE0F8272FDDFA00D15DC1 /* UserPrivacyView.m in Sources */, E8DEC9A42764A6600078CB70 /* XPMoreMenuPresenter.m in Sources */, @@ -4533,7 +4577,6 @@ E8395331276A03AE00CF2F24 /* Api+DressUp.m in Sources */, E8DEC99E2764A5B60078CB70 /* XPRoomMoreMenuViewController.m in Sources */, E82325F2274E2DE6003A3332 /* XPUserCardViewController.m in Sources */, - E8E70D8626F2F55C00F03460 /* XPMineAccountView.m in Sources */, E8C6FFCA27548120004DC9F0 /* XPHomePresenter.m in Sources */, E8412FB02779CB4D006E1101 /* XPRoomSettingPresenter.m in Sources */, E878893C273A54C300BF1D57 /* Api+Gift.m in Sources */, @@ -4583,6 +4626,7 @@ E8A6C29F27CF5FE500AC7442 /* HomeLiveRoomModel.m in Sources */, E84150B827747B8B00A7F548 /* XPFirstRechargeViewController.m in Sources */, 9BBC02872786D75C0007C24B /* XPNobleUpgradeLevelView.m in Sources */, + 9B92A3442797EE6500AD168F /* XPMatchManagePresenter.m in Sources */, E88B5CBD26FB3BDF00DA9178 /* XPTeenagerAlertView.m in Sources */, E82D5C70276AE60000858D6D /* HeadwearModel.m in Sources */, E8A03DEC276301EF0098D9EA /* XPCandyTreeRankView.m in Sources */, @@ -4612,6 +4656,7 @@ 9B17F71827BD150600440843 /* SVGAParserManager.m in Sources */, E80DE40D2775ABA500BE5BCB /* XPFirstRechargeFlowLayout.m in Sources */, E896EFA22771AE9400AD2CC1 /* XPMineFriendViewController.m in Sources */, + E8E70D8C26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m in Sources */, 186A534A26FC6ED900D67B2C /* TTActionSheetConfig.m in Sources */, 9BBC028B2786E05A0007C24B /* XPNobleCenterEntranceView.m in Sources */, E81C279326EB394D0031E639 /* LoginForgetPasswordViewController.m in Sources */, @@ -4620,6 +4665,7 @@ E87A26F627587C48002DDC7A /* XPHomePartyContainerViewController.m in Sources */, E8EEB90126FC31B6007C6EBA /* XPMineUserInfoPresenter.m in Sources */, 18F404BB2760982000A6C548 /* ChatLimitModel.m in Sources */, + 9B92A33C2797E38100AD168F /* XPMineHeadItemTableViewCell.m in Sources */, 189DD56526DE465A00AB55B1 /* LoginViewController.m in Sources */, E824544B26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m in Sources */, E81C1B2227705F950020D1E4 /* Api+ArrangeMic.m in Sources */, @@ -4754,6 +4800,7 @@ E8788934273A53D700BF1D57 /* XPSendGiftView.m in Sources */, E896EF9C2771AE6B00AD2CC1 /* XPMineFansViewController.m in Sources */, E88B5CB826FB325200DA9178 /* XPMineTeenagerPwdPresenter.m in Sources */, + 9B92A3472797EECD00AD168F /* XPMatchManageViewController.m in Sources */, E84B0E462727EF9D008818C6 /* XPRoomMessageParser.m in Sources */, E838D9A0275E1BF60079E0B5 /* XPRoomAnimationView.m in Sources */, 9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */, diff --git a/xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/Contents.json new file mode 100644 index 00000000..81606029 --- /dev/null +++ b/xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_head_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_head_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/mine_head_bg@2x.png b/xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/mine_head_bg@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1169ab67d6e578944c552a55a1edb841595f38f6 GIT binary patch literal 25394 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 A*#H0l literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/mine_head_bg@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_head_bg.imageset/mine_head_bg@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..f314145641dc5986f818836d90095e2ce5b06c2d GIT binary patch literal 50068 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 literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_invite_friend.imageset/mine_normal_invite_friend@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_invite_friend.imageset/mine_normal_invite_friend@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..452fcdfd7edc599c17fd9c001d5d8552d5195935 GIT binary patch literal 1675 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 TO|rQE1bl}2x2{#`*<=0(#J@1a literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/Contents.json new file mode 100644 index 00000000..cbb5e95a --- /dev/null +++ b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_normal_my_account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_normal_my_account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/mine_normal_my_account@2x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/mine_normal_my_account@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd744043798de59143aa923a1118c8db33ab5e7 GIT binary patch literal 2682 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 literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/mine_normal_my_account@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_account.imageset/mine_normal_my_account@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..aeaa4cce982c3363b1a74741f0efc18825726377 GIT binary patch literal 3738 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 QVESh8boFyt=akR{04tXA&Hw-a literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_clan.imageset/mine_normal_my_clan@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_clan.imageset/mine_normal_my_clan@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..53ee3d1cdd6e304dc24d2072435eb599868c809c GIT binary patch literal 1505 zcmYk62~bmK6oms}i3m+)wb%j)F(5*yWC4OgfCLgCAsZT_Sjb3OM540S7Kueguwm)~ zfeytWpvWS!L|Gyg0-_xjF%VHf5U|p~hzM#yNPn6crf=rmckcPWd+wWgGw(c;5ols$ zZ3KZpOlVXx8$7A&Hw+4@0PCL&f#^t?AzTV*kw_#SkH=!MI2;aC&^kLiJ2*H1;p*xN zD)2!Cm!qR20POAU2?TDOyR&PXsd@uznSh^9b4FrsKi<_I9*3sr` zK>l~SP6B~IAT(`kfB}D9$l2iCH0>N9LMiUrqlp`IKn9T9|F?w$96+v5-Q%=fq-hj9 z;DCG(MZjZMnwcMDp~8b+{1A`HN_tyfp!7%o3kjs%o;dX_M&~7}DB3$c(wk0p46=#s=IS@HtPBslBMND=q<-;S+1=Vy@!RFR z9APBQ-xp(MwEAgsxK}Q#x|-p%eVfT!b$jiNOJZ?)VmP0}FoVs%ni%Qt>*;7L$xc5m zj61xS6X3mPhwa+psA{mawXUi-hR1MsvR;(VA|McGDvj*R<#o;#{I$>8*Su?_D>Ku1 zu$8PgW2ew%&&soIh!a_`WOF|z>F&mj4OYBIwi7~GEn9>l%-e061cZ9~5FE6m^tQ6baCrh5^ zi%+~1ymRZ?e!QsHnW{Ex+S1v1>1$Ju7P}W^^S$$PVGkOt?>?PC8g}L6!JR5i zmoFH+F{bRky^G3V9NUxNr;;o3ZH%Q3hFO(Tdp=n}^+jZtT&qv@?tvfzYy3JBB^Sd* zL4=ON`?;a7;v#m07zhT&S@CrECOc@<2r; z$(in3-stPj+{T}?^kkcg#{C;2ju3ieVpt>e$W~dtKfd7tl|c=+svv(XWs?KYJY_d~ zNT8fU>rn=dg;p;Vi=;RT?8HsGcE-elDa1cfvF%s=mPXcC#bGM6hVh7c#W1+qJ>bfx zMV&({0Uh~eDhSQ2$6=;wv~mQ0RN%Xx|47yy!y8}{6=cc$jU1Oa?z051t>pKR9YGn_ zN8MtB&NRiBn{R^-=HakEMU+i&^rpYptEdl8k{hCeOK4EU;-W!(y}{-BnM7$sPrVt3 zkg>*j5_fZ#t_yPyDGEt!!jExl-_g`+%K|+K@$pDPyqAKOaM0#_MGqP$;rW>F3ssVa zUMsxr=Suj2r7ir1dTTgMIV}8gdMkRm9G<_KoAbzAF&1`er%#{ct2+tb?NrH<7e+es zK4&-mO;ats|M}T9eJDM${-3pnDl?lUCF_j;f!wizny>@S9{0Z~F1BP1EiVqkiXUdL zrWe}2zUyjL5;ZFIZ3DCqH=D==E%+CvQuaaYg1FAyeGj_O)+xT^X!Zj=|-qL>dD)@vI&!wZ$fB z=+K}2POmaEN)Kc?ka@jie&gL^-@;SUd?8usA|8jQIJYWqz2opX_+T?*z{Q0(@b*W{ zZ2R-)^0w70r;?}N4bI!o`{`Y*)m-&~FRv_ZPSg1XI}r0M6Z{4sGzx=U>lbnQUua)> Af&c&j literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/Contents.json new file mode 100644 index 00000000..b1cb1911 --- /dev/null +++ b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_normal_my_collect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_normal_my_collect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/mine_normal_my_collect@2x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/mine_normal_my_collect@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..873dfe16c42a3a214992bf326fbb856d3ea72493 GIT binary patch literal 936 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s{{wtNT!FNSiHVVs@&A1R|91x% z0a;-1e}CxzJ%Ku+gUl7n?Kz447&Hw#@|M&U*KN9-?Vk|_LuD+3; zzR`jj=jmlm{|^NL9sK`b(9}}L{|AEp9}Na-?9Q|IaW;Fr#y2U*%E88TmqTR@FbJGW zg8YIR3LO=GZu?bd@Q>}**N2g!+!LDIY+jsSw>UuX@9VwQ@jj*sGEc9p>B{_Fo}A)IEHu}e>>%Q*)0cwR#o+|9MKR5 zr$rnBS7*GNcCXCmOwxwAPyWtVJ<}AhMo9Cx{o883)b#h;i_^9h=vQ@ZNqbrUMm>3@ zs_5s)x2lgt0uH&HeR4k9fg^E#S)0n)jSLy#H~KI5YPzn`yuDO*t3k^Dd!qlI+G{hd z)81Ta>YTX)u}TjwywTysWH!%>-y5% zFIsQPZ>@3B6rcCvw!wWLjjiq%wRfMHW%1HISbna(g5#UC3#YrqCiJekk!uz8_m64% z&DXm<9t$)qxFF9gv%X%z!Qq1Unl-16otw~HTkm>i_0I!Lj1Eh>+Fwsd^7UePvg%pG z`_Ii`Tg4d?HrgJV_d?{dzk$;_zm6;s}S zHj*kkAnjLd?Rc4afirJTOYiZ8-pA`1S7<1BJ$>-R@S{l zG3@F%d^(h?p<7#IMSZHB-X+F!zf&Z4|Nitg*Q;&9zWNBY>mPoGM#SsiU;pk=qtb+* zKR>>n5cc|O(awnb@xn9O7??RKckJbSDOOtif3`q@lY_HbO5I$A8paU4NlYG#9A3EI s&%NH_^6i+s)Rxo+y6_Jq~*f$5FG)78&qol`;+08d(sxc~qF literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/mine_normal_my_collect@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_collect.imageset/mine_normal_my_collect@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b7764ac0a35e90c146503b776c58e7b70202153b GIT binary patch literal 1287 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7{vp8LR^7dV`F0r3k!F5cOU}@ z%*@RG?+G+AGWx$a;Q!vB{|8-wf+i*=rbY%}c@zR9ZfXiq0AxcLKoV#O&;&RaA_e3^ z0FVm==H})w0R#;cM{vOQ0=W=DAPKPxqF`6A8_=Eq_ks{mD^zE_SBRR{M75*jt&Kyk6&beW7A+7eA9 z1aBPj)RBLA_sph6bDYeN?q1g2m=O_T{eD61zi-#J)fh|gURX45ZhN__YfwAW7X}9A zKu;IPkch)?r(Z9-kd zG?F3|Mm^*Fc)^4YmUb5+irzbD?v2jQ0q{~Jp*QJTQC|ajJVL{Z?+(Rc_8V$G? zT%D`KDIzYs&vV|DPS*?bYOJn{c6j;QzUF+P^>I!*leE{DN$Sgjm@3oNPhZaOd2V)X zo(bor$5*)JW~KCJEn>d-`C(~m-OY>37JPD>IInW^=NPH`f7#kIG|umQIVB_cV`uv7 zCtsc%e_URquRDNG z;G5L?i{=Xw>~^22bY;Hb>(aa{W{Owyv`x_})6NE5lXLjFF*9ZIi%t!nuJVi3s}^U9 z#xC*<7u_I}E9N#UY43yl3DHZY%LL!N7qREyEe_V}uDSCkJe|(03noqq z@Dgv}-{BhePiWz%EXLig?tv3-b0@1w`RiKUzh!<`scE~0+F{p&lD+3%NHWE2=;mQ8 zxvsF1;lrCn0&P4+zNQVuWfu*2bi=QgGQ4`T=!l5dy2N7U3(4Z4*$V#GwjEV?V7R+u zc4WHBTHX@LuB);xjFKM`Qn#;SJm-<46vgn0S$VD$fB5Kym< zo{@o}(f`9h8;$=T5Ba@2@YGDtb#1N-Yn{WrExzvzc(>8-`asXDW2Q9-M4nRt#5Z-TJPLf;MkgFUlM1V8e(N*X;PZ_|1B`u zGE0K|f*Ibi{Q1iB<55q!&9l4vw#P+;8mdbReq21!(L_&z>)y4qyVtH-kmzcm^6S;D zur0S+e0BHv!Wczo^Jv17;f zZ(p}^$+XP$6e}%dz8%l+9AIEzj`wtN4DmRAH#D?b$x%S&#!=N4g+>O>s*9KB>;?j# z^E}+#AD`U$s~&%zsr#AU`EdO&*Mq-)Eh&HN@GtsJ`CJd{$Jx)nS4uE1v&zkWvRh<< zP>#_~wSQ`@K@JO&noD{A6l;C5{dvf&ZU4IZ&&gs74EFU+U_KtO@XO!s`}Tb`rJH%! z_ek6_|2wtrf@zzIsz1+;RKpv8lS=C@@K1Vgbb4h&?VXB}mFBe>21>uTJej@n?Bf+H z_U-?=g}pY`?~>+cv0IzsqLzm4u(7z{$nW}g65oW|_v=2qnWYgFd0jHkm!HSms(E5@ zZ_mz+d!xm>H5j+qUU_o6M>Q~he`f2&xBD(u?MTnOH-V#mQ>NLI%d)Lv@;;n`xkq-V zO|#oS)%Dle#~O<-q|Ii$n%5trQab0+txK&_G&HFxyT_b1RQBQVLmc_}_m@|0aB*<}B80H;SSe&yekNfJx zE#JNhzWyMwty0MS%j%rI6D_y>R;nkqFizxr$MCG*zl&jK$<)uHZL&RO9BY&v6vMRD zf&?G>c6xZdIVLTsyIDuBt4K3d{1d{-{1U!Cz*7LyjSThq3l`oA9L%)MGa+ZHRK3 zd-LVtnBS|sqf3~NFS)Yq|DQMO+LwQuV_X05&*RDMUbj|nl5scxx7ZpCZ%FgCk`zhY^ zoQlZtx4W&&-|cxXA12A1kfY)ecJS!sohx}O%NK2&m2hC^Vezx=C+pkn`SpJouRPKH R44A(eJYD@<);T3K0RT~Al9~Vj delta 1945 zcmV;K2WI%p3!D#-8Gi-<00374`G)`i00DDSM?wIu&K&6g002Z~SV?A0O#mtY000O8 z0f%V-1ONa40RR918UO$Q000A^0RRI4000310RRA?0ssU600031001zc0{{d700031 z001xm0002nH*5?500#z1L_t(&1?^aCh*eb-Ugyp@*GD>zkAKRv7byl}7Kj)H<`hX# ze>A5csy~7BBe77!f|x8VNt+*~SYiFJ`e8DZDHgs;tr#stdWj`DN@(U->Y($yr|(;5 zuXFdkGw04R$A5P-`>eIsUh7+r{W$lGNV%0OP_Dogtw2~GX0D`z;7WjRdp@kL%*rxg zKNf^C81$>0$baJ6SAv86?XTYx*i|2nlbr07P$r0njzlix0;#KA8f@v$Bs>?F56jAD zs$>s9Co^~ijXXddH24c(Yq1hdm+vh?=(qj3p+2mt7$A)rJfn8O8>I-1+v#(x(s&*9 z!=qmkVDKZmWg~*D4PD?$$s?m!hJeA3&UMPx-AlsJ{eKXDyt@AzYwzN4Xj_#u0^q)4 z5N;h;`Qj;#f5sM@b?>s^&)z1}$}VdKzFZRC+MbntsHz5EP-#SR$8f33fv%0#>Svzu^I<5p)9(8d9cH9 z(@@&>*>GzNZ10ddC_e+`seTZ;B^U&Su6b->5()DZn+>4$jUIfx|K|T zx6810S%@f}1FTpr-enE!rMV!K%n1fd|!yWGX~jPe%&o%-4%%@=wz-36kB~+AeeI8iI=^ z^J(HO)R~bt;Apy4i_|&+ly?+M&ONLv!r(YZ*=>)AOnEeKr+Sc^j^V{vur(~=QI1MH zFn=T~FN5o~B_;r%ht(0x2ufZXd31ANa$iQ}>KjCA(1%?oG8~k8aR;NkQO>!^SPsS# z#`HY(-OD2}0oV^DsNWg1^#Zx+VV-j8+5PpcQ(F^LLFm2aUO{b3H6rivPkwSr$-&9$3$ZuGF@rVZks2C63D@z z;GQ#Nk;*(<#D&rT!x`xLUzIw50Mytjyv8Qn69vd1v%|1-=sdjE$j@9Ta`BuNg_`=DizqnqDzwAxpN#h2aK(&()IC3!4A4 zfO5XD@Chl?9v8W0Vx*JwJku=l?SK0s9lX_H#{d-8B5^*P{gyc^g9nqaC{J7g&uA$s zAF>?8X3v3Vb##meSEHjHfvwBGv^@Km?SjtkwKxO(E^~OaRU8MXd?f3_4~geu;{>M9 z1ZJ-ce!`yLrT7Gnz$02T7MzDc!xKC~%vIu{hgq~eXphPprY4h@HO_uBIDeds7R~gT z0M&rGj!sKCSv=go5icm*?_C|SD2fWh<^v+ff5aK7cA_F%wQw>NYrBU~ zl1-mLC|^0 zcI3`2w+<{02G4C4C*dYYROXGe98;2_UKy`fplBVbRh@(U{jF=c&SO zs}v_|`bMEs&;n^L822$qb%=>EcBGutxV+#rNN-F%2C8xn&~!|JYw^63nQlyTa@2Iw z(9{X=UmkFBn%hGwjDG>0vZ-@C^oDYBmAOgsR8m{AD#+WZE*?rnF6kd#sS|K99M(X% z{Adis-ky;FPq#G+f^xxG5-!kabxhx=$S;bO@^MKCz{h4fXCO+Q6Y{LCzXGOXdbV}U z(8flceh%LbTODjFlKv0_t}`pED=*4ZU~geyu4o00aELD;lYeGRwqU*udKEaxBX9wX zfjs&eprJJ==)uPr?Aj+Ag5PZ_4fUbY=*#*A;h63&smJfwnW)|n1a}O-8u#ZivLE9g zj*XNH+<00000NkvXXu0mjfB8Z9> diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_dressup.imageset/mine_normal_my_dressup@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_dressup.imageset/mine_normal_my_dressup@3x.png index 797997bd4251c31f82b558275e2e2adda3c414f5..44ba9b995831524b25e9e6987ba04b0b5d8679e3 100644 GIT binary patch literal 2065 zcmZ8h2{c=28x9(&5KF6yY0Fd%RkbEULKC|Xkpw9^w6RsKwL}mtgK8OVRcWgmT0v?k zLQzy}Uup&!Yxmk3OQ;gd(9AVD{r@xX`R?~U@AE$I^S$TZb8ZTeU=4#RLO~!93}<6O z22Pu;XQv3Td+M9hKp-J55$|LPq$m_h|KC6$5Ze%mM8e_va5!8~PY)3MzXlKhyum;5 zT@NtZyx;{%P*3{T?|^cY={K&d>^LFwU~Cy=;{dh@qb{aj-(#nih+C{_)t?;#%t@`0XWbtQT##WpexH$SB;f)O5n(W4uQhsiAfvSH1@2p#PV}E(1 zvw72?`*Pev_K&{Fy8=nC)@cT#RK>fAuJbVoqPGaNH>e9;FrxiP+j7T(jE#Va9a*?P(M{6Ip5ObTt;CUvsjv(I_<=VS42ed*V)&MfBqD7ZH`?+ z_VH;O5kBmAGuQ-NON|j;49k7f<6TO-xiQshrn5R5aiG7l@Lg#~S!kvEZR5sjJ(v$PafGd#bt0?iK?xXp)eA|ezek3e zO(vy1RSxA`uT(zm_jsqPBk<+?B>1;VxpAx|b9S}X&KJXp-swM?F7i zQ)l|IcJf^ZL@Y?W#}uD6{fmq*Gm}1)EXk8BE8D0+NRD8wAGA-Qw3rO`r6`unZLED> z%b=QU7at~cwnH;6Whw7sbE3=Xzzm5wirBzN2am4LN*~Ug&;-?V=cb8F#7KD%xpox+ zlWw$Mc5-HZ@-dbw4JhYZ*sDGrSmw+?lPXh}BtSy77v zEhsaV*>bw?lwH#=cB-%RRMr$Mnft95++V7$xA)s&8R@My7;P_w3m+sf@$>-cQW7_OhmmM|^itX-`IE|s!bFH- zR0`Ng)!^Cw3Ng{8+KqE9*F%q7NxQXv#GP2eH?eoWNfezu`&eWN+NbdX7Q63F9zo`d zf@f1bKgh|n?r{1fvk2qli_Jb#9J<$3k`b;n7>!}FePl5vat(`g$Y_haqP_~dLU-Is zDHY#xH@AQ@clgc#ui%Jxah>t2PqH`=UwZfE!IR+J_TW(=*0lDC51#ULFew#u_Qvdp zMri8!kWs674Ub65o&dI8$k2#5tTpTXFer3vZw7wTsIq>=MOV>s0* zf%f4Q*Qqv%Ty?E@$5Wka5^*{z&3B}m+pTP+RjjW@1h>^S+9*1!^{RDdeEi9o{c!Kf ztdem9oBHnk$R-_yp66jW%AOwDGABb`4)E@zsH9voph?0rQ{8&6Q`|vIp|h&)Mc_;c zC1tilT2Dh1@++_P_3(~8B&{~N^u%?I3Z)>`SCGERmyK(c^^4(QR4R4x%ge<==#~q z^%3o5HgoX&fE3~W>xA-b*MYJ=*w-CO&~6in(-P3B-|u1KJ~WM4zcJH!-l=zae{ecP zE=Srx(Mv3+JClzQ^+K%emtm+J-$yWvUdV|{cqe3>-&I$nJOKReK{!i-MXA}Tguej{ Cji(3z literal 3873 zcmV++58m*JP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS}i%CR5RCodHTYHR@)fGSAJoZU} zWz|(Gf(?RcZU4|}V`?QT3Dl;xHDXNKh^>}CYAn$-gj(BdBv>CPSZZ6^lwx990xD{w zRHC7#T3=N}s})RfT@?@zWN{y}J2PK@zw_Pm?VVw8XJ__NlR4r0?z!ild(OGP@4j~s zsZkAq8Ui&0Y6#R2__QJr{J#YLkELNtvO(H%IjPSkBnFm({71TuKnKxd@5?QPl&e z{+#U21#&HV(nI3~(zpTiyoI`D8*Q%*%c}mtL?ucsf=dBL?ormewo^)0kUU)}>?t zh7j1n$09Kq^Eq@a^t9u{g#7V|_HdTzj8!_O0JXP=iCJy3I0)q$tX2w6^eSqubtNa} z+yp>pCG&FYGwtCCMcSj99aDhL%gXiW5X;&Aoa-irMd;;~Ey`ywPhq%yr!OaWV~9>3 zRa89VHrzeY$g>+3gvlwV%gxC^mH>!U9*r;Mn3zz`)X4ItUzf(}mX%Fmqx^90jRE&d zqe|v?)SNuMB>YTYo%|eM|0ig9KyXR{Q4oNy;6uj;$fgzzEn7#P73=Z%uUb2z~Z^ff)`7vkA!S= z01Ct4@tfpw7{9e4Ei*C$g`sLY4H>UU0b`+22^}qhoO2c?Zpme_1qkG)$&}nX8b=d` zFru{irf_yDlqJ{=e;2){p35}J+HDRkAC(^c_OVf(6|AzyViQTQ22i{)*)KO=czdwp zXls>AJeQRlVa>;ugeNCb@+}0s6hrD{9a4sZ^TMyrV}ufT8)8nPy~4^>*9xqT=Co+`!U>$8lyr(J~V7#?puNrAIz6={=H z9I^A|7kQ$B55S>^o*&}W@{5b><(6_lLY1MZCnNLWbTRL3Y}t-IyMQ%*k7t89EMh%X zh_Yn$^SSaI_DK_`ik$j2Jm-l_0#BI&Toj(lXn^*am=EUNV`bJwR1YsM9{3j|Lb>tL zKDn^SbjfU40Kw`abkn3B6X1xB=~PqZ-D3gf5j4x0r;Z&jtiCnU>ao|H_yx=t^*E5$ ziL`;I%*xG<+H}6nzJXz77Mt%wd5Z^%u-%BBcpXGTQdt0Dg8Mv!)nJ%LY(Z)=Eyl~K zMLL%EgvwHm7BwF)a?+PnRbMB55wha|5L*k1b)#(5Q;cUh?eOtsl)F3=^7gp4oXP7K zPo*R~qylT95o*)75C;XX8VFN+Sci|kqG=;;fYYIZ4iD(H&Wr#t`^~M8ofhTH4t2>J z71-l2^U4d#P^5Y1H?{%r=V1Oed&f$LRA5D{3fmbSKd3&=3ln8sndKP}6i|8@jaMseEge%%8MP1rZAGC*htP@gg5jgdQismzphsGEHJp-V@os6Mg`e)`u@Y1m!vOoKO?I2oCPT_a)Nu2ug>fvH<$}ZSwxZOXYR| z^*bHw^u~t)I4a1x3@6|;dJKolNoSa5`6({zrD0O^6xaFy2ZsZ@&@<6H?SN}Q#j*Ku zx|sAxl$8}PrR2ZGHcRD!=g<@cL6}d-{rD5j3w9t>-+1Zpa)HD=Oezlm`So{h75RAI z(0US|j!7#9*p2UgMC_qpjc8I+A7m%CNC(1gOl}p0{D8Pb`zm?yGEqjlScY0w^ zcx*_SW6hf!X@J?T_prz-596%$6uxHM53R2+jg!xzpj0;FAB^qga8;nj%pV z)Qc;xmmkFZ(F>pvvD!n|V5+^8zW5-osqxI?;a@=j&Z^c18TKzlh7Hi=8-xDrfINab zmTs;d8WdA9BumMH*K(7&JbPagR;O|)jm;#_Xz^S}JFsECly`ac=ZeVlssqdV0bFxD zRL;h*IHq9(L<5sj@;rvwb~G??HUzmiS|1&1y1C$gJ?}+Tq+w5BE_fn0ARkaXlAe{qA z*-~h&{M<0UW1-P2Rs{cEe?zzvjX&E;^s6Dm*hp>!DoD%|EY2qr+n9@p$A?Z#`#YZ! zIkG>J?RyKii|30>$62hAM-fm{3(jLWo@6t~c%M~$&>+LQl73kPodF=P zKjHEO!hyr8zAiHa30n$z{|%Ad|8eD1g0jENs|YVwq^b7Eyu8rZE%+pr6FYXrRG*c@ zi1jt?@(vs(1VbADo~sHUM$MEgiM>h5%3T`kP}g*r;$dArI@hsW4Y-tf_s|CZ{7rw` zzWMtApQLiC3ZO$7=|)hUHq0zwhNHoHaWQX1)_*AXid9YXo-nrOWLCt~e^{A#>W@Q1 zd58IGs49RKt&v`A-rm;$5Tylb0Vya>ZV1FWWI(19|I(nDN?%n?(&{uXT?{e~%mp|YXEfi$<*eit+GI|d4pl2dYOMP4^A0S-Ov~{y zTPhEw2TMG5S=CWhJ&3N+Te{g}NPdIJTfP7s%B{fD0b5e;sd@&feN#ZI)YfnB7J;ky6F zs{d#9DK-kNx4{Zwrbs;e|-hJ4pW0{VpV64p}R?p-F%WRm8ZuG-=eprUv z!w{?M%Pg;!ss`xlUkAIfYkf{PZ;XZ!xvU5F-2Xy{UCrm^5Fk;Y{4H0ez0(55N%+qYE|KfuF{mq+H1qF z;PAN+QJ;$;a2yPBecOkwumiC_j|T0);kKhEDen$v0{zu>Vg2M#rsk3|6TM?LfIACw z%sH@m3VO^0EE4Q-uLHmb0Qheg-ZL^k0VW{uF|x$}4~D;ZwBib*4kz(2m6uFIqa3+> zWq`j)j12whs<0t7Sz0pv(v0isG(JEM;CFrhHvukDYE(m@hCmI08Ui&0Y6#R2s3A~8 jpoTyVff@pzb_D(hXP5ggK0SnA00000NkvXXu0mjfkAF8A diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/Contents.json new file mode 100644 index 00000000..72ee5999 --- /dev/null +++ b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_normal_my_guild@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_normal_my_guild@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/mine_normal_my_guild@2x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_my_guild.imageset/mine_normal_my_guild@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6a3c588ebf02b38935c7e4d2f006ce49c9814861 GIT binary patch literal 1143 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

5}Xx b-mf{uio05Zdaa)WlMI8WtDnm{r-UW|E2Ltw delta 2137 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 YU20V_H*a0s56npnp00i_>zopr0Fhbx0ssI2 literal 4104 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 E0QL5;JOBUy delta 768 zcmV+b1ONQn2bTtrBYyz-P)t-s0001bfd6cb{cDu}Y=!%4X!vZE{cNuPY>NDAXZUQC z{cW!QYiIavu>Wng|81`SZLa@pgZpb}_iUH^Y>@nHiu-J6`DkeN|NsAOp8aj2{%x)Q zYiamvZ24@F{A_&sYxbFiu-Jb`)rN;Y=Zl3pZ;uj`E8s1Y>WGBhWqdH|MvL*`TGCk z>;K^9{^;!fw8{Q`sQ!4I{D-gpb)^23t^I|f{Ct@Fgp~Yuj{C&f|I5|>#MJ(`%>K&G z{ce%`m!JEQpMU!{o6ITz0006ha1W-x}p`|B=fT^KlnyEIu1=92XACrq^TPsh(J2ULF4l7Gn zxQ;pOxIMRLxOC&?H&_X@x7m*rfQ z2ooJ9(ojMo48Wr{ND$dq5(04FR~wA55+rs>0KiGJukK1@R%pCl>re}@-EqV#g9i&D6|#D+}D@RfgXhuMo=sk z?2;D=GJnJ40+2`)?Gh2-2?I!yV1!CEzFzC$H6kEEC2U_)4nBmN2hi;%dC7KSt)I;4 z=D7e+Dj6cdK7Ko5>qm2Oya43$B`PuZwHaFt<28&|rvo5Mf=Y~i{lGm8SF+4Y06b?c zlGx}HL|;C=Kp*12rtiOJJ zdvfvc-X+Bj2J&y8-9Ei-(~Pu4YiVgdzSsA+FPKypAjbUS{D}n(S!tn8x>~A={G1;j z-o1Ha|IT%N?JYIs*~wl;J*p9385o!3-tcHATH;nFGz_X$tdd2${|77cj!KD?uD ze#Sx*hkIXMzWSyA*H5w2l{YHDwrOH`ZuGVJ^;=Y$T}>ZdQ9j^Ud0NfVRIt}Ils#79 z!Gam7uWy|UjtnVhQdQyFRrIMuY-zEf0NdRQnTde~EiPXU?h^I=!g^{w*Ox-p1y2}m z|DRYNuxLe=#NH3QhkS)MiT`u_IGtfh!^Jj*j^|4bmi$1o+$BF-`yH4x!|SR!%chwI!P)lPOg$o zYnQx^STB6y&yhu&r)AvAOuhcqVZkcHFZ-^)HQ&T=^G9s_L>`9{cEi2jxtzM@uF~_c zj%KKO@~`NuaEIFIgu2ChGeR4DPJYc^y0>|WzUGR1VH0`S8*`?{cGr3*xK!~nSj+#v z!8)n9_(CTKM<^4+&U+zjC+6w(o|!1XF?CUyzuJVV{K}`RB{U+Zyshwh`YdmrIP*f6 zgMH>zcLEFSgct&Y^1`S7D6rP$aw=3k$i91v@%`_&KHgJf7uxq*KYgy@+wQx659OuY zdn@DjP5i2XxzdyVUvs~yn5|kW+4|j`-+J56)Oxem^XAW$+0K7#yzwJ)n zZ@s_oR{MQ^wa2}0Z`{k+@uEfi^MpOCYrlW<&9$hRdoRZ8dFkPuQUC3#pPsw_KRV^> ndgcG`P5G delta 1335 zcmXYwc~Db#5XVy$Ii@2tO|%|#Py=S@h-iTVfJ5cC?>^`Db$eL6xL929eZ|P%Q~VR|u${gvtnT z4gnb$$iYD=(b3=gK`gV(_ zg>g*HDAViFXiBzv7cAoMtUBz$NYHzm9wM zXMUl-)0o@L=rhaa^F8kGwi`JQI3v!1N#o-w;8;My(b*>Dy|J;<-!Z=&x!lj+-`w1M z7kzeiHatAMQgGn0Zun?wlFIJRQ)m0>rKAF1+wY^d1ao&V0^uLK8rjO7_EKx}f-|iV zYP#(L)K$Ib5L?PhYhTPAVI_!~PK210YC?}O^VvpqiLEYO{V%=f)ggk7HS~sW+-VEf zR#el~(;9MrL-%=_Dawx1q1 zZR1lw?^Ez~Z!)4Lo9Z_|844GEnJyE~c-}~)usyDTE+;sd>g+x>yGz=KvJ`K0@ws9fQO&SW{Sq$<@$~U=g9EoaxE^6~h|o6Kv7y_`^-_xg6f19+ z1#Rs^3b#}2nmj#ktn>lv5G0?wm7KZStcW& rF{7waOe=~U6T2aov53M4vkwk_Hk*1rD23^7ctM)4cK}z*IW7AS$kXa!Wlq8ATTgA1Cl^Nph*zJz``H`CTz`2Vrs-h7Au`vQU9_i;9VyvFbBEU%rtZb?B_4mPH{v`koL@V!ueT^KE+oL)%~3~PO5kna>OBk$Oi7+Djv*e$-%hz+ zcFRGaO}s<5b5WavN5{SHgAzPDj`+Q=6?Y0_OIp77zjVshLjnRpCr+k*y1!ua=Xz^v z<8+4qU(HW-J+$8_KhM3?PX7K?xp(1$EdrSjgtFT2=7RSe4-5k-p&t=*7qFPCzldR{qPUUUew=bM&8Abc4sqg;}9cle?7Q2=m(BxFP&fLV5DZJfRtK@xJ3ae;g zU9^Yn#(SD6}Cs88&Wk2X~`Z}3@a^q^tMgF8$KYpVliwIoS6F3nlfkS5cx zsgG+5pWTlprWFh3DT-`y)4DoU?Br&at{*y+);`>0tIce;xzSo7+9K|287s@GC@Gsm zYf{W7w2E(Mn93}$cn4osM`p8&7T<~RFKg8g{M1w|J~LDw%lCbSsp} zGB4<#l-hYz^8u&FF1KTvCYAmdKI;Vst0PcXq&Hw-a literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_relevance.imageset/mine_normal_relevance@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_relevance.imageset/mine_normal_relevance@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ab054017607abfcc761aecbf1ce669d957f13bdf GIT binary patch literal 1404 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7{vp8LR^7dV`F0r3kw??8z95T z$jH>x6vzOAzXyUK?Eia%fLtK^|L#B_X<}lcudfeQf`tIe!c7251Gx}I=H})G1_sC? z5S0)GaAgq1KrRqK>;f_%x`2%TdjgS7_`es#-PGd_l#21Q_`fIU|GuFA7h_+q^9Q=Q zHOmg@;J>>Ai{fqn?+^ID(+#K?Xu`8Kz5#CLQ%f9O>`ZSi_SxI--kD=>Wo~kPq4(A< zw~9ntKUec=&jSa5LE~Q%0<;{!bQv!}8YW-N) zUGjL3u)vu)`LSNcZx6JY>#Sdu;p%83zqxTuZ*63l()BV8^?&}#tiRUvR2Mo6aC5Tl zac5v)KI-Y>7!q;#?X>jCvjRlg_?x^G1iHL7Cce+RvNdPhlJ7-kd;k5vKhgO_swubN zq?u<@(&qEOdhqq(o$vD=Gla){ynoO;xAT8>@4fZW+1W+6etG-b>nka0%sm(%ax}cp zz~xRx{i};M!3T6_)rX1H-&pyG&#Cax^6MGLxr9TeUUb;`hYG1ruAmCX<;2dRDo=UY%CER<TG`JIH^cY zHRX!YpKs==-+FVbs-5G?X1MCbMA??CUK1Amf9>;mu_^N|sR&2j_QSJEyMw=<`EVvXxWm1+YQAnxivIbJCT9et ztA9QD`M7_6gtE!|x9_~}pYU0HWy=Yxs9#>j2c94M`dR<|p{KQ(*%v#dt2U&&q{ZaV zT6Wtul=RkB6n^X;nD#DShyA`e1K)ndxFQ&%~WY6Mi}}e*CUv`uhIPixQj~ zXQCErxY&d>?vPxS>{1iyxG+-g8Jnr#Q|stOTG{vHH=F-j`Er)wA};sV7Y-g~OKu{T)m0oVs7Lx;f%Uh|oAUy8duGE29+EU-$JT)j=C$8CLh;KNBPbdm}g_oy$bV0!3!WcF>PS;^|w3jQZl zF9x|B3`&f2+L_0Y?0hh%TjJv)nWY!6EO@kk?TR;3xmw%|=PVQ2s>^tmIipu|zwxUj z*2_{Stn;pv%yju9+qjJ5%B~()`xlK(y?6TCgnmzOD^XJN3$c({IAf_TujQ#7yurdx zXH9VnF%NgM5m5YiV)j#_x_UFOV$w!oCbg!^rn{Y{3LsD*A zWrg)lk8GvBU8(7Ii%%|HP+n1ByOYC+)x}Y#>&vcdiS6zo0bL8PUibR&BlGX0O4q>U zf{wRW%CAkI-O6Phv%A!G<%^@H$L{VfU;p;Qhl6WxKk?M4s^8aMuOYSge7nn{^)HP3 z#Y!(e|M&d*@1Gy|I1>eQi&(x?eoxcC-}GGholew}=Z3Pe%27wYyZAUi7D&pt&7`(G z;+Z1fN$sSdGpv=5EH`k+FrDdJeo&6bcC&nMyY@PcpM3i&wxzyTW|jq(6%3xPelF{r G5}E)V9Bo+u literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/Contents.json new file mode 100644 index 00000000..0e358ca6 --- /dev/null +++ b/xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_normal_skill_card@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_normal_skill_card@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/mine_normal_skill_card@2x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_skill_card.imageset/mine_normal_skill_card@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4ff3a174fa801a120104b4cad1cdb470fc592625 GIT binary patch literal 3184 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 delta 786 zcmWlWXG~L37=|x~RuSR|)DT>VKon7`DI~a(BHM}$7Nd-)C<-aVGGsVzp^H+13Upef zLM4>ZFr*bpl*WNTY=EdBbx?|1Bxun{X+G~gKTgg`p7(veoTGBl62-o#E1kxOKoA6Y za$r}%Cst0CyLN@Rs}vJc})M9TZ-NQVDLoB8HM`ya$^jiwBlZ(Ao==Q!w@h zY8pXw8buuebGc~$F1K~jq-X?jlE;Ko z8PNl?BcJ1!?e^eX0v}L1M{e3u=ZFk(+V*&7C%fa65DgWCDBV3E)M^jfSNv%>(9S%m zmpY%>bYWP-RMiLhC99H9+pmP^3z-R4C2yzcwp&I!t4~K`=M7AMU%RTODMMw>i(&3> zEIJ%(ouILFx26o@xOWC=ug_xI>plM3$1fQDPiIWo>aI2)TlG*cGk6Vm(%X2cCy}$F zCl4K*(YJWEHw!EGMz)d{8Y-G~^z0O(oz!eDE~#&Q-TeD)SemTVu;tr&{``shtjZ_z z1Vh)J^bo=quZHEwi73@i7PA%^@ua9j*~ib(xz7+i+4=t6WjWK&)cmvRlIaQNHg<+G z%y!+lBc9^8v-^j2ol~rzdkaN05iT*JTI77HJNbi8|4t3#NzMXkWqP_qLhV4bb%%(Z zF5Z%HAC4_pLyw}Fz8<3PSidzknW~xWrh7jkvKb+f=a~kJzAcqDx|ovWt5w%(3ATuh zGm5=tukxb-ce*1&#}6DU3n(!@99A6sW33w4e4wBMuDx0w^zmgAosNvMWQmDnRCZ%2ib~3E zj3t!bi^8*HE5umRFl3E+f8(8ZI^A>b@B6;{{l4Gt+;h*l6f6cQDl8)m0)a%WQ090b zqIS0+FM#fvX2Bp3PX^Y;-U28!xl2`56^L3|S^(wK8g}v7Q z+o*yFGe2hoA4h#kZK4hEHWz~M7y@W#3A_=ua^M$x!5)?Q$dLhh%G&4g7_?*_@r>N| zcUDJhbCnNL6DG~a{<=WHKv!o<3)B3(&lzhdNb+seCC3B@5%6X@YD%&KqkZrHZf`7i zwlYMhi;4(uFHTKPjum8PINBP(lpw!)GLPQ}fp{mZ%uVdiv@WER!zE0_qF9fZa*)G4 z-ccZ#_EZnFds6X-aMtLkAl&vmYv&@%L!Fv3?80u=jmT4$H&r^(`u0n?@-|tnNmpiR zlYWGKMQ|y0G&d32)>csyh`W2nlag#v??Z7;*OMk)QKK68-6v4PL*q%pq>;bMj&J7` zW~tb^3>}IKc0U_-A4kyj@MBea>si!h2w^ATCzLl2-;)heN z3k*KlAIEr}>iBBL^#)mGy{5LPfISYvGE%L-dacSjI0Psc2l=*#WsQ_n&DAE^qse`t z*UC*&I?lDM7cJ1X)GsaTf8Ths%?fz|zX#JhSk?Pmh^x!d$(petaW5LVI)Ojom7{q2 zygUI=h<v|w3GRbWOLn=q!pP7u{?779$)QViR@hwqG$Uj z34Xa=0ZCtPK%Boh_B7h70}d5s9H68zyWtmJ@IhPQ;57%lgx?%h(aEcsuGiJXQ&@S- z-N5_ioNoc#;bD|mLa8Z^^{B6AK%+iB2h2X=WY-_w3{yD%3{p9?x&xzY)+Y21+`YYi z?7`GM$%taluToE@yW>(M(H zaegrhP1HjL>*n#%>KBuP(h120Gn3%(mWRd-nM%WtCv{ z_WFm1Og^h>8b*Y$;0m`g!!tp{u%yhfTeS9%q9_#E$V2o~7>oqj)HbxF)+ugnBjS(b zpVPH|dTR8lUSt+@8NDxb86EiSLl`)AqEo6Va`9!Znnk~Q6}wHHLhdp24Ctd78U+wN zJT~WA;>pNandQ7cgi_GL{jn0OV#JMA2A#g8Ax>PHBx}k&P#KZf2_{T#)fCCgPh;6- zjqIt;Iq-A%$y70mcal8%p8|#aeS3*z$}_f=8?lE`0a`EMMW~CKUVJ2EA{t%NbGjB+ zCZ%Ik<{dK|Tj>z8AmS{eX6bU0IFYz=EMB#ubmatFfEIUH8lS|!4g4`6D+`Qynd#Z+ Fe*tXk(!2lw literal 1326 zcmXX_2~bm46pbW8SVy2T8e#@eAxJDRf(mLC36iKF0v!R-X#;hE5SA#CfEWlri-{-+ zYbb&s5EY471W~IQ5lj^|CKZqYY!T2ZwjxV0Xm9^_d^7+4d+$5vp7Z9-lSYJx+FFsU za5$VTlR=L}{|xLS;?c-j6MPhhTOf+q86AR_kSzeV5X5D0{0vAcA*Tq$D#$tm=@LLH zKwJU>F(Bo@K_E?pC87!tmO&B^OV|ZaP>waxC{kf122g=OiE;DGAy)}pIUp)HDuYxJ zHZ%J)1{0x_vaj5f0&IAG3C2Y+88WQTMzA^PRuTfa3dk=7i3%iN6w{?x$@yYNPz*;- zV#MSE;G)C|5LIHwNfKgBl#cGA5j_;Dh$fkGNRxiWqvf$eOd3U=P-4=kBI+uy1k%NT zF4QXbixxWMm>e=?kRicFq5iW@0k04JN4=GS(;0J%vy(iA^0RV^EPihmu-mt1-=y zW8D76M#@2zDl=Og*31z&?Ht?JBe?0Fqe)O3=bdT-mhHT_=I}h9fAHA#m_&c^Z$5vd zuiuC#g(vmz_gIXq&>0go9(QIkhm%t${TZ#b5gtB%52=6Cgi7NkYPPJ`>8wX_9g2 z-z$UezHi|-O6*2|CMveP1zB2uP%& z_MY{Xxt3b?;E#L)e|a!r`@X7bk5pktm&W_aW97-fejl@I4_hm%cfVGIHD>acAkA*H z33m@xi%qfoK&1LS>rUPI&ZsuEV;;-zqXl9hJYt1@6KH8L`AWKKqAI#?ZG7!%w$edL zmZUt0bX`(t@y_E=tR$LPlty&xw?{bC^BGL5`scD>*IxhQ^aGVw|BI)eTf=PF6jZZp zAeUw-p7yHeJh(OYbm4l>SbXcvht${rrr7a_k>=D9R)0Fdk3t{Vy*&K8Qd?nLd;0*WyYrU9mXaMRC=?8F$~(L~hn6uUj6W zy?2trfdJi5BO(9*@`7dzF$u%)jqqh8`t-sbnp zy_WTOPRC`3(u26Hn)XtwkLB+!g;Txy_z9tTGZ_s}sKr&h#IdNCJ=})a4g3F{wRN?L nlcncO*eCbYI3i+-Db-|+Y@D*t1bvdD&ke^638y!2{UQHS diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/Contents.json new file mode 100644 index 00000000..e3edfdd5 --- /dev/null +++ b/xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_normal_visitor@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_normal_visitor@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/mine_normal_visitor@2x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/mine_normal_visitor@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6f92c24ef48f178ef1757438a8f7493505696b53 GIT binary patch literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_V3Z2*32_B-jlsas(9p!h#K_19 zNJ2#5q>+)arKKg11Oii2Q@A)#C0sF_VP<9qQ~>8f6a%@s2FCyQ212C%?*TEaEP#fY z{@?8f6bFj@-xB~~K(qi!kl@|`AOq;O|2w^aZu`G4;Qy}JwXLoo)Aj^pM_Oy?83Gwo zN}U?g?Lk`h1^?e0lo4kAaHYSOliB`>9zYZR?+N|C-vQ#Jhbw%6F8seg2xynSfzh^Z zxBmx&{~rtae>nKrYG0swTT7FRbG;VTIlCs`TL26lzmg!oV1|o-RcFfazWMUu*`px# zA0|S#o3dgJ&mGyH?;>_%>-yCdC6zB>%t_b(mRFV;7efI3$ z^&`7CPMy@(P@9(#?`g?n!M8mY82-;aT^vI^jz7H^9(>zD;K0YNEh^DhBOcuA?alRg zVY>JG-Ze5kjZc2p_pV7(xY)BM_=`Z?5BtpL@6^xEeXy@M>+me$nO~cy>9QX0khmMD zq_e{4f^*~26L;Jc`!+Z5HCw4%y>QNp=U8yBbtM04qZM;a5+eUjOP$54=yK1bkT;E^n6!{I=lDV6P4O)4%%@EUU^a-BCf=Q(9K!FgfD zQ7O(hVu#Od*}%uS>t82RvG+j+snDfHz4LOe)*9~iV$o_?{7PW0g+)xw^u~(!`o>M= zkq4jEv+s^Pc+Q?N_Hy3(?A@a{q@)B=l$L)5)#0%r@P}w|Nf6&s%*P7R1(eEzLe83 literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/mine_normal_visitor@3x.png b/xplan-ios/Assets.xcassets/Mine/mine_normal_visitor.imageset/mine_normal_visitor@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ee64f1bc2b5dd325d7d027229f92305e370cfa52 GIT binary patch literal 1243 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7`*~~LR^7dV`F1eQ&SUT0}~Sy z2;1D;9LN9y8yg!411w`~VPRopWCT$L5eJe$y+B}K0M!l=|Gy^?h~R1<44}sU`$2;L z_d=y0M#0Jd`+|UMAb{vaGX$s$C0ICbQ^lqNVd6gWUEDvY)HwAp`ci;JbXNm{6t--a4{ zU}&b71o;Isy!RE{^n*$IcNXWDi`$;@$az}bIFS$}%KCQyf|-BboLO2CZKBP0|H9F^ z(m6Q7F zqC%aW>+-N@&gFZ>tFJST3|e#AaMV#kap4MnaD z2mYz6tuDzkKkUrQn-P2ek3fX?!-Xsxbne?QubEgctkmXmduM~n`Z=#m8Ll;1X-YoH za=+^Rd6Ula#?;esM|Zw(%}o$pB)fCT>Tt`GtC$pnSDj2ypU2jB>7&C7zJgM90k4ma zD;+!-#g5%znbx+~=cqUH_Rqx$nvDWGT$Ltvm+QFgG1?W*8DW3!+<~`J9eQo73v_?y zS%fu|J+nwuOg_z`D*O4a!0TBF>!u!d_PF)(_2d)tL*h^EDLCYm$MW;jv)MHP1>K7l zs4rS@e9?kH#|tlQ9Rs{YwpeL%SP8P$&e^Hx@~Lg2`*hj697-SGc;&CzV(Rgv!@Med zC*zWDw<4Hlg>~p1pKzPeUgf1kL>JSVvTF&K@9y4n;Ug34mYsR=@;bds85q9bn4g-| zCG6$)(rQ*Huh4nHN z=fBO8P26ZVH7nly=YqmrC!XDWEOp`8jWY>{!@Fw&+?XXMzGzBV5c$shDx<;uHJ=^b z{1-+Wr##=mWU%*q+5JlluU9Xw5t!s9m9dhecKfav?Z) [super getView]); } -///获取赛事的items -- (void)getMatchItems { - XPMineItemModel * applyRecordItem = [[XPMineItemModel alloc] init]; - applyRecordItem.itmeName = @"报名记录"; - applyRecordItem.itmeImageName = @"mine_match_apply_record"; - applyRecordItem.type = XPMineItemType_Match_Apply_Record; - - XPMineItemModel * standingsItem = [[XPMineItemModel alloc] init]; - standingsItem.itmeName = @"战绩"; - standingsItem.itmeImageName = @"mine_match_standings"; - standingsItem.type = XPMineItemType_Match_Standings; - - XPMineItemModel * cardBagItem = [[XPMineItemModel alloc] init]; - cardBagItem.itmeName = @"卡包"; - cardBagItem.itmeImageName = @"mine_match_card_bag"; - cardBagItem.type = XPMineItemType_Match_Card_Bag; - - XPMineItemModel * shoppingItem = [[XPMineItemModel alloc] init]; - shoppingItem.itmeName = @"商城"; - shoppingItem.itmeImageName = @"mine_match_shopping"; - shoppingItem.type = XPMineItemType_Match_Shopping; - - XPMineItemModel * relevanceItem = [[XPMineItemModel alloc] init]; - relevanceItem.itmeName = @"关联账号"; - relevanceItem.itmeImageName = @"mine_match_relevance_account"; - relevanceItem.type = XPMineItemType_Match_Relevance_Account; - NSArray * array = @[applyRecordItem, standingsItem, cardBagItem, shoppingItem, relevanceItem]; - [[self getView] onGetMatchItemsSuccess:array]; +///获取卡片items +- (void)getCardItems { + XPMineItemModel *myAccountItem = [[XPMineItemModel alloc] init]; + myAccountItem.itemName = @"我的账户"; + myAccountItem.itemImageName = @"mine_normal_my_account"; + myAccountItem.type = XPMineItemType_Account; + + XPMineItemModel * matchItem = [[XPMineItemModel alloc] init]; + matchItem.itemName = @"赛程管理"; + matchItem.itemImageName = @"mine_normal_match_manage"; + matchItem.type = XPMineItemType_Match_Manage; + + XPMineItemModel * skillCardItem = [[XPMineItemModel alloc] init]; + skillCardItem.itemName = @"技能卡"; + skillCardItem.itemImageName = @"mine_normal_skill_card"; + skillCardItem.type = XPMineItemType_Skill_Card; + NSArray * array = @[myAccountItem, matchItem, skillCardItem]; + [[self getView] onGetCardItemsSuccess:array]; } - /// 获取普通的items - (void)getNormalItems { XPMineItemModel * myRoomItem = [[XPMineItemModel alloc] init]; - myRoomItem.itmeName = @"我的房间"; - myRoomItem.itmeImageName = @"mine_normal_my_room"; + myRoomItem.itemName = @"我的房间"; + myRoomItem.itemImageName = @"mine_normal_my_room"; myRoomItem.type = XPMineItemType_My_Room; myRoomItem.cornerType = UIRectCornerTopLeft | UIRectCornerTopRight; XPMineItemModel * teenagerItem = [[XPMineItemModel alloc] init]; - teenagerItem.itmeName = @"青少年模式"; - teenagerItem.itmeImageName = @"mine_normal_teenager"; + teenagerItem.itemName = @"青少年模式"; + teenagerItem.itemImageName = @"mine_normal_teenager"; teenagerItem.type = XPMineItemType_Teenager_Mode; XPMineItemModel * myDressUp = [[XPMineItemModel alloc] init]; - myDressUp.itmeName = @"我的装扮"; - myDressUp.itmeImageName = @"mine_normal_my_dressup"; + myDressUp.itemName = @"我的装扮"; + myDressUp.itemImageName = @"mine_normal_my_dressup"; myDressUp.type = XPMineItemType_My_Dressup; XPMineItemModel * mylevel = [[XPMineItemModel alloc] init]; - mylevel.itmeName = @"我的等级"; - mylevel.itmeImageName = @"mine_normal_my_level"; + mylevel.itemName = @"我的等级"; + mylevel.itemImageName = @"mine_normal_my_level"; mylevel.type = XPMineItemType_My_Level; + XPMineItemModel *inviteFriend = [[XPMineItemModel alloc] init]; + inviteFriend.itemName = @"推荐给好友"; + inviteFriend.itemImageName = @"mine_normal_invite_friend"; + inviteFriend.type = XPMineItemType_Invite_Friend; XPMineItemModel * realNameItem = [[XPMineItemModel alloc] init]; - realNameItem.itmeName = @"实名认证"; - realNameItem.itmeImageName = @"mine_normal_real_name_authentic"; + realNameItem.itemName = @"实名认证"; + realNameItem.itemImageName = @"mine_normal_real_name_authentic"; realNameItem.type = XPMineItemType_Real_Name_Authentic; realNameItem.cornerType = UIRectCornerBottomLeft | UIRectCornerBottomRight; - - NSArray * array = @[myRoomItem,teenagerItem, myDressUp, realNameItem]; + NSArray * array = @[myRoomItem,teenagerItem, myDressUp, inviteFriend, realNameItem]; [[self getView] onGetNormalItemsSuccess:array]; } diff --git a/xplan-ios/Main/Mine/Protocol/XPMineProtocol.h b/xplan-ios/Main/Mine/Protocol/XPMineProtocol.h index 77826a7e..4ce9fcb1 100644 --- a/xplan-ios/Main/Mine/Protocol/XPMineProtocol.h +++ b/xplan-ios/Main/Mine/Protocol/XPMineProtocol.h @@ -17,6 +17,9 @@ NS_ASSUME_NONNULL_BEGIN /// 获取普通的选项 /// @param matchItems 数据源 - (void)onGetNormalItemsSuccess:(NSArray *)matchItems; +///获取卡片选项 +///@param cardItems 数据源 +- (void)onGetCardItemsSuccess:(NSArray *)cardItems; ///获取用户信息成功 - (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; @end diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineMatchCollectionViewCell.h b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemCollectionViewCell.h similarity index 79% rename from xplan-ios/Main/Mine/View/Cell/XPMineMatchCollectionViewCell.h rename to xplan-ios/Main/Mine/View/Cell/XPMineHeadItemCollectionViewCell.h index 2b12ce68..1661fb32 100644 --- a/xplan-ios/Main/Mine/View/Cell/XPMineMatchCollectionViewCell.h +++ b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemCollectionViewCell.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN @class XPMineItemModel; -@interface XPMineMatchCollectionViewCell : UICollectionViewCell +@interface XPMineHeadItemCollectionViewCell : UICollectionViewCell /// @property (nonatomic,strong) XPMineItemModel *itemModel; @end diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineMatchCollectionViewCell.m b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemCollectionViewCell.m similarity index 83% rename from xplan-ios/Main/Mine/View/Cell/XPMineMatchCollectionViewCell.m rename to xplan-ios/Main/Mine/View/Cell/XPMineHeadItemCollectionViewCell.m index 52497855..c3075c7f 100644 --- a/xplan-ios/Main/Mine/View/Cell/XPMineMatchCollectionViewCell.m +++ b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemCollectionViewCell.m @@ -5,7 +5,7 @@ // Created by 冯硕 on 2021/9/16. // -#import "XPMineMatchCollectionViewCell.h" +#import "XPMineHeadItemCollectionViewCell.h" ///Third #import ///Tool @@ -13,7 +13,7 @@ ///Model #import "XPMineItemModel.h" -@interface XPMineMatchCollectionViewCell () +@interface XPMineHeadItemCollectionViewCell () ///显示图片 @property (nonatomic,strong) UIImageView *logoImageView; ///显示名字 @@ -21,7 +21,7 @@ @end -@implementation XPMineMatchCollectionViewCell +@implementation XPMineHeadItemCollectionViewCell - (instancetype)initWithFrame:(CGRect)frame { @@ -46,7 +46,7 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(5); + make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(8); make.centerX.mas_equalTo(self.contentView); }]; } @@ -55,8 +55,8 @@ - (void)setItemModel:(XPMineItemModel *)itemModel { _itemModel = itemModel; if (_itemModel) { - self.logoImageView.image = [UIImage imageNamed:_itemModel.itmeImageName]; - self.titleLabel.text = _itemModel.itmeName; + self.logoImageView.image = [UIImage imageNamed:_itemModel.itemImageName]; + self.titleLabel.text = _itemModel.itemName; } } diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.h b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.h new file mode 100644 index 00000000..53bfe2a0 --- /dev/null +++ b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.h @@ -0,0 +1,28 @@ +// +// XPMineHeadItemTableViewCell.h +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@class XPMineItemModel, XPMineHeadItemTableViewCell; +@protocol XPMineHeadItemTableViewCellDelegate + +///选择了某个item +- (void)xPMineHeadItemTableViewCell:(XPMineHeadItemTableViewCell *)cell didSelectItem:(XPMineItemModel *)item; + +@end + +@interface XPMineHeadItemTableViewCell : UITableViewCell + +///数据 +@property (nonatomic,strong) NSArray *datasource; +///代理 +@property (nonatomic,weak) id delegate; + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.m b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.m new file mode 100644 index 00000000..560202eb --- /dev/null +++ b/xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.m @@ -0,0 +1,105 @@ +// +// XPMineHeadItemTableViewCell.m +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import "XPMineHeadItemTableViewCell.h" +///Third +#import +///Tool +#import "ThemeColor.h" +#import "XPMacro.h" +///View +#import "XPMineHeadItemCollectionViewCell.h" + +@interface XPMineHeadItemTableViewCell () +///列表 +@property (nonatomic,strong) UICollectionView *collectionView; + +@end + + +@implementation XPMineHeadItemTableViewCell + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + [self initSubViews]; + [self initSubViewConstraints]; + } + return self; +} +#pragma mark - Private Method +- (void)initSubViews { + self.backgroundColor = [UIColor clearColor]; + [self.contentView addSubview:self.collectionView]; +} + +- (void)initSubViewConstraints { + [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.bottom.mas_equalTo(self.contentView); + make.left.right.mas_equalTo(self.contentView).inset(15); + }]; +} + +#pragma mark - UICollectionViewDatasource And UICollectionViewDelegate +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { + return self.datasource.count; +} + +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { + XPMineHeadItemCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineHeadItemCollectionViewCell class]) forIndexPath:indexPath]; + XPMineItemModel * item = [self.datasource objectAtIndex:indexPath.row]; + cell.itemModel = item; + return cell; +} + +- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { + [collectionView deselectItemAtIndexPath:indexPath animated:YES]; + if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadItemTableViewCell:didSelectItem:)]) { + XPMineItemModel * model = [self.datasource objectAtIndex:indexPath.row]; + [self.delegate xPMineHeadItemTableViewCell:self didSelectItem:model]; + } +} + +#pragma mark - UICollectionViewFlowlayout +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section { + return UIEdgeInsetsMake(14, 0, 0, 0); +} + +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { + return 0; +} + +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { + CGFloat width = (KScreenWidth - 30) / 3; + return CGSizeMake(width, 68); +} + +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { + return 0; +} + +#pragma mark - Getters And Setters +- (void)setDatasource:(NSArray *)datasource { + _datasource = datasource; + [self.collectionView reloadData]; +} + +- (UICollectionView *)collectionView{ + if (!_collectionView) { + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; + _collectionView.dataSource = self; + _collectionView.delegate = self; + _collectionView.backgroundColor = [ThemeColor appCellBackgroundColor]; + [_collectionView registerClass:[XPMineHeadItemCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineHeadItemCollectionViewCell class])]; + _collectionView.layer.masksToBounds = YES; + _collectionView.layer.cornerRadius = 10; + } + return _collectionView; +} + + +@end diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.h b/xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.h deleted file mode 100644 index b6c04e0f..00000000 --- a/xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPMineMatchTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineItemModel, XPMineMatchTableViewCell; -@protocol XPMineMatchTableViewCellDelegate - -///选择了某个item -- (void)xPMineMatchTableViewCell:(XPMineMatchTableViewCell *)cell didSelectItem:(XPMineItemModel *)item; - -@end - -@interface XPMineMatchTableViewCell : UITableViewCell -///数据 -@property (nonatomic,strong) NSArray *datasource; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.m b/xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.m deleted file mode 100644 index 673adab3..00000000 --- a/xplan-ios/Main/Mine/View/Cell/XPMineMatchTableViewCell.m +++ /dev/null @@ -1,101 +0,0 @@ -// -// XPMineMatchTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/16. -// - -#import "XPMineMatchTableViewCell.h" -///Third -#import -///Tool -#import "ThemeColor.h" -#import "XPMacro.h" -///View -#import "XPMineMatchCollectionViewCell.h" - -@interface XPMineMatchTableViewCell () -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -@end - -@implementation XPMineMatchTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.contentView); - make.left.right.mas_equalTo(self.contentView).inset(15); - }]; -} - -#pragma mark - UICollectionViewDatasource And UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineMatchCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineMatchCollectionViewCell class]) forIndexPath:indexPath]; - XPMineItemModel * item = [self.datasource objectAtIndex:indexPath.row]; - cell.itemModel = item; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineMatchTableViewCell:didSelectItem:)]) { - XPMineItemModel * model = [self.datasource objectAtIndex:indexPath.row]; - [self.delegate xPMineMatchTableViewCell:self didSelectItem:model]; - } -} - -#pragma mark - UICollectionViewFlowlayout -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section { - return UIEdgeInsetsMake(15, 22, 24, 22); -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - return 24; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - return CGSizeMake(60, 60); -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - return (KScreenWidth - 60 * 3 - 22 * 2 - 15 * 2) / 2; -} - -#pragma mark - Getters And Setters -- (void)setDatasource:(NSArray *)datasource { - _datasource = datasource; - [self.collectionView reloadData]; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [ThemeColor appCellBackgroundColor]; - [_collectionView registerClass:[XPMineMatchCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineMatchCollectionViewCell class])]; - _collectionView.layer.masksToBounds = YES; - _collectionView.layer.cornerRadius = 10; - } - return _collectionView; -} - -@end diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineMenuTableViewCell.m b/xplan-ios/Main/Mine/View/Cell/XPMineMenuTableViewCell.m index 12db6d1d..54cec6ca 100644 --- a/xplan-ios/Main/Mine/View/Cell/XPMineMenuTableViewCell.m +++ b/xplan-ios/Main/Mine/View/Cell/XPMineMenuTableViewCell.m @@ -25,8 +25,7 @@ @property (nonatomic,strong) UILabel *titleLabel; ///箭头 @property (nonatomic,strong) UIButton *arrowButton; -///分割线 -@property (nonatomic,strong) UIView * partLineView; + @end @implementation XPMineMenuTableViewCell @@ -47,7 +46,6 @@ [self.contentView addSubview:self.backView]; [self.backView addSubview:self.stackView]; - [self.backView addSubview:self.partLineView]; [self.stackView addArrangedSubview:self.logoImageView]; [self.stackView addArrangedSubview:self.titleLabel]; @@ -65,12 +63,6 @@ make.right.left.mas_equalTo(self.backView).inset(15); }]; - [self.partLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.stackView); - make.bottom.mas_equalTo(self.backView); - make.height.mas_equalTo(1); - }]; - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(24, 24)); }]; @@ -88,8 +80,8 @@ - (void)setItemModel:(XPMineItemModel *)itemModel { _itemModel = itemModel; if (_itemModel) { - self.logoImageView.image = [UIImage imageNamed:_itemModel.itmeImageName]; - self.titleLabel.text = _itemModel.itmeName; + self.logoImageView.image = [UIImage imageNamed:_itemModel.itemImageName]; + self.titleLabel.text = _itemModel.itemName; if (itemModel.cornerType) { [self applyRoundCorners:itemModel.cornerType radius:10]; } @@ -143,12 +135,4 @@ return _arrowButton; } -- (UIView *)partLineView { - if (!_partLineView) { - _partLineView = [[UIView alloc] init]; - _partLineView.backgroundColor = [ThemeColor dividerColor]; - } - return _partLineView; -} - @end diff --git a/xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.h b/xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.h new file mode 100644 index 00000000..8c60debb --- /dev/null +++ b/xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.h @@ -0,0 +1,19 @@ +// +// XPMatchManagePresenter.h +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import "BaseMvpPresenter.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XPMatchManagePresenter : BaseMvpPresenter + +/// 获取赛事模块的items +- (void)getMatchItems; + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.m b/xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.m new file mode 100644 index 00000000..5a9728bb --- /dev/null +++ b/xplan-ios/Main/Mine/View/MatchManage/Presenter/XPMatchManagePresenter.m @@ -0,0 +1,50 @@ +// +// XPMatchManagePresenter.m +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import "XPMatchManagePresenter.h" +///Model +#import "XPMineItemModel.h" +///Protocol +#import "XPMatchManageProtocol.h" + +@implementation XPMatchManagePresenter + +- (id)getView { + return ((id) [super getView]); +} + +///获取赛事的items +- (void)getMatchItems { + XPMineItemModel * applyRecordItem = [[XPMineItemModel alloc] init]; + applyRecordItem.itemName = @"报名记录"; + applyRecordItem.itemImageName = @"mine_match_apply_record"; + applyRecordItem.type = XPMineItemType_Match_Apply_Record; + + XPMineItemModel * standingsItem = [[XPMineItemModel alloc] init]; + standingsItem.itemName = @"我的战绩"; + standingsItem.itemImageName = @"mine_match_standings"; + standingsItem.type = XPMineItemType_Match_Standings; + + XPMineItemModel * cardBagItem = [[XPMineItemModel alloc] init]; + cardBagItem.itemName = @"我的卡包"; + cardBagItem.itemImageName = @"mine_match_card_bag"; + cardBagItem.type = XPMineItemType_Match_Card_Bag; + + XPMineItemModel * shoppingItem = [[XPMineItemModel alloc] init]; + shoppingItem.itemName = @"赛事商城"; + shoppingItem.itemImageName = @"mine_match_shopping"; + shoppingItem.type = XPMineItemType_Match_Shopping; + + XPMineItemModel * relevanceItem = [[XPMineItemModel alloc] init]; + relevanceItem.itemName = @"关联账号"; + relevanceItem.itemImageName = @"mine_match_relevance_account"; + relevanceItem.type = XPMineItemType_Match_Relevance_Account; + NSArray * array = @[applyRecordItem, standingsItem, cardBagItem, shoppingItem, relevanceItem]; + [[self getView] onGetMatchItemsSuccess:array]; +} + +@end diff --git a/xplan-ios/Main/Mine/View/MatchManage/Protocol/XPMatchManageProtocol.h b/xplan-ios/Main/Mine/View/MatchManage/Protocol/XPMatchManageProtocol.h new file mode 100644 index 00000000..06b9b30f --- /dev/null +++ b/xplan-ios/Main/Mine/View/MatchManage/Protocol/XPMatchManageProtocol.h @@ -0,0 +1,18 @@ +// +// XPMatchManageProtocol.h +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import + +@class XPMineItemModel; +@protocol XPMatchManageProtocol + +/// 获取赛事模块的items +/// @param matchItems 数据源 +- (void)onGetMatchItemsSuccess:(NSArray *)matchItems; + +@end + diff --git a/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.h b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.h new file mode 100644 index 00000000..100ef1a5 --- /dev/null +++ b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.h @@ -0,0 +1,19 @@ +// +// XPMatchManageTableViewCell.h +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@class XPMineItemModel; +@interface XPMatchManageTableViewCell : UITableViewCell + +@property (nonatomic,strong) XPMineItemModel *itemModel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.m b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.m new file mode 100644 index 00000000..ca09ea2d --- /dev/null +++ b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageTableViewCell.m @@ -0,0 +1,108 @@ +// +// XPMatchManageTableViewCell.m +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import "XPMatchManageTableViewCell.h" +///Third +#import +///Tool +#import "ThemeColor.h" +#import "XPMacro.h" +///Model +#import "XPMineItemModel.h" + +@interface XPMatchManageTableViewCell () +/// +@property (nonatomic,strong) UIStackView *stackView; +///显示图片 +@property (nonatomic,strong) UIImageView *logoImageView; +///显示名字 +@property (nonatomic,strong) UILabel *titleLabel; +///箭头 +@property (nonatomic,strong) UIButton *arrowButton; + +@end + +@implementation XPMatchManageTableViewCell + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + [self initSubViews]; + [self initSubViewConstraints]; + } + return self; +} + +#pragma mark - Private Method +- (void)initSubViews { + self.selectionStyle = UITableViewCellSelectionStyleNone; + self.backgroundColor = [UIColor clearColor]; + [self.contentView addSubview:self.stackView]; + + [self.stackView addArrangedSubview:self.logoImageView]; + [self.stackView addArrangedSubview:self.titleLabel]; + [self.stackView addArrangedSubview:self.arrowButton]; +} + +- (void)initSubViewConstraints { + [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.bottom.mas_equalTo(self.contentView); + make.right.left.mas_equalTo(self.contentView).inset(15); + }]; + + [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(24, 24)); + }]; +} + +#pragma mark - Getters And Setters +- (void)setItemModel:(XPMineItemModel *)itemModel { + _itemModel = itemModel; + if (_itemModel) { + self.logoImageView.image = [UIImage imageNamed:_itemModel.itemImageName]; + self.titleLabel.text = _itemModel.itemName; + } +} + +- (UIStackView *)stackView { + if (!_stackView) { + _stackView = [[UIStackView alloc] init]; + _stackView.axis = UILayoutConstraintAxisHorizontal; + _stackView.distribution = UIStackViewDistributionFill; + _stackView.alignment = UIStackViewAlignmentCenter; + _stackView.spacing = 10; + } + return _stackView; +} + +- (UIImageView *)logoImageView { + if (!_logoImageView) { + _logoImageView = [[UIImageView alloc] init]; + _logoImageView.userInteractionEnabled = YES; + } + return _logoImageView; +} + +- (UILabel *)titleLabel { + if (!_titleLabel) { + _titleLabel = [[UILabel alloc] init]; + _titleLabel.font = [UIFont systemFontOfSize:14]; + _titleLabel.textColor = [ThemeColor mainTextColor]; + } + return _titleLabel; +} + +- (UIButton *)arrowButton { + if (!_arrowButton) { + _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [_arrowButton setImage:[UIImage imageNamed:@"mine_item_arrow"] forState:UIControlStateNormal]; + [_arrowButton setImage:[UIImage imageNamed:@"mine_item_arrow"] forState:UIControlStateSelected]; + [_arrowButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + } + return _arrowButton; +} + +@end diff --git a/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.h b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.h new file mode 100644 index 00000000..347051bc --- /dev/null +++ b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.h @@ -0,0 +1,16 @@ +// +// XPMatchManageViewController.h +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import "MvpViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XPMatchManageViewController : MvpViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.m b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.m new file mode 100644 index 00000000..06a6d948 --- /dev/null +++ b/xplan-ios/Main/Mine/View/MatchManage/View/XPMatchManageViewController.m @@ -0,0 +1,140 @@ +// +// XPMatchManageViewController.m +// xplan-ios +// +// Created by GreenLand on 2022/1/19. +// + +#import "XPMatchManageViewController.h" +///Third +#import +#import +///Tool +#import "XPMacro.h" +#import "XPHtmlUrl.h" +#import "StatisticsServiceHelper.h" +///Model +#import "XPMineItemModel.h" +///P +#import "XPMatchManageProtocol.h" +#import "XPMatchManagePresenter.h" +///View +#import "XPMatchManageTableViewCell.h" +#import "XPWebViewController.h" + +@interface XPMatchManageViewController () + +@property (nonatomic,strong) UITableView *tableView; +///赛事模块的 +@property (nonatomic,strong) NSArray *matchItemArray; + +@end + +@implementation XPMatchManageViewController + +- (XPMatchManagePresenter *)createPresenter { + return [[XPMatchManagePresenter alloc] init];; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + [self initSubViews]; + [self initSubViewConstraints]; +} + +#pragma mark - Private Method +- (void)initSubViews { + self.title = @"赛程管理"; + [self.view addSubview:self.tableView]; + [self.presenter getMatchItems]; + if (@available(iOS 15.0, *)) {//移除iOS15列表头默认增加的22高度 + self.tableView.sectionHeaderTopPadding = 0; + } +} + +- (void)initSubViewConstraints { + [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.view); + make.left.right.bottom.mas_equalTo(self.view); + }]; +} + +#pragma mark - XPMatchManageProtocol +- (void)onGetMatchItemsSuccess:(NSArray *)matchItems { + self.matchItemArray = matchItems; + [self.tableView reloadData]; +} + +#pragma mark - UITableViewDelegate And UITableViewDataSource +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return self.matchItemArray.count; +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { + return 54; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + XPMatchManageTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMatchManageTableViewCell class])]; + if (cell == nil) { + cell = [[XPMatchManageTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMatchManageTableViewCell class])]; + } + XPMineItemModel * item = [self.matchItemArray objectAtIndex:indexPath.row]; + cell.itemModel = item; + return cell; +} + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + [tableView deselectRowAtIndexPath:indexPath animated:YES]; + XPMineItemModel * model = [self.matchItemArray objectAtIndex:indexPath.row]; + [self pushViewControllerWithType:model.type]; +} + +- (void)pushViewControllerWithType:(XPMineItemType)type { + switch (type) { + case XPMineItemType_Match_Apply_Record: + [self pushMatchVCWithKey:@"quotaRecord"]; + break; + case XPMineItemType_Match_Standings: + [self pushMatchVCWithKey:@"performance"]; + break; + case XPMineItemType_Match_Card_Bag: + [self pushMatchVCWithKey:@"bag"]; + break; + case XPMineItemType_Match_Shopping: + [self pushMatchVCWithKey:@"mall"]; + break; + case XPMineItemType_Match_Relevance_Account: + [self pushWebViewWIthUrl:URLWithType(kGameBindAccountURL)]; + break; + default: + break; + } +} + +- (void)pushWebViewWIthUrl:(NSString *)url { + XPWebViewController * webVC = [[XPWebViewController alloc] init]; + webVC.url = url; + [self.navigationController pushViewController:webVC animated:YES]; +} + +- (void)pushMatchVCWithKey:(NSString *)key { + [[FlutterBoost instance] open:key arguments:@{@"animated":@(YES)} completion:^(BOOL success) { + }]; +} + +#pragma mark - Getters And Setters +- (UITableView *)tableView { + if (!_tableView) { + _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; + _tableView.delegate = self; + _tableView.dataSource = self; + _tableView.showsVerticalScrollIndicator = NO; + _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; + [_tableView registerClass:[XPMatchManageTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMatchManageTableViewCell class])]; + _tableView.backgroundColor = [UIColor clearColor]; + } + return _tableView; +} + +@end diff --git a/xplan-ios/Main/Mine/View/SubViews/XPMineAccountView.h b/xplan-ios/Main/Mine/View/SubViews/XPMineAccountView.h deleted file mode 100644 index 2cc35d8d..00000000 --- a/xplan-ios/Main/Mine/View/SubViews/XPMineAccountView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// XPMineAccountView.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@interface XPMineAccountSubView: UIView -///显示名字 -@property (nonatomic,strong) UILabel *titleLabel; -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///免费门票 -@property (nonatomic,strong) UIButton *freeTicketButton; -@end - -@interface XPMineAccountView : UIView -///我的账户 -@property (nonatomic,strong, readonly) XPMineAccountSubView *accountView; -///推荐好友 -@property (nonatomic,strong, readonly) XPMineAccountSubView *recommendView; -@end - -NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m b/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m index 9c4e8349..f901d39c 100644 --- a/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m +++ b/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m @@ -14,7 +14,6 @@ #import "XPMacro.h" #import "UIImage+Utils.h" ///View -#import "XPMineAccountView.h" #import "NetImageView.h" #import "UIImage+Utils.h" #import "XPMineFriendNumberView.h" @@ -41,8 +40,6 @@ @property (nonatomic,strong) UIImageView *sexImageView; ///显示等级 @property (nonatomic,strong) YYLabel *levelLabel; -///我的账户 推荐给好友 -@property (nonatomic,strong) XPMineAccountView *accountView; ///分割线 @property (nonatomic,strong) UIView * lineView; ///关注 @@ -73,18 +70,6 @@ } } -- (void)tapAccountView { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadView:didClickAccount:)]) { - [self.delegate xPMineHeadView:self didClickAccount:self.userInfo]; - } -} - -- (void)tapRecommendView { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadView:didClickInviteFriend:)]) { - [self.delegate xPMineHeadView:self didClickInviteFriend:self.userInfo]; - } -} - - (void)tapFansRecognizer { if (self.delegate && [self.delegate respondsToSelector:@selector(xpMineHeadViewClickFans)]) { [self.delegate xpMineHeadViewClickFans]; @@ -113,7 +98,6 @@ [self addSubview:self.lineView]; [self addSubview:self.attentionView]; [self addSubview:self.fansView]; - [self addSubview:self.accountView]; [self addSubview:self.nobleEntranceView]; [self addSubview:self.nobleImageView]; @@ -125,12 +109,6 @@ UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAvatarImageView)]; [self.avatarImageView addGestureRecognizer:tap]; - - UITapGestureRecognizer * accountTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAccountView)]; - [self.accountView.accountView addGestureRecognizer:accountTap]; - - UITapGestureRecognizer * recommendTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapRecommendView)]; - [self.accountView.recommendView addGestureRecognizer:recommendTap]; } - (void)initSubViewConstraints { @@ -159,7 +137,6 @@ make.left.mas_equalTo(self.nobleImageView); make.top.mas_equalTo(self.idStackView.mas_bottom).offset(4); }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(1, 30)); make.centerY.mas_equalTo(self.idLabel.mas_bottom).offset(2); @@ -176,18 +153,12 @@ make.width.centerY.mas_equalTo(self.attentionView); make.left.mas_equalTo(self.attentionView.mas_right); }]; - - [self.accountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); - make.height.mas_equalTo(60); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(30 + 20); - }]; CGFloat nobleH = (KScreenWidth - 30.0)/ 345.0 * 44; [self.nobleEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.mas_equalTo(self); make.height.mas_equalTo(nobleH); - make.top.mas_equalTo(self.accountView.mas_bottom).offset(12); + make.top.mas_equalTo(self.attentionView.mas_bottom).offset(12); }]; } @@ -490,13 +461,6 @@ return _levelLabel; } -- (XPMineAccountView *)accountView { - if (!_accountView) { - _accountView = [[XPMineAccountView alloc] init]; - } - return _accountView; -} - - (UIView *)lineView { if (!_lineView) { _lineView = [[UIView alloc] init]; diff --git a/xplan-ios/Main/Mine/View/XPMineViewController.m b/xplan-ios/Main/Mine/View/XPMineViewController.m index 32145f5c..ae4fdcf1 100644 --- a/xplan-ios/Main/Mine/View/XPMineViewController.m +++ b/xplan-ios/Main/Mine/View/XPMineViewController.m @@ -22,7 +22,7 @@ #import "XPMinePresent.h" ///View #import "XPMineMenuTableViewCell.h" -#import "XPMineMatchTableViewCell.h" +#import "XPMineHeadItemTableViewCell.h" #import "XPMineHeadView.h" ///VC #import "XPMineSettingViewController.h" @@ -35,14 +35,19 @@ #import "XPMineFansViewController.h" #import "XPMineAttentionViewController.h" #import "XPNobleCenterViewController.h" +#import "XPMatchManageViewController.h" + +@interface XPMineViewController () +///顶部背景 +@property (nonatomic, strong) UIView *bgImageView; -@interface XPMineViewController () -/// @property (nonatomic,strong) UITableView *tableView; ///数据源 @property (nonatomic,strong) NSArray *datasource; ///赛事模块的 @property (nonatomic,strong) NSArray *matchItemArray; +///卡片item +@property (nonatomic, strong) NSArray *cardItemArray; ///头部 @property (nonatomic,strong) XPMineHeadView *headView; ///设置 @@ -82,14 +87,18 @@ #pragma mark - Private Method - (void)initSubViews { + [self.view addSubview:self.bgImageView]; [self.view addSubview:self.tableView]; [self.view addSubview:self.settingButton]; self.tableView.tableHeaderView = self.headView; - [self.presenter getMatchItems]; [self.presenter getNormalItems]; + [self.presenter getCardItems]; } - (void)initSubViewConstraints { + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.top.mas_equalTo(0); + }]; [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.right.mas_equalTo(self.view).offset(-14); @@ -104,6 +113,11 @@ - (void)pushViewControllerWithType:(XPMineItemType)type { switch (type) { + case XPMineItemType_Match_Manage: { + XPMatchManageViewController *vc = [[XPMatchManageViewController alloc] init]; + [self.navigationController pushViewController:vc animated:YES]; + } + break; case XPMineItemType_Match_Apply_Record: [self pushMatchVCWithKey:@"quotaRecord"]; break; @@ -208,7 +222,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section == 0) { - return 180; + return 96; }; return 53; @@ -216,11 +230,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section == 0) { - XPMineMatchTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineMatchTableViewCell class])]; + XPMineHeadItemTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineHeadItemTableViewCell class])]; if (cell == nil) { - cell = [[XPMineMatchTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineMatchTableViewCell class])]; + cell = [[XPMineHeadItemTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineHeadItemTableViewCell class])]; } - cell.datasource = self.matchItemArray; + cell.datasource = self.cardItemArray; cell.delegate = self; return cell; } else { @@ -236,7 +250,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { if (section == 1) { - return 15; + return 0; } return 0; } @@ -285,19 +299,21 @@ [self.tableView reloadData]; } -- (void)onGetMatchItemsSuccess:(NSArray *)matchItems { - self.matchItemArray = matchItems; - [self.tableView reloadData]; +- (void)onGetCardItemsSuccess:(NSArray *)cardItems { + self.cardItemArray = cardItems; + [self.tableView reloadData]; } - (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { self.userInfo = userInfo; self.headView.userInfo = userInfo; } -#pragma mark - XPMineMatchTableViewCellDelegate -- (void)xPMineMatchTableViewCell:(XPMineMatchTableViewCell *)cell didSelectItem:(XPMineItemModel *)item { - [self pushViewControllerWithType:item.type]; + +#pragma mark - XPMineHeadItemTableViewCellDelegate +- (void)xPMineHeadItemTableViewCell:(XPMineHeadItemTableViewCell *)cell didSelectItem:(XPMineItemModel *)item { + [self pushViewControllerWithType:item.type]; } + #pragma mark - Getters And Setters - (UITableView *)tableView { if (!_tableView) { @@ -307,7 +323,7 @@ _tableView.showsVerticalScrollIndicator = NO; _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; [_tableView registerClass:[XPMineMenuTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineMenuTableViewCell class])]; - [_tableView registerClass:[XPMineMatchTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineMatchTableViewCell class])]; + [_tableView registerClass:[XPMineHeadItemTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineHeadItemTableViewCell class])]; _tableView.backgroundColor = [UIColor clearColor]; } return _tableView; @@ -316,7 +332,7 @@ - (XPMineHeadView *)headView { if (!_headView) { CGFloat nobleH = (KScreenWidth - 30.0)/ 345.0 * 44; - _headView = [[XPMineHeadView alloc] initWithFrame:CGRectMake(0, 0,KScreenWidth , 203 + nobleH + kSafeAreaTopHeight)]; + _headView = [[XPMineHeadView alloc] initWithFrame:CGRectMake(0, 0,KScreenWidth , 123 + nobleH + kSafeAreaTopHeight)]; _headView.delegate = self; } return _headView; @@ -333,5 +349,12 @@ return _settingButton; } +- (UIView *)bgImageView { + if (!_bgImageView) { + _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_head_bg"]]; + _bgImageView.contentMode = UIViewContentModeScaleAspectFill; + } + return _bgImageView; +} @end