diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png index 3b360bab..bace281c 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png index 890ec019..ea3fdbfb 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/Contents.json deleted file mode 100644 index bee034b0..00000000 --- a/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tab_game_normal@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tab_game_normal@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/tab_game_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/tab_game_normal@2x.png deleted file mode 100644 index 063c1965..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/tab_game_normal@2x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/tab_game_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/tab_game_normal@3x.png deleted file mode 100644 index 54327edf..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_game_normal.imageset/tab_game_normal@3x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/Contents.json deleted file mode 100644 index a69f428f..00000000 --- a/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tab_game_selected@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tab_game_selected@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/tab_game_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/tab_game_selected@2x.png deleted file mode 100644 index 73766365..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/tab_game_selected@2x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/tab_game_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/tab_game_selected@3x.png deleted file mode 100644 index 6471839a..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_game_selected.imageset/tab_game_selected@3x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/Contents.json deleted file mode 100644 index facf88d0..00000000 --- a/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tab_live_normal@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tab_live_normal@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/tab_live_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/tab_live_normal@2x.png deleted file mode 100644 index 3aac4368..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/tab_live_normal@2x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/tab_live_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/tab_live_normal@3x.png deleted file mode 100644 index e5801602..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_live_normal.imageset/tab_live_normal@3x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/Contents.json deleted file mode 100644 index 414ec6ab..00000000 --- a/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tab_live_selected@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tab_live_selected@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/tab_live_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/tab_live_selected@2x.png deleted file mode 100644 index 90af9094..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/tab_live_selected@2x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/tab_live_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/tab_live_selected@3x.png deleted file mode 100644 index f47179b5..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_live_selected.imageset/tab_live_selected@3x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png index 0ca671ef..6da1368a 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png index 95e3d5da..caa0d64d 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png index 72a9f61c..f4ef5e21 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png index 75f1fa95..03935ce0 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png index 5c4c3c19..055c2e7c 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png index 9db7938c..643772f5 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png differ diff --git a/xplan-ios/Main/Tabbar/View/TabbarViewController.m b/xplan-ios/Main/Tabbar/View/TabbarViewController.m index bd4aa6cd..6f49801f 100644 --- a/xplan-ios/Main/Tabbar/View/TabbarViewController.m +++ b/xplan-ios/Main/Tabbar/View/TabbarViewController.m @@ -503,9 +503,9 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; - (void)initTabs:(BOOL)logined { self.viewControllers = nil; - NSArray *normalImageNames = @[@"tab_gameHome_normal",@"tab_monents_normal",@"tab_message_normal", @"tab_mine_normal"]; - NSArray *selectImageNames = @[@"tab_gameHome_normal",@"tab_monents_normal",@"tab_message_normal", @"tab_mine_normal"]; - NSArray *tabLabel = @[@"派对",@"广场",@"消息", @"我的"]; + NSArray *normalImageNames = @[@"tab_gameHome_normal",@"tab_monents_normal",@"tab_message_normal", @"tab_mine_normal"]; + NSArray *selectImageNames = @[@"tab_gameHome_selected",@"tab_monents_select",@"tab_message_selected", @"tab_mine_selected"]; + NSArray *tabLabel = @[@"派对",@"广场",@"消息", @"我的"]; UIViewController *game; UIViewController *msg; @@ -543,8 +543,8 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; itemVc.title = title; itemVc.tabBarItem.image = [[UIImage imageNamed:image] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; itemVc.tabBarItem.selectedImage = [[UIImage imageNamed:selectedImage] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x333333)} forState:UIControlStateSelected]; - [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x999999)} forState:UIControlStateNormal]; + [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[ThemeColor appMainColor]} forState:UIControlStateSelected]; + [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[ThemeColor secondTextColor]} forState:UIControlStateNormal]; itemVc.tabBarItem.titlePositionAdjustment = UIOffsetMake(0, 5); BaseNavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:itemVc]; return nav;