Skip to content

GMBase
GMBase
Commit 187caa31 authored by 乔金柱's avatar 乔金柱
Browse files
Options

Merge branch 'master' into wy/iphonex

parents 502e9a08 2541f44a
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 60 deletions
Example/GMBase.xcodeproj/project.pbxproj
View file @ 187caa31
......@@ -338,14 +338,11 @@
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-GMBase_Example/Pods-GMBase_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/Base64nl/Base64nl.framework",
"${BUILT_PRODUCTS_DIR}/GMBase/GMBase.framework",
"${BUILT_PRODUCTS_DIR}/GMCache/GMCache.framework",
"${BUILT_PRODUCTS_DIR}/GMFoundation/GMFoundation.framework",
"${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework",
"${BUILT_PRODUCTS_DIR}/GMKit/GMKit.framework",
"${BUILT_PRODUCTS_DIR}/GMNetService/GMNetService.framework",
"${BUILT_PRODUCTS_DIR}/GMOCConstant/GMOCConstant.framework",
"${BUILT_PRODUCTS_DIR}/GMPhobos/GMPhobos.framework",
"${BUILT_PRODUCTS_DIR}/GMRefresh/GMRefresh.framework",
"${BUILT_PRODUCTS_DIR}/JSONModel/JSONModel.framework",
......@@ -359,14 +356,11 @@
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Base64nl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMBase.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMCache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMFoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMNetService.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMOCConstant.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMPhobos.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRefresh.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSONModel.framework",
......
Example/Podfile.lock
View file @ 187caa31
......@@ -14,65 +14,65 @@ PODS:
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- Base64nl (1.2)
- GMBase (0.1.7):
- GMBase (0.1.9):
- GMHud
- GMKit
- GMNetService
- GMPhobos
- GMRefresh
- JSONModel (= 1.2.0)
- Masonry (= 1.0.1)
- MBProgressHUD
- UITableView+FDTemplateLayoutCell (= 1.4)
- GMCache (0.1.1):
- GMCache (0.1.2):
- TMCache (~> 2.1.0)
- GMFoundation (0.0.4):
- Base64nl (= 1.2)
- GMHud (0.1.1):
- GMHud (0.1.3):
- MBProgressHUD (= 0.9.2)
- GMKit (0.7.21):
- GMFoundation
- GMKit/Category (= 0.7.21)
- GMKit/FDFullscreenPopGesture (= 0.7.21)
- GMKit/Kit (= 0.7.21)
- GMKit/Protocol (= 0.7.21)
- GMOCConstant
- Masonry (= 1.0.1)
- GMKit (0.7.41):
- GMKit/Category (= 0.7.41)
- GMKit/Color (= 0.7.41)
- GMKit/Constant (= 0.7.41)
- GMKit/FDFullscreenPopGesture (= 0.7.41)
- GMKit/Kit (= 0.7.41)
- GMKit/Protocol (= 0.7.41)
- Masonry (= 1.1.0)
- SDWebImage (= 3.7.6)
- GMKit/Category (0.7.21):
- GMFoundation
- GMOCConstant
- Masonry (= 1.0.1)
- GMKit/Category (0.7.41):
- GMKit/Color (= 0.7.41)
- GMKit/Constant (= 0.7.41)
- GMKit/Protocol (= 0.7.41)
- Masonry (= 1.1.0)
- SDWebImage (= 3.7.6)
- GMKit/FDFullscreenPopGesture (0.7.21):
- GMFoundation
- GMOCConstant
- Masonry (= 1.0.1)
- GMKit/Color (0.7.41):
- Masonry (= 1.1.0)
- SDWebImage (= 3.7.6)
- GMKit/Kit (0.7.21):
- GMFoundation
- GMKit/Category (= 0.7.21)
- GMKit/Protocol (= 0.7.21)
- GMOCConstant
- Masonry (= 1.0.1)
- GMKit/Constant (0.7.41):
- Masonry (= 1.1.0)
- SDWebImage (= 3.7.6)
- GMKit/Protocol (0.7.21):
- GMFoundation
- GMOCConstant
- Masonry (= 1.0.1)
- GMKit/FDFullscreenPopGesture (0.7.41):
- Masonry (= 1.1.0)
- SDWebImage (= 3.7.6)
- GMNetService (0.1.7):
- GMKit/Kit (0.7.41):
- GMKit/Category (= 0.7.41)
- GMKit/Color (= 0.7.41)
- GMKit/Constant (= 0.7.41)
- GMKit/Protocol (= 0.7.41)
- Masonry (= 1.1.0)
- SDWebImage (= 3.7.6)
- GMKit/Protocol (0.7.41):
- Masonry (= 1.1.0)
- SDWebImage (= 3.7.6)
- GMNetService (0.1.9):
- AFNetworking (= 3.1.0)
- GMOCConstant (0.0.3)
- GMPhobos (0.3.3):
- GMPhobos (0.4.9):
- GMCache (~> 0.1.1)
- GMRefresh (0.1.5):
- MJRefresh (~> 3.1.0)
- GMKit
- GMRefresh (0.1.7):
- GMPhobos
- MJRefresh (= 3.1.14)
- JSONModel (1.2.0)
- Masonry (1.0.1)
- Masonry (1.1.0)
- MBProgressHUD (0.9.2)
- MJRefresh (3.1.12)
- MJRefresh (3.1.14)
- SDWebImage (3.7.6):
- SDWebImage/Core (= 3.7.6)
- SDWebImage/Core (3.7.6)
......@@ -88,20 +88,17 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
GMBase: d437cad0290fc877182bb9a2f195db13a6b72556
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMFoundation: 395f1083c40aa38e9fb031726991dbc20247e2f9
GMHud: 67c24abb83777c61e43741d4a803f7b6d8ad4e1e
GMKit: 635bcf6ed413b0393704f006a26b8917086adf31
GMNetService: 1accbf087c6047e38c0b3a7201e9a3f1789c1438
GMOCConstant: 39371248b4d8d54929391bfcd2c5883776436c4b
GMPhobos: c32984b4902cb6dd931a53d647931c2d4fc00a12
GMRefresh: b9f0674b9b14c533ec2586147ea40a833ed5867d
GMBase: 9d09d1f0130b6c4d8554220400034cd09ddcbffc
GMCache: fb0af70b420715ef9519487fdd932a357b3cd8d4
GMHud: 74387462a8b9f099c760a1ddbf493cc86da7cdbc
GMKit: 4820e0eb7727735f88fb2f983f178edd074343c1
GMNetService: 0109b08ccb149b0c0a7a4601ec17930c7d9a8007
GMPhobos: 1ef7d3b51f66e94a26590ba786ca1173187456e0
GMRefresh: 7e176b90fd8d37b0b738c813d71349fd55d86443
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
MJRefresh: 6642e35b3227a5447b9fd5e17c552c90196c9859
SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
UITableView+FDTemplateLayoutCell: 234e1582bcc4e18461af91155123bb96538ed030
......
GMBase.podspec
View file @ 187caa31
Pod::Spec.new do |s|
s.name = 'GMBase'
s.version = '0.1.7'
s.version = '0.2.0'
s.summary = '更美iOS APP 的 Objective-C 基础Pod库'
s.homepage = 'http://git.gengmei.cc/gengmeiios/GMBase'
s.license = '仅限北京更美互动信息科技有限公司内部使用'
......
GMBase/Classes/OCNavigationBar.m
View file @ 187caa31
......@@ -51,7 +51,7 @@
_titleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
_titleLabel.textAlignment = NSTextAlignmentCenter;
_titleLabel.backgroundColor = [UIColor clearColor];
_titleLabel.textColor = HEADLINE_TEXT_COLOR;
_titleLabel.textColor = UIColor.headlineText;
_titleLabel.font = [UIFont navigationFontWithSize:18];
_leftButton = [OCNavigationBarButton buttonWithType:UIButtonTypeCustom];
_rightButton = [OCNavigationBarButton buttonWithType:UIButtonTypeCustom];
......
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