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 bace281c..845f8450 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 ea3fdbfb..28a4362c 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_gameHome_selected.imageset/tab_gameHome_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@2x.png index ce856d78..5fef21ec 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png index 0cd8f889..61069c78 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png 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 6da1368a..12879746 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 caa0d64d..b59c8795 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_message_selected.imageset/tab_message_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@2x.png index 1a5545f7..06657ff0 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@3x.png index e43631f8..8da7a466 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@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 f4ef5e21..318b8bb4 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 03935ce0..0081187a 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_mine_selected.imageset/tab_mine_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@2x.png index 2da779e4..f3694c5d 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@3x.png index 5410092c..2b4092f8 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@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 055c2e7c..6cd4c59b 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 643772f5..d59d0479 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/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png index 55a938aa..462e3555 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png index 6732caaa..6e08421c 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/Contents.json new file mode 100644 index 00000000..c018c9aa --- /dev/null +++ b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tab_party_normal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tab_party_normal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@2x.png new file mode 100644 index 00000000..7458a2c4 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@3x.png new file mode 100644 index 00000000..0804c669 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/Contents.json new file mode 100644 index 00000000..5f73162f --- /dev/null +++ b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tab_party_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tab_party_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@2x.png new file mode 100644 index 00000000..9f8e27aa Binary files /dev/null and b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@3x.png new file mode 100644 index 00000000..3d88bc56 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@3x.png differ diff --git a/xplan-ios/Main/Tabbar/View/TabbarViewController.m b/xplan-ios/Main/Tabbar/View/TabbarViewController.m index ca66903f..d9bbf0c7 100644 --- a/xplan-ios/Main/Tabbar/View/TabbarViewController.m +++ b/xplan-ios/Main/Tabbar/View/TabbarViewController.m @@ -504,11 +504,11 @@ 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_selected",@"tab_monents_select",@"tab_message_selected", @"tab_mine_selected"]; - NSArray *tabLabel = @[@"派对",@"广场",@"消息", @"我的"]; + NSArray *normalImageNames = @[@"tab_gameHome_normal",@"tab_party_normal",@"tab_monents_normal",@"tab_message_normal", @"tab_mine_normal"]; + NSArray *selectImageNames = @[@"tab_gameHome_selected",@"tab_party_selected",@"tab_monents_select",@"tab_message_selected", @"tab_mine_selected"]; + NSArray *tabLabel = @[@"首页",@"派对",@"动态",@"消息", @"我的"]; - UIViewController *game; + UIViewController *party; UIViewController *msg; UIViewController *me; UIViewController * home; @@ -522,22 +522,23 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; #endif msg = [[SessionListViewController alloc] init]; me = [[XPMineViewController alloc] init]; - + party = [[BaseViewController alloc]init]; // home = [[XPHomeViewController alloc] init]; home = [[XPNewHomeViewController alloc] init]; monents = [[XPMonentsViewController alloc] init]; } else { - game = [[BaseViewController alloc]init]; + party = [[BaseViewController alloc]init]; msg = [[SessionListViewController alloc]init]; me = [[BaseViewController alloc]init]; home = [[BaseViewController alloc] init]; monents = [[BaseViewController alloc] init]; } [self createTabBarItem:home title:tabLabel[0] image:normalImageNames[0] selectedImage:selectImageNames[0]]; - [self createTabBarItem:monents title:tabLabel[1] image:normalImageNames[1] selectedImage:selectImageNames[1]]; - [self createTabBarItem:msg title:tabLabel[2] image:normalImageNames[2] selectedImage:selectImageNames[2]]; - [self createTabBarItem:me title:tabLabel[3] image:normalImageNames[3] selectedImage:selectImageNames[3]]; - self.viewControllers = @[home,monents,msg,me]; + [self createTabBarItem:party title:tabLabel[1] image:normalImageNames[1] selectedImage:selectImageNames[1]]; + [self createTabBarItem:monents title:tabLabel[2] image:normalImageNames[2] selectedImage:selectImageNames[2]]; + [self createTabBarItem:msg title:tabLabel[3] image:normalImageNames[3] selectedImage:selectImageNames[3]]; + [self createTabBarItem:me title:tabLabel[4] image:normalImageNames[4] selectedImage:selectImageNames[4]]; + self.viewControllers = @[home,party,monents,msg,me]; self.selectedIndex = 0; } @@ -545,8 +546,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:[ThemeColor appMainColor]} forState:UIControlStateSelected]; - [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[ThemeColor secondTextColor]} forState:UIControlStateNormal]; + [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[ThemeColor mainTextColor]} forState:UIControlStateSelected]; + [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[ThemeColor textThirdColor]} forState:UIControlStateNormal]; BaseNavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:itemVc]; return nav; }