Commit cb64de1e authored by jz's avatar jz

present 支持present

parent 4c3523b7
...@@ -269,6 +269,9 @@ ...@@ -269,6 +269,9 @@
LastUpgradeCheck = 0720; LastUpgradeCheck = 0720;
ORGANIZATIONNAME = wangyang; ORGANIZATIONNAME = wangyang;
TargetAttributes = { TargetAttributes = {
6003F589195388D20070C39A = {
DevelopmentTeam = 86R4V3XFLU;
};
6003F5AD195388D20070C39A = { 6003F5AD195388D20070C39A = {
TestTargetID = 6003F589195388D20070C39A; TestTargetID = 6003F589195388D20070C39A;
}; };
...@@ -562,6 +565,7 @@ ...@@ -562,6 +565,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = 86R4V3XFLU;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "GMBase/GMBase-Prefix.pch"; GCC_PREFIX_HEADER = "GMBase/GMBase-Prefix.pch";
INFOPLIST_FILE = "GMBase/GMBase-Info.plist"; INFOPLIST_FILE = "GMBase/GMBase-Info.plist";
...@@ -584,6 +588,7 @@ ...@@ -584,6 +588,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = 86R4V3XFLU;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "GMBase/GMBase-Prefix.pch"; GCC_PREFIX_HEADER = "GMBase/GMBase-Prefix.pch";
INFOPLIST_FILE = "GMBase/GMBase-Info.plist"; INFOPLIST_FILE = "GMBase/GMBase-Info.plist";
......
...@@ -18,7 +18,7 @@ PODS: ...@@ -18,7 +18,7 @@ PODS:
- BDOpenSDKKit (1.0.0) - BDOpenSDKKit (1.0.0)
- DouyinOpenSDK (1.4.1): - DouyinOpenSDK (1.4.1):
- BDOpenSDKKit (~> 1.0.0) - BDOpenSDKKit (~> 1.0.0)
- GMBase (1.2.0): - GMBase (1.2.2):
- GMFoundation - GMFoundation
- GMHud - GMHud
- GMJSONModel - GMJSONModel
...@@ -154,7 +154,7 @@ SPEC CHECKSUMS: ...@@ -154,7 +154,7 @@ SPEC CHECKSUMS:
Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25 Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
BDOpenSDKKit: 3fb530ce73f85a7d6ee69e7fd3d9158444c5bd09 BDOpenSDKKit: 3fb530ce73f85a7d6ee69e7fd3d9158444c5bd09
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
GMBase: 496c965793168fa0aa579d962a768467f36bcb1d GMBase: da7fd8da4aa82a442ce38e9c1373a5ce9ffd63cd
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c
...@@ -176,6 +176,6 @@ SPEC CHECKSUMS: ...@@ -176,6 +176,6 @@ SPEC CHECKSUMS:
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
PODFILE CHECKSUM: 1b114dc329311cb9f6fc222d6307aef289098f91 PODFILE CHECKSUM: 9649bb81da24ce1a9c9ce2ddfe99a23738cbe846
COCOAPODS: 1.9.3 COCOAPODS: 1.9.3
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#import "GMCustomNavigationAnimationProtocol.h" #import "GMCustomNavigationAnimationProtocol.h"
typedef NS_ENUM(NSUInteger, GMCustomAnimationType) {
GMCustomAnimationTypePush,
GMCustomAnimationTypePresent,
};
/// 模拟 presentController 动画 /// 模拟 presentController 动画
/// push 时下往上的位移动画,pop 时从上往下的位移动画 /// push 时下往上的位移动画,pop 时从上往下的位移动画
@interface GMPresentAnimation : NSObject <GMControllerAnimatedTransitioning> @interface GMPresentAnimation : NSObject <GMControllerAnimatedTransitioning>
...@@ -15,4 +19,5 @@ ...@@ -15,4 +19,5 @@
// 当 needMask = YES 时,会一个透明 mask 将 fromVC 与 toVC 隔开。默认为 NO。 // 当 needMask = YES 时,会一个透明 mask 将 fromVC 与 toVC 隔开。默认为 NO。
@property (nonatomic, assign) BOOL needMask; @property (nonatomic, assign) BOOL needMask;
@property (nonatomic, assign) GMCustomAnimationType animationType;
@end @end
...@@ -49,7 +49,11 @@ ...@@ -49,7 +49,11 @@
// 先将toView放置在屏幕下边,为下一步的平移动画做准备 // 先将toView放置在屏幕下边,为下一步的平移动画做准备
CGRect newFrame = toView.frame; CGRect newFrame = toView.frame;
newFrame.origin.y = CGRectGetHeight(bounds); if (self.animationType == GMCustomAnimationTypePresent) {
newFrame.origin.y = CGRectGetHeight(bounds);
} else {
newFrame.origin.x = CGRectGetWidth(bounds);
}
toView.frame = newFrame; toView.frame = newFrame;
// 从下到上的平移动画 // 从下到上的平移动画
......
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