Commit ec555e7b authored by 乔金柱's avatar 乔金柱

Merge branch 'zl_base' into 'master'

Zl base

See merge request !25
parents 8c8bda6c 4c6c6f02
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
// 在 initController 中初始化自定义导航栏有很大好处。至少可以保证视图被push之前就可以访问navigationBar,以配置title等属性 // 在 initController 中初始化自定义导航栏有很大好处。至少可以保证视图被push之前就可以访问navigationBar,以配置title等属性
[self customNavigationBar]; [self customNavigationBar];
self.isFirst = 1;
} }
- (void)dealloc{ - (void)dealloc{
...@@ -66,11 +65,6 @@ ...@@ -66,11 +65,6 @@
[self initRefererLink]; [self initRefererLink];
[self initReferrerTabName]; [self initReferrerTabName];
[self setupEmptyView]; [self setupEmptyView];
//从后台进到前台需要将is_first置为0
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(baseViewControllerWillEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
}
- (void)baseViewControllerWillEnterForeground {
self.isFirst = 0;
} }
- (void)setupEmptyView { - (void)setupEmptyView {
_emptyView = [[GMEmptyView alloc] initWithFrame:CGRectZero]; _emptyView = [[GMEmptyView alloc] initWithFrame:CGRectZero];
...@@ -119,7 +113,6 @@ ...@@ -119,7 +113,6 @@
- (void)viewWillDisappear:(BOOL)animated - (void)viewWillDisappear:(BOOL)animated
{ {
[super viewWillDisappear:animated]; [super viewWillDisappear:animated];
self.isFirst = 0;
[[Phobos sharedClient] onPVEnd:self]; [[Phobos sharedClient] onPVEnd:self];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment