Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
GMBase
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
GMBase
Commits
cb64de1e
Commit
cb64de1e
authored
Sep 04, 2020
by
jz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
present 支持present
parent
4c3523b7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
4 deletions
+18
-4
project.pbxproj
Example/GMBase.xcodeproj/project.pbxproj
+5
-0
Podfile.lock
Example/Podfile.lock
+3
-3
GMPresentAnimation.h
GMBase/Classes/GMPresentAnimation.h
+5
-0
GMPresentAnimation.m
GMBase/Classes/GMPresentAnimation.m
+5
-1
No files found.
Example/GMBase.xcodeproj/project.pbxproj
View file @
cb64de1e
...
...
@@ -269,6 +269,9 @@
LastUpgradeCheck
=
0720
;
ORGANIZATIONNAME
=
wangyang
;
TargetAttributes
=
{
6003F589195388D20070C39A
=
{
DevelopmentTeam
=
86R4V3XFLU
;
};
6003F5AD195388D20070C39A
=
{
TestTargetID
=
6003F589195388D20070C39A
;
};
...
...
@@ -562,6 +565,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
LaunchImage
;
CLANG_ENABLE_MODULES
=
YES
;
DEVELOPMENT_TEAM
=
86R4V3XFLU
;
GCC_PRECOMPILE_PREFIX_HEADER
=
YES
;
GCC_PREFIX_HEADER
=
"GMBase/GMBase-Prefix.pch"
;
INFOPLIST_FILE
=
"GMBase/GMBase-Info.plist"
;
...
...
@@ -584,6 +588,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
LaunchImage
;
CLANG_ENABLE_MODULES
=
YES
;
DEVELOPMENT_TEAM
=
86R4V3XFLU
;
GCC_PRECOMPILE_PREFIX_HEADER
=
YES
;
GCC_PREFIX_HEADER
=
"GMBase/GMBase-Prefix.pch"
;
INFOPLIST_FILE
=
"GMBase/GMBase-Info.plist"
;
...
...
Example/Podfile.lock
View file @
cb64de1e
...
...
@@ -18,7 +18,7 @@ PODS:
- BDOpenSDKKit (1.0.0)
- DouyinOpenSDK (1.4.1):
- BDOpenSDKKit (~> 1.0.0)
- GMBase (1.2.
0
):
- GMBase (1.2.
2
):
- GMFoundation
- GMHud
- GMJSONModel
...
...
@@ -154,7 +154,7 @@ SPEC CHECKSUMS:
Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
BDOpenSDKKit: 3fb530ce73f85a7d6ee69e7fd3d9158444c5bd09
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
GMBase:
496c965793168fa0aa579d962a768467f36bcb1
d
GMBase:
da7fd8da4aa82a442ce38e9c1373a5ce9ffd63c
d
GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c
...
...
@@ -176,6 +176,6 @@ SPEC CHECKSUMS:
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
PODFILE CHECKSUM:
1b114dc329311cb9f6fc222d6307aef289098f91
PODFILE CHECKSUM:
9649bb81da24ce1a9c9ce2ddfe99a23738cbe846
COCOAPODS: 1.9.3
GMBase/Classes/GMPresentAnimation.h
View file @
cb64de1e
...
...
@@ -8,6 +8,10 @@
#import "GMCustomNavigationAnimationProtocol.h"
typedef
NS_ENUM
(
NSUInteger
,
GMCustomAnimationType
)
{
GMCustomAnimationTypePush
,
GMCustomAnimationTypePresent
,
};
/// 模拟 presentController 动画
/// push 时下往上的位移动画,pop 时从上往下的位移动画
@interface
GMPresentAnimation
:
NSObject
<
GMControllerAnimatedTransitioning
>
...
...
@@ -15,4 +19,5 @@
// 当 needMask = YES 时,会一个透明 mask 将 fromVC 与 toVC 隔开。默认为 NO。
@property
(
nonatomic
,
assign
)
BOOL
needMask
;
@property
(
nonatomic
,
assign
)
GMCustomAnimationType
animationType
;
@end
GMBase/Classes/GMPresentAnimation.m
View file @
cb64de1e
...
...
@@ -49,7 +49,11 @@
// 先将toView放置在屏幕下边,为下一步的平移动画做准备
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
;
// 从下到上的平移动画
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment