Commit 3ad76ba0 authored by jaguar-bot's avatar jaguar-bot

Bump version to 0.0.9

parent e1fe11cf
...@@ -26,14 +26,14 @@ PODS: ...@@ -26,14 +26,14 @@ PODS:
- TMCache (~> 2.1.0) - TMCache (~> 2.1.0)
- GMNetService (0.1.3): - GMNetService (0.1.3):
- AFNetworking (= 3.1.0) - AFNetworking (= 3.1.0)
- GMPhobos (0.2.10): - GMPhobos (0.2.9):
- GMCache (~> 0.1.0) - GMCache (~> 0.1.0)
- GMRefresh (0.1.3): - GMRefresh (0.1.3):
- MJRefresh (~> 3.1.0) - MJRefresh (~> 3.1.0)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (1.0.1) - Masonry (1.0.1)
- MBProgressHUD (0.9.2) - MBProgressHUD (0.9.2)
- MJRefresh (3.1.9) - MJRefresh (3.1.12)
- TMCache (2.1.0) - TMCache (2.1.0)
- UITableView+FDTemplateLayoutCell (1.4) - UITableView+FDTemplateLayoutCell (1.4)
...@@ -49,12 +49,12 @@ SPEC CHECKSUMS: ...@@ -49,12 +49,12 @@ SPEC CHECKSUMS:
GMBase: a2bc5ffc054605e22ae83a99268efc67a69aeac8 GMBase: a2bc5ffc054605e22ae83a99268efc67a69aeac8
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32 GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32
GMPhobos: f3d01f5cf8e49abbdcbc044571cbe2e82bdd4ff4 GMPhobos: c9a93b2bc8c977820b249c9c615204133358cc09
GMRefresh: a37fb054e758805ec2a6f9b632cf3dc861bb3cf9 GMRefresh: a37fb054e758805ec2a6f9b632cf3dc861bb3cf9
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MJRefresh: c5f1f1653e5a1b932c90f78074f2bc86f3f9bd5e MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
UITableView+FDTemplateLayoutCell: 234e1582bcc4e18461af91155123bb96538ed030 UITableView+FDTemplateLayoutCell: 234e1582bcc4e18461af91155123bb96538ed030
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
- (void)setUserId:(NSInteger)userId; - (void)setUserId:(NSInteger)userId;
/*! /*!
* @author zhaiguojun, 16-05-31 * @author zhaiguojun, 16-05-30
* *
* @brief 用户当前的城市id * @brief 用户当前的城市id
* *
* @param currentCityId * @param currentCityId
* *
* @since 0.2.7 * @since 0.2.5
*/ */
- (void)setCurrentCityId:(NSString *)currentCityId; - (void)setCurrentCityId:(NSString *)currentCityId;
......
...@@ -25,9 +25,13 @@ static NSString *sdkVersion = @"110"; ...@@ -25,9 +25,13 @@ static NSString *sdkVersion = @"110";
@property (strong, nonatomic) NSString *appVersion; @property (strong, nonatomic) NSString *appVersion;
@property (assign, nonatomic) NSInteger userId; @property (assign, nonatomic) NSInteger userId;
@property (assign, nonatomic) BOOL logEnabled; @property (assign, nonatomic) BOOL logEnabled;
@property (strong, nonatomic) NSString *businessId;
@property (strong, nonatomic) NSString *sessionId; @property (strong, nonatomic) NSString *sessionId;
@property (strong, nonatomic) NSString *pageName;
@property (strong, nonatomic) NSString *refererPageName;
@property (strong, nonatomic) NSString *pageEnterTime;
@property (strong, nonatomic) NSString *pageExitTime;
@property (strong, nonatomic) NSMutableDictionary *pageEnterParam; @property (strong, nonatomic) NSMutableDictionary *pageEnterParam;
@end @end
...@@ -225,8 +229,8 @@ static NSString *sdkVersion = @"110"; ...@@ -225,8 +229,8 @@ static NSString *sdkVersion = @"110";
- (void)onPageStart:(NSString *)pageName businessId:(NSString *)businessId referer:(NSString *)refererPageName{ - (void)onPageStart:(NSString *)pageName businessId:(NSString *)businessId referer:(NSString *)refererPageName{
_pageEnterParam = [NSMutableDictionary dictionaryWithObjectsAndKeys: _pageEnterParam = [NSMutableDictionary dictionaryWithObjectsAndKeys:
pageName?:@"",@"page_name", pageName?:@"",@"page_name",
businessId?:@"",@"business_id", self.businessId?:@"",@"business_id",
refererPageName?:@"",@"referer", self.refererPageName?:@"",@"referer",
[self currentTime],@"in",nil]; [self currentTime],@"in",nil];
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@property (assign, nonatomic, getter=isAutomaticallyRefresh) BOOL automaticallyRefresh; @property (assign, nonatomic, getter=isAutomaticallyRefresh) BOOL automaticallyRefresh;
/** 当底部控件出现多少时就自动刷新(默认为1.0,也就是底部控件完全出现时,才会自动刷新) */ /** 当底部控件出现多少时就自动刷新(默认为1.0,也就是底部控件完全出现时,才会自动刷新) */
@property (assign, nonatomic) CGFloat appearencePercentTriggerAutoRefresh MJRefreshDeprecated("请使用automaticallyChangeAlpha属性"); @property (assign, nonatomic) CGFloat appearencePercentTriggerAutoRefresh MJRefreshDeprecated("请使用triggerAutomaticallyRefreshPercent属性");
/** 当底部控件出现多少时就自动刷新(默认为1.0,也就是底部控件完全出现时,才会自动刷新) */ /** 当底部控件出现多少时就自动刷新(默认为1.0,也就是底部控件完全出现时,才会自动刷新) */
@property (assign, nonatomic) CGFloat triggerAutomaticallyRefreshPercent; @property (assign, nonatomic) CGFloat triggerAutomaticallyRefreshPercent;
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
- (void)layoutSubviews - (void)layoutSubviews
{ {
[super layoutSubviews];
[self placeSubviews]; [self placeSubviews];
[super layoutSubviews];
} }
- (void)placeSubviews{} - (void)placeSubviews{}
...@@ -135,6 +135,7 @@ ...@@ -135,6 +135,7 @@
{ {
_state = state; _state = state;
// 加入主队列的目的是等setState:方法调用完毕、设置完文字后再去布局子控件
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[self setNeedsLayout]; [self setNeedsLayout];
}); });
...@@ -151,7 +152,7 @@ ...@@ -151,7 +152,7 @@
if (self.window) { if (self.window) {
self.state = MJRefreshStateRefreshing; self.state = MJRefreshStateRefreshing;
} else { } else {
// 预发当前正在刷新中时调用本方法使得header insert回置失败 // 预防正在刷新中时,调用本方法使得header inset回置失败
if (self.state != MJRefreshStateRefreshing) { if (self.state != MJRefreshStateRefreshing) {
self.state = MJRefreshStateWillRefresh; self.state = MJRefreshStateWillRefresh;
// 刷新(预防从另一个控制器回到这个控制器的情况,回来要重新刷新一下) // 刷新(预防从另一个控制器回到这个控制器的情况,回来要重新刷新一下)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// Copyright © 2016年 小码哥. All rights reserved. // Copyright © 2016年 小码哥. All rights reserved.
// //
#import <Foundation/Foundation.h> #import <UIKit/UIKit.h>
@interface NSBundle (MJRefresh) @interface NSBundle (MJRefresh)
+ (instancetype)mj_refreshBundle; + (instancetype)mj_refreshBundle;
......
...@@ -57,7 +57,7 @@ UIView+MJExtension.h UIView+MJExtension.m ...@@ -57,7 +57,7 @@ UIView+MJExtension.h UIView+MJExtension.m
<img src="http://images0.cnblogs.com/blog2015/497279/201506/141212365041650.png" width="200" height="300"> <img src="http://images0.cnblogs.com/blog2015/497279/201506/141212365041650.png" width="200" height="300">
* More information of App can focus on:[M了个J-博客园](http://www.cnblogs.com/mjios/p/4409853.html) * More information of App can focus on:[M了个J-博客园](http://www.cnblogs.com/mjios/p/4409853.html)
## <a id="The Class Structure Chart of MJRefresh"></a>The Class Structure Chart of MJRefres ## <a id="The Class Structure Chart of MJRefresh"></a>The Class Structure Chart of MJRefresh
![](http://images0.cnblogs.com/blog2015/497279/201506/132232456139177.png) ![](http://images0.cnblogs.com/blog2015/497279/201506/132232456139177.png)
- `The class of red text` in the chart:You can use them directly - `The class of red text` in the chart:You can use them directly
- The drop-down refresh control types - The drop-down refresh control types
......
...@@ -26,14 +26,14 @@ PODS: ...@@ -26,14 +26,14 @@ PODS:
- TMCache (~> 2.1.0) - TMCache (~> 2.1.0)
- GMNetService (0.1.3): - GMNetService (0.1.3):
- AFNetworking (= 3.1.0) - AFNetworking (= 3.1.0)
- GMPhobos (0.2.10): - GMPhobos (0.2.9):
- GMCache (~> 0.1.0) - GMCache (~> 0.1.0)
- GMRefresh (0.1.3): - GMRefresh (0.1.3):
- MJRefresh (~> 3.1.0) - MJRefresh (~> 3.1.0)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (1.0.1) - Masonry (1.0.1)
- MBProgressHUD (0.9.2) - MBProgressHUD (0.9.2)
- MJRefresh (3.1.9) - MJRefresh (3.1.12)
- TMCache (2.1.0) - TMCache (2.1.0)
- UITableView+FDTemplateLayoutCell (1.4) - UITableView+FDTemplateLayoutCell (1.4)
...@@ -49,12 +49,12 @@ SPEC CHECKSUMS: ...@@ -49,12 +49,12 @@ SPEC CHECKSUMS:
GMBase: a2bc5ffc054605e22ae83a99268efc67a69aeac8 GMBase: a2bc5ffc054605e22ae83a99268efc67a69aeac8
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32 GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32
GMPhobos: f3d01f5cf8e49abbdcbc044571cbe2e82bdd4ff4 GMPhobos: c9a93b2bc8c977820b249c9c615204133358cc09
GMRefresh: a37fb054e758805ec2a6f9b632cf3dc861bb3cf9 GMRefresh: a37fb054e758805ec2a6f9b632cf3dc861bb3cf9
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MJRefresh: c5f1f1653e5a1b932c90f78074f2bc86f3f9bd5e MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
UITableView+FDTemplateLayoutCell: 234e1582bcc4e18461af91155123bb96538ed030 UITableView+FDTemplateLayoutCell: 234e1582bcc4e18461af91155123bb96538ed030
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.2.10</string> <string>0.2.9</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.1.9</string> <string>3.1.12</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'GMBase' s.name = 'GMBase'
s.version = '0.0.8' s.version = '0.0.9'
s.summary = '更美iOS APP 的 Objective-C 基础Pod库' s.summary = '更美iOS APP 的 Objective-C 基础Pod库'
s.homepage = 'http://git.gengmei.cc/gengmeiios/GMBase' s.homepage = 'http://git.gengmei.cc/gengmeiios/GMBase'
s.license = '仅限北京更美互动信息科技有限公司内部使用' s.license = '仅限北京更美互动信息科技有限公司内部使用'
......
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