Merge branch 'zl_base' into 'master'

暂提

See merge request !23

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 => '7e58199898627699373ad6a9f87b875ab04b0927'
+  pod 'GMPhobos',  :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => '3254171eaae5e7c12252aee28f550d163b7be006'
   target 'GMBase_Tests' do
     inherit! :search_paths
 

Example/Podfile.lock

@@ -22,7 +22,7 @@ PODS:
     - EVReflection/Core (= 5.10.0)
   - EVReflection/Core (5.10.0)
   - GM-Swift-Observable (4.0.1)
-  - GMBase (1.1.5):
+  - GMBase (1.1.7):
     - GMBaseSwift
     - GMFoundation
     - GMHud
@@ -95,7 +95,7 @@ PODS:
     - AFNetworking (= 3.1.0)
   - GMNetworking (4.0.7):
     - Alamofire (= 4.7.0)
-  - GMPhobos (2.0.4):
+  - GMPhobos (2.0.7):
     - GMCache
     - MagicalRecord
     - MJExtension
@@ -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 `7e58199898627699373ad6a9f87b875ab04b0927`)"
+  - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `3254171eaae5e7c12252aee28f550d163b7be006`)"
   - 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: 7e58199898627699373ad6a9f87b875ab04b0927
+    :commit: 3254171eaae5e7c12252aee28f550d163b7be006
     :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: 7e58199898627699373ad6a9f87b875ab04b0927
+    :commit: 3254171eaae5e7c12252aee28f550d163b7be006
     :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
 
 SPEC CHECKSUMS:
@@ -190,7 +190,7 @@ SPEC CHECKSUMS:
   DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
   EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
   GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
-  GMBase: 619ccdcdab926793d179662214b89f937029fee7
+  GMBase: 84fe92e736ccf8e49435a93e2b4153c9e80eab2a
   GMBaseSwift: fb846fbbfd7c6fb82af2909b0d730edfdc572ba6
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
   GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
@@ -199,7 +199,7 @@ SPEC CHECKSUMS:
   GMKit: ff2a77a9b85e13b4de333ec5eeb10b1ffef09756
   GMNetService: 7c69e7981b4fac29657fad5fc86a0c453196b862
   GMNetworking: 592b9b71f2a7d92203483276158ce3139ac789d2
-  GMPhobos: c09920b4a726363b902c2f14ba64e1ee1620d0e2
+  GMPhobos: 115e2608cdebcccf445bf95766fee25a4b62153d
   GMRefresh: c01ff8de5ada92e1362602fb6991f99124b7dbe3
   GMShareSDK: a0725e2848d043aec84e787f6d233ac1546c1661
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
@@ -214,6 +214,6 @@ SPEC CHECKSUMS:
   WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
   Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
 
-PODFILE CHECKSUM: faf86c6bf49a2950d2c920316609ef26dc4389c2
+PODFILE CHECKSUM: 801921fb5ef522c632196dbf23bacb65e3e715e7
 
 COCOAPODS: 1.9.3

GMBase/Classes/WMBaseViewController.m

@@ -46,6 +46,8 @@
     self.controlNavigationByYou = NO;
     // 在 initController 中初始化自定义导航栏有很大好处。至少可以保证视图被push之前就可以访问navigationBar，以配置title等属性
     [self customNavigationBar];
+    
+    self.isFirst = 1;
 }
 
 - (void)dealloc{
@@ -113,6 +115,7 @@
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
+    self.isFirst = 0;
     [[Phobos sharedClient] onPVEnd:self];
 }