Commit cc5f889c authored by 汪洋's avatar 汪洋

适配Phobos

parent 8c4ac2b6
......@@ -15,7 +15,7 @@ PODS:
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- Base64nl (1.2)
- GMBase (0.0.15):
- GMBase (0.0.16):
- GMNetService
- GMPhobos
- GMRefresh
......@@ -60,7 +60,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
GMBase: 17cb77aabaea020c2b59346b3c87c592a166e200
GMBase: 7a22545432ae10d4fe954fd4f2fc9a251bb8da5e
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMFoundation: 08b2e6e12c211ed37aa5dce3588f645a133b9165
GMKit: 04a30d67c6b5468f07c8d9f60d0f8b12dd90b162
......
{
"name": "GMBase",
"version": "0.0.15",
"version": "0.0.16",
"summary": "更美iOS APP 的 Objective-C 基础Pod库",
"homepage": "http://git.gengmei.cc/gengmeiios/GMBase",
"license": "仅限北京更美互动信息科技有限公司内部使用",
......@@ -9,7 +9,7 @@
},
"source": {
"git": "git@git.gengmei.cc:gengmeiios/GMBase.git",
"tag": "0.0.15"
"tag": "0.0.16"
},
"platforms": {
"ios": "8.0"
......
......@@ -15,7 +15,7 @@ PODS:
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- Base64nl (1.2)
- GMBase (0.0.15):
- GMBase (0.0.16):
- GMNetService
- GMPhobos
- GMRefresh
......@@ -60,7 +60,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
GMBase: 17cb77aabaea020c2b59346b3c87c592a166e200
GMBase: 7a22545432ae10d4fe954fd4f2fc9a251bb8da5e
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMFoundation: 08b2e6e12c211ed37aa5dce3588f645a133b9165
GMKit: 04a30d67c6b5468f07c8d9f60d0f8b12dd90b162
......
This diff is collapsed.
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.0.15</string>
<string>0.0.16</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -14,7 +14,7 @@
</dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2011&#8211;2016 Alamofire Software Foundation (http://alamofire.org/)
<string>Copyright (c) 20112016 Alamofire Software Foundation (http://alamofire.org/)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......@@ -96,7 +96,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
</string>
<key>License</key>
<string>&#20165;&#38480;&#21271;&#20140;&#26356;&#32654;&#20114;&#21160;&#20449;&#24687;&#31185;&#25216;&#26377;&#38480;&#20844;&#21496;&#20869;&#37096;&#20351;&#29992;</string>
<string>仅限北京更美互动信息科技有限公司内部使用</string>
<key>Title</key>
<string>GMBase</string>
<key>Type</key>
......@@ -162,12 +162,12 @@ THE SOFTWARE.
</dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2016 &#21271;&#20140;&#26356;&#32654;&#20114;&#21160;&#20449;&#24687;&#31185;&#25216;&#26377;&#38480;&#20844;&#21496;
<string>Copyright (c) 2016 北京更美互动信息科技有限公司
&#20165;&#38480;&#21271;&#20140;&#26356;&#32654;&#20114;&#21160;&#20449;&#24687;&#31185;&#25216;&#26377;&#38480;&#20844;&#21496;&#20869;&#37096;&#20351;&#29992;
仅限北京更美互动信息科技有限公司内部使用
</string>
<key>License</key>
<string>&#20165;&#38480;&#21271;&#20140;&#26356;&#32654;&#20114;&#21160;&#20449;&#24687;&#31185;&#25216;&#26377;&#38480;&#20844;&#21496;&#20869;&#37096;&#20351;&#29992;</string>
<string>仅限北京更美互动信息科技有限公司内部使用</string>
<key>Title</key>
<string>GMKit</string>
<key>Type</key>
......
......@@ -8,7 +8,6 @@
#import "WMBaseViewController.h"
#import "GMBaseUtil.h"
#import <GMPhobos/UIViewController+Phobos.h>
@interface WMBaseViewController () {
}
......@@ -92,9 +91,7 @@
// 导航栏隐藏在 viewWillAppear 里控制的原因是在viewDidLoad时,有可能 navigationController 与 self 并没有关系
self.navigationController.navigationBarHidden = YES;
[self setUpInTime];
[self setReferer:nil];
[[Phobos sharedClient] onPageStart:self.pageName businessId:self.businessId referer:self.referer inTime:self.inTime];
[[Phobos sharedClient] onPVStart:self];
}
- (void)viewWillDisappear:(BOOL)animated
......@@ -106,21 +103,13 @@
[self setHidesBottomBarWhenPushed:NO];
}
if (self.pageName.length > 0) {
[[Phobos sharedClient] onPageEnd:self.pageName businessId:self.businessId referer:self.referer inTime:self.inTime referrerId: self.referrerId];
}
[[Phobos sharedClient] onPVEnd:self];
}
- (UIStatusBarStyle)preferredStatusBarStyle{
return UIStatusBarStyleDefault;
}
- (void)setUpInTime {
NSDate *date = [NSDate date];
NSTimeInterval interval = [date timeIntervalSince1970];
NSString *timeIntervalStr = [NSString stringWithFormat:@"%ld",(long)interval];
self.inTime = timeIntervalStr;
}
#pragma mark - 导航
- (void)customNavigationBar {
_navigationBar = [[OCNavigatioinBar alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 64)];
......
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