Browse Source

forth commit

sunyue 5 years ago
parent
commit
ae01f35f07

BIN
ACSION.xcworkspace/xcuserdata/sunyue.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 6
ACSION/Main/Module/Home/C/ASHomeViewController.m

18
 static NSString * const kAnnounceCell   = @"ASHomeAnnounceTableViewCell";
18
 static NSString * const kAnnounceCell   = @"ASHomeAnnounceTableViewCell";
19
 static NSString * const kDescCell       = @"ASHomeDescTableViewCell";
19
 static NSString * const kDescCell       = @"ASHomeDescTableViewCell";
20
 
20
 
21
-@interface ASHomeViewController () <UINavigationControllerDelegate,UITableViewDelegate,UITableViewDataSource,ASHomeLoanTableViewCellDelegate>
21
+@interface ASHomeViewController () <UITableViewDelegate,UITableViewDataSource,ASHomeLoanTableViewCellDelegate>
22
 @property(nonatomic, strong) UITableView *tableView;
22
 @property(nonatomic, strong) UITableView *tableView;
23
 @property(nonatomic, strong) ASHomeViewModel *homeViewModel;
23
 @property(nonatomic, strong) ASHomeViewModel *homeViewModel;
24
 @end
24
 @end
29
 
29
 
30
 - (void)viewDidLoad {
30
 - (void)viewDidLoad {
31
     [super viewDidLoad];
31
     [super viewDidLoad];
32
-    self.navigationController.delegate = self;
32
+    self.fd_prefersNavigationBarHidden = YES;
33
     [self initializeUI];
33
     [self initializeUI];
34
     [self requestNoticeList];
34
     [self requestNoticeList];
35
 }
35
 }
143
     return [self.homeViewModel heightForRowAtIndexPath:indexPath];
143
     return [self.homeViewModel heightForRowAtIndexPath:indexPath];
144
 }
144
 }
145
 
145
 
146
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
147
-    [self.navigationController setNavigationBarHidden:[viewController isKindOfClass:[self class]] animated:animated];
148
-}
149
-
150
 #pragma mark - External Delegate Methods
146
 #pragma mark - External Delegate Methods
151
 
147
 
152
 #pragma mark - Target Mehtods
148
 #pragma mark - Target Mehtods

+ 15 - 1
ACSION/我的/Controller/ASPrivateViewController.m

18
 - (void)viewDidLoad {
18
 - (void)viewDidLoad {
19
     [super viewDidLoad];
19
     [super viewDidLoad];
20
     self.title = @"隐私政策";
20
     self.title = @"隐私政策";
21
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
22
+    btn.frame = CGRectMake(0, 0, 44, 44);
23
+    [btn setImage:[UIImage imageNamed:@"back"] forState:UIControlStateNormal];
24
+    [btn setImage:[UIImage imageNamed:@"back"] forState:UIControlStateHighlighted];
25
+    [btn addTarget:self action:@selector(pop) forControlEvents:UIControlEventTouchUpInside];
26
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
21
     UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-kNavBarHeight)];
27
     UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-kNavBarHeight)];
22
     webView.delegate = self;
28
     webView.delegate = self;
23
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
29
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
26
     url = [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
32
     url = [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
27
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
33
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
28
     [webView loadRequest:request];
34
     [webView loadRequest:request];
29
-    
35
+
30
     [self.view addSubview:webView];
36
     [self.view addSubview:webView];
31
     
37
     
32
     [self.view addSubview:self.progressView];
38
     [self.view addSubview:self.progressView];
33
 }
39
 }
34
 
40
 
41
+- (void)pop {
42
+    if (self.presentingViewController) {
43
+        [self dismissViewControllerAnimated:YES completion:nil];
44
+    } else {
45
+        [self.navigationController popViewControllerAnimated:YES];
46
+    }
47
+}
48
+
35
 - (ASProgressView *)progressView {
49
 - (ASProgressView *)progressView {
36
     if (!_progressView) {
50
     if (!_progressView) {
37
         _progressView = [[ASProgressView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 2)];
51
         _progressView = [[ASProgressView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 2)];