diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json index 6800072..b39d30d 100644 --- a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -10,12 +10,11 @@ "scale" : "3x" }, { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "Default-568h@2x-4.png", - "minimum-system-version" : "8.0", "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", "scale" : "3x" }, { diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-4.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-4.png deleted file mode 100644 index 2726765..0000000 Binary files a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-4.png and /dev/null differ diff --git a/Ash_AWord/ViewControllers/Main/MainViewController.m b/Ash_AWord/ViewControllers/Main/MainViewController.m index 4639267..6d8edf5 100644 --- a/Ash_AWord/ViewControllers/Main/MainViewController.m +++ b/Ash_AWord/ViewControllers/Main/MainViewController.m @@ -30,7 +30,22 @@ [_messageNav setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"听你说" image:[UIImage imageNamed:@"tabbarVoice-dark"] selectedImage:[UIImage imageNamed:@"tabbarVoiceClick"]]]; - [_myNav setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"我的" image:[UIImage imageNamed:@"tabbarSetup-dark"] selectedImage:[UIImage imageNamed:@"tabbarSetupClick"]]]; + [_myNav setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"我" image:[UIImage imageNamed:@"tabbarSetup-dark"] selectedImage:[UIImage imageNamed:@"tabbarSetupClick"]]]; + }else{ + UITabBarItem* item1 = [[UITabBarItem alloc] init]; + [item1 setFinishedSelectedImage:[UIImage imageNamed:@"tabbarQuotationClick"] withFinishedUnselectedImage:[UIImage imageNamed:@"tabbarQuotation-dark"]]; + item1.title = @"遇见你"; + + _noteNav.tabBarItem = item1; + UITabBarItem* item2 = [[UITabBarItem alloc] init]; + [item2 setFinishedSelectedImage:[UIImage imageNamed:@"tabbarVoiceClick"] withFinishedUnselectedImage:[UIImage imageNamed:@"tabbarVoice-dark"]]; + item2.title = @"听你说"; + + _messageNav.tabBarItem = item2; + UITabBarItem* item3 = [[UITabBarItem alloc] init]; + [item3 setFinishedSelectedImage:[UIImage imageNamed:@"tabbarSetupClick"] withFinishedUnselectedImage:[UIImage imageNamed:@"tabbarSetup-dark"]]; + item3.title = @"我"; + _myNav.tabBarItem = item3; } self.viewControllers = @[_noteNav, _messageNav, _myNav]; diff --git a/Ash_AWord/Views/Message/MessageTableViewCell.xib b/Ash_AWord/Views/Message/MessageTableViewCell.xib index abffa6f..f12b394 100644 --- a/Ash_AWord/Views/Message/MessageTableViewCell.xib +++ b/Ash_AWord/Views/Message/MessageTableViewCell.xib @@ -8,8 +8,8 @@ - - + + @@ -234,7 +234,7 @@ - +