forth commit

ACSION/Main/Module/Home/C/ASHomeViewController.m

@@ -18,7 +18,7 @@ static NSString * const kLoanCell       = @"ASHomeLoanTableViewCell";
 static NSString * const kAnnounceCell   = @"ASHomeAnnounceTableViewCell";
 static NSString * const kDescCell       = @"ASHomeDescTableViewCell";
 
-@interface ASHomeViewController () <UINavigationControllerDelegate,UITableViewDelegate,UITableViewDataSource,ASHomeLoanTableViewCellDelegate>
+@interface ASHomeViewController () <UITableViewDelegate,UITableViewDataSource,ASHomeLoanTableViewCellDelegate>
 @property(nonatomic, strong) UITableView *tableView;
 @property(nonatomic, strong) ASHomeViewModel *homeViewModel;
 @end
@@ -29,7 +29,7 @@ static NSString * const kDescCell       = @"ASHomeDescTableViewCell";
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.navigationController.delegate = self;
+    self.fd_prefersNavigationBarHidden = YES;
     [self initializeUI];
     [self requestNoticeList];
 }
@@ -143,10 +143,6 @@ static NSString * const kDescCell       = @"ASHomeDescTableViewCell";
     return [self.homeViewModel heightForRowAtIndexPath:indexPath];
 }
 
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    [self.navigationController setNavigationBarHidden:[viewController isKindOfClass:[self class]] animated:animated];
-}
-
 #pragma mark - External Delegate Methods
 
 #pragma mark - Target Mehtods

ACSION/我的/Controller/ASPrivateViewController.m

@@ -18,6 +18,12 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = @"隐私政策";
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn.frame = CGRectMake(0, 0, 44, 44);
+    [btn setImage:[UIImage imageNamed:@"back"] forState:UIControlStateNormal];
+    [btn setImage:[UIImage imageNamed:@"back"] forState:UIControlStateHighlighted];
+    [btn addTarget:self action:@selector(pop) forControlEvents:UIControlEventTouchUpInside];
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
     UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-kNavBarHeight)];
     webView.delegate = self;
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
@@ -26,12 +32,20 @@
     url = [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
     [webView loadRequest:request];
-    
+
     [self.view addSubview:webView];
     
     [self.view addSubview:self.progressView];
 }
 
+- (void)pop {
+    if (self.presentingViewController) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    } else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
 - (ASProgressView *)progressView {
     if (!_progressView) {
         _progressView = [[ASProgressView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 2)];