diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index 94aa68d9..f9279f4c 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -169,7 +169,6 @@ E824546426F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E824546326F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m */; }; E824546626F5FF6000BE8163 /* XPMineResetPayPasswordProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E824546526F5FF5100BE8163 /* XPMineResetPayPasswordProtocol.h */; }; E8252FEE27687DF1002B3164 /* ActivityInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8252FED27687DF1002B3164 /* ActivityInfoModel.m */; }; - E82D5C6D276ADCE700858D6D /* XPMineDressEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C6C276ADCE700858D6D /* XPMineDressEmptyTableViewCell.m */; }; E82D5C70276AE60000858D6D /* HeadwearModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C6F276AE60000858D6D /* HeadwearModel.m */; }; E82D5C73276AE94800858D6D /* CarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C72276AE94800858D6D /* CarModel.m */; }; E82D5C76276AEB5100858D6D /* NameplateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C75276AEB5100858D6D /* NameplateModel.m */; }; @@ -3106,7 +3105,6 @@ files = ( E8937AC7276C3EDE00B2C7E1 /* svga_member_in_lv40.svga in Resources */, E8A1E461276220DA00B294CA /* candyTree.svga in Resources */, - 189DD53C26DE255600AB55B1 /* LaunchScreen.storyboard in Resources */, E8937AC9276C3EDE00B2C7E1 /* svga_member_in_lv90.svga in Resources */, E8937ACC276C3EDE00B2C7E1 /* svga_member_in_lv80.svga in Resources */, E8937AC8276C3EDE00B2C7E1 /* svga_member_in_lv70.svga in Resources */, @@ -3309,7 +3307,6 @@ 18AAF3F0279EA59300CD7DAD /* MessageContentTextClickable.m in Sources */, E8C6FFCC27548120004DC9F0 /* Api+Home.m in Sources */, 186A534E26FC6ED900D67B2C /* TTPopupService.m in Sources */, - E82D5C6D276ADCE700858D6D /* XPMineDressEmptyTableViewCell.m in Sources */, 18A61BD7274F7F6900A09A54 /* NetImageConfig.m in Sources */, E8C21501274B76F60079E6BF /* XPRoomAnimationHitView.m in Sources */, E8AC722426F47E5E007D6E91 /* XPMineFeedbackViewController.m in Sources */, diff --git a/xplan-ios/Assets.xcassets/Home/home_nav_background.imageset/home_nav_background@3x.png b/xplan-ios/Assets.xcassets/Home/home_nav_background.imageset/home_nav_background@3x.png index 2ab6004c..fbba6b4a 100644 Binary files a/xplan-ios/Assets.xcassets/Home/home_nav_background.imageset/home_nav_background@3x.png and b/xplan-ios/Assets.xcassets/Home/home_nav_background.imageset/home_nav_background@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/Contents.json index 97f641fc..1ada2808 100644 --- a/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/Contents.json +++ b/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "album@2x.png", + "filename" : "mine_setting_permission_album@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "album@3x.png", + "filename" : "mine_setting_permission_album@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/album@2x.png b/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/mine_setting_permission_album@2x.png similarity index 100% rename from xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/album@2x.png rename to xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/mine_setting_permission_album@2x.png diff --git a/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/album@3x.png b/xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/mine_setting_permission_album@3x.png similarity index 100% rename from xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/album@3x.png rename to xplan-ios/Assets.xcassets/Mine/Setting/mine_setting_permission_album.imageset/mine_setting_permission_album@3x.png diff --git a/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m b/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m index 1e547829..9afecb2f 100644 --- a/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m +++ b/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m @@ -106,5 +106,4 @@ } return _rankButton; } - @end