底部导航栏完善，顶部导航栏增加图标

tangthis · tangthis · commit dd464aadee67 · 2015-10-20T22:07:08.000+08:00
diff --git a/NewsReader.xcodeproj/project.xcworkspace/xcuserdata/tangyouhuan.xcuserdatad/UserInterfaceState.xcuserstate b/NewsReader.xcodeproj/project.xcworkspace/xcuserdata/tangyouhuan.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/NewsReader/Model/PageInfo.m b/NewsReader/Model/PageInfo.m
@@ -55,7 +55,7 @@ + (NSArray *)pageControllers
         nav = [[UINavigationController alloc]initWithRootViewController:pageController];
         pageController.title = pageInfo.name;
         pageController.tabBarItem.image = [UIImage imageNamed:pageInfo.image];
-        [controllers addObject:pageController];
+        [controllers addObject:nav];
     }
     return controllers;
 }
diff --git a/NewsReader/ViewController/BaseController.m b/NewsReader/ViewController/BaseController.m
@@ -14,6 +14,9 @@ @implementation BaseController
 -(void)viewDidLoad
 {
     [super viewDidLoad];
+    [self setNavigationLeft:@"NavigationBell.png" sel:nil];
+    [self setNavigationRight:@"NavigationSquare.png"];
+    //[self setNavigationTitleImage:@"NavBarIcon.png"];
 }
 
 -(void)viewWillAppear:(BOOL)animated
@@ -89,6 +92,14 @@ - (UIButton *)customButton:(NSString *)imageName
     return btn;
 }
 
+- (void)setNavigationTitleImage:(NSString *)imageName
+{
+    UIImage *image = [UIImage imageNamed:imageName];
+    UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
+    
+    self.navigationItem.titleView = imageView;
+}
+
 - (void)setNavigationLeft:(NSString *)imageName sel:(SEL)sel
 {
     UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithCustomView:[self customButton:imageName selector:sel]];
diff --git a/NewsReader/ViewController/Page/NewsPage.m b/NewsReader/ViewController/Page/NewsPage.m
@@ -10,4 +10,8 @@
 
 @implementation NewsPage
 
+-(void)viewDidLoad
+{
+    [super viewDidLoad];
+}
 @end
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ NewsReader -- 新闻App
 > * 登录功能实现
 > * 显示广告
 > * 设置状态栏
+> * 设置底部导航栏
 
 ###MVVM架构
 Model:DTO(数据传输对象)<br/>

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ + (NSArray *)pageControllers`
`55`	`55`	`nav = [[UINavigationController alloc]initWithRootViewController:pageController];`
`56`	`56`	`pageController.title = pageInfo.name;`
`57`	`57`	`pageController.tabBarItem.image = [UIImage imageNamed:pageInfo.image];`
`58`		`- [controllers addObject:pageController];`
	`58`	`+ [controllers addObject:nav];`
`59`	`59`	`}`
`60`	`60`	`return controllers;`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ @implementation BaseController`
`14`	`14`	`-(void)viewDidLoad`
`15`	`15`	`{`
`16`	`16`	`[super viewDidLoad];`
	`17`	`+ [self setNavigationLeft:@"NavigationBell.png" sel:nil];`
	`18`	`+ [self setNavigationRight:@"NavigationSquare.png"];`
	`19`	`+ //[self setNavigationTitleImage:@"NavBarIcon.png"];`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`-(void)viewWillAppear:(BOOL)animated`
`@@ -89,6 +92,14 @@ - (UIButton )customButton:(NSString )imageName`
`89`	`92`	`return btn;`
`90`	`93`	`}`
`91`	`94`
	`95`	`+- (void)setNavigationTitleImage:(NSString *)imageName`
	`96`	`+{`
	`97`	`+ UIImage *image = [UIImage imageNamed:imageName];`
	`98`	`+ UIImageView *imageView = [[UIImageView alloc] initWithImage:image];`
	`99`	`+`
	`100`	`+ self.navigationItem.titleView = imageView;`
	`101`	`+}`
	`102`	`+`
`92`	`103`	`- (void)setNavigationLeft:(NSString *)imageName sel:(SEL)sel`
`93`	`104`	`{`
`94`	`105`	`UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithCustomView:[self customButton:imageName selector:sel]];`