Merge branch 'master' into wy/present

Example/Podfile.lock

@@ -14,7 +14,7 @@ PODS:
   - AFNetworking/Serialization (3.1.0)
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
-  - GMBase (1.1.3):
+  - GMBase (1.1.4):
     - GMHud
     - GMJSONModel
     - GMKit
@@ -65,7 +65,7 @@ PODS:
     - SDWebImage
   - GMNetService (1.0.2):
     - AFNetworking (= 3.1.0)
-  - GMPhobos (1.3.0):
+  - GMPhobos (1.3.5):
     - GMCache
     - GMKit
   - GMRefresh (1.0.2):
@@ -104,13 +104,13 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  GMBase: ff1e574f4655b0e6bc7bb16f3e45e186d1f85537
+  GMBase: aa92f9e566cc5807d1c1439d3e8c588b5b413a7e
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
   GMHud: 45aa755b72a65f89d810430336803086359c0fb1
   GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
   GMKit: 11c9ab9a317f381a05b0e1e577dd95a495625edf
   GMNetService: 7c69e7981b4fac29657fad5fc86a0c453196b862
-  GMPhobos: 7aec8c5025c2f67798a46fb1570e5ebb4ebfd06a
+  GMPhobos: 1e2d68c456b69bf156276d7242877498107474db
   GMRefresh: 9d2c521e3d49b68d3c736fb138a87fae4adb05f9
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1

GMBase.podspec

 Pod::Spec.new do |s|
     s.name             = 'GMBase'
-    s.version          = '1.1.4'
+    s.version          = '1.1.5'
     s.summary          = '更美iOS APP 的 Objective-C 基础Pod库'
     s.homepage         = 'http://git.wanmeizhensuo.com/gengmeiios/GMBase'
     s.license          = '仅限北京更美互动信息科技有限公司内部使用'

GMBase/Classes/WMFetchDataViewModel+GMRequest.h

+//
+//  WMFetchDataViewModel+GMRequest.h
+//  Gengmei
+//
+//  Created by 汪俊 on 2017/7/13.
+//  Copyright © 2017年 更美互动信息科技有限公司. All rights reserved.
+//
+
+#import "WMFetchDataViewModel.h"
+
+@interface WMFetchDataViewModel (GMRequest)
+
+/**
+ 因为这个是拼在url query中，所以后端给我们时，我们不需求关心它是NSNumber或者是String类型，原样传回去就可以
+ 
+ 但其实在get方法的确是返回了String类型，因为这样便于清空offset，及对offset进行判断
+ 
+ 未来offset会集成到FetchDataViewModel
+ */
+@property (nonatomic, strong) id offset;
+@end

GMBase/Classes/WMFetchDataViewModel+GMRequest.m

+//
+//  WMFetchDataViewModel+GMRequest.m
+//  Gengmei
+//
+//  Created by 汪俊 on 2017/7/13.
+//  Copyright © 2017年 更美互动信息科技有限公司. All rights reserved.
+//
+
+#import "WMFetchDataViewModel+GMRequest.h"
+#import <objc/runtime.h>
+
+@implementation WMFetchDataViewModel (GMRequest)
+
+- (void)setOffset:(id)offset {
+    objc_setAssociatedObject(self, @selector(offset), offset, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+- (id)offset {
+    id _offset = objc_getAssociatedObject(self, @selector(offset));
+    if (_offset == nil) {
+        return @"";
+    }
+
+    if ([_offset isKindOfClass:[NSNumber class]]) {
+        return [_offset stringValue];
+    }
+
+    return _offset;
+}
+
+@end

fastlane/report.xml

@@ -5,27 +5,57 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.005447">
+      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.005779">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.001089">
+      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.001067">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: git_pull" time="1.404177">
+      <testcase classname="fastlane.lanes" name="02: git_pull" time="1.124838">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: pod_repo_update" time="0.897675">
+      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="0.949571">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="17.673413">
+      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="17.807304">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.00348">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.021413">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.012612">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="0.879309">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="09: pod_push" time="31.951709">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="1.114873">
         
       </testcase>