Merge branch 'zl_base' into 'master'

Zl base

See merge request !24

Example/Podfile

@@ -14,7 +14,7 @@ target 'GMBase_Example' do
 #  pod 'GMBaseSwift', :path => '../../GMBaseSwift'
 pod 'GMBaseSwift', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git', :commit => '116868d'
 
-  pod 'GMPhobos',  :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => '3254171eaae5e7c12252aee28f550d163b7be006'
+  pod 'GMPhobos',  :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => '2fc748a4f501d350f5a75dff23fc33952e7a2f95'
   target 'GMBase_Tests' do
     inherit! :search_paths
 

Example/Podfile.lock

@@ -131,7 +131,7 @@ PODS:
 DEPENDENCIES:
   - GMBase (from `../`)
   - "GMBaseSwift (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git`, commit `116868d`)"
-  - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `3254171eaae5e7c12252aee28f550d163b7be006`)"
+  - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `2fc748a4f501d350f5a75dff23fc33952e7a2f95`)"
   - GMShareSDK (= 0.2.1)
   - SnapKit (= 4.0.0)
 
@@ -172,7 +172,7 @@ EXTERNAL SOURCES:
     :commit: 116868d
     :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
   GMPhobos:
-    :commit: 3254171eaae5e7c12252aee28f550d163b7be006
+    :commit: 2fc748a4f501d350f5a75dff23fc33952e7a2f95
     :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
 
 CHECKOUT OPTIONS:
@@ -180,7 +180,7 @@ CHECKOUT OPTIONS:
     :commit: 116868d
     :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
   GMPhobos:
-    :commit: 3254171eaae5e7c12252aee28f550d163b7be006
+    :commit: 2fc748a4f501d350f5a75dff23fc33952e7a2f95
     :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
 
 SPEC CHECKSUMS:
@@ -214,6 +214,6 @@ SPEC CHECKSUMS:
   WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
   Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
 
-PODFILE CHECKSUM: 801921fb5ef522c632196dbf23bacb65e3e715e7
+PODFILE CHECKSUM: 6ac1e6d23702f1381ddc1b0064ddfa7267a6141e
 
 COCOAPODS: 1.9.3

GMBase/Classes/WMBaseViewController.m

@@ -66,8 +66,12 @@
     [self initRefererLink];
     [self initReferrerTabName];
     [self setupEmptyView];
+    //从后台进到前台需要将is_first置为0
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(baseViewControllerWillEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
+}
+- (void)baseViewControllerWillEnterForeground {
+    self.isFirst = 0;
 }
-
 - (void)setupEmptyView {
     _emptyView = [[GMEmptyView alloc] initWithFrame:CGRectZero];
     _emptyView.hidden = YES;