Merge branch 'jinzhu/master' into 'master'

remove getEmptyText



See merge request !7

Example/Podfile.lock

@@ -15,7 +15,7 @@ PODS:
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
   - Base64nl (1.2)
-  - GMBase (0.1.1):
+  - GMBase (0.1.2):
     - GMHud
     - GMKit
     - GMNetService
@@ -89,7 +89,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
-  GMBase: e0c19f076e87b17b1bc68a4ee49da79c5ebc86ac
+  GMBase: 82cc7220ff236b037121074a2d3793e4c780503f
   GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
   GMFoundation: 395f1083c40aa38e9fb031726991dbc20247e2f9
   GMHud: 67c24abb83777c61e43741d4a803f7b6d8ad4e1e

GMBase/Classes/WMBaseCollectionController.h

@@ -45,5 +45,4 @@
 
 - (void)hideNavigationBar;
 - (void)hideEmptyView;
-- (NSString *)getEmptyText;
 @end

GMBase/Classes/WMBaseCollectionController.m

@@ -196,12 +196,4 @@
     [self loadRemoteData];
 }
 
-- (NSString *)getEmptyText{
-    if (self.viewModel.message.length > 0) {
-        return self.viewModel.message;
-    }
-    return @"";
-}
-
-
 @end

GMBase/Classes/WMBaseListViewController.m

@@ -221,10 +221,5 @@
     [self loadRemoteData];
 }
 
-- (NSString *)getEmptyText{
-    if (self.viewModel.message.length > 0) {
-        return self.viewModel.message;
-    }
-    return @"";
-}
+
 @end

GMBase/Classes/WMBaseViewController.h

@@ -31,15 +31,6 @@
 
 - (void)showEmptyView:(GMEmptyViewType)type;
 - (void)hideEmptyView;
-/*!
- *  @author zhaiguojun, 16-06-28
- *
- *  @brief 给子类设置空view的文案
- *
- *  @param text
- *
- *  @since 6.1.0
- */
-- (NSString *)getEmptyText;
+
 - (void)emptyViewDidClickReload;
 @end