。。。动画

wanghengheng · wanghengheng · commit 08eb04ddecc9 · 2015-07-09T15:13:47.000+08:00
diff --git a/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m
@@ -234,7 +234,7 @@ -(void)addItemClicked:(id)sender{
                 break;
         }
     };
-    [_myPopMenu showMenuAtView:kKeyWindow startPoint:CGPointMake(0, -100) endPoint:CGPointMake(0, kScreen_Height +100)];
+    [_myPopMenu showMenuAtView:kKeyWindow startPoint:CGPointMake(0, -100) endPoint:CGPointMake(0, -100)];
     
 //    if ([KxMenu isShowingInView:self.view]) {
 //        [KxMenu dismissMenu:YES];
diff --git a/Coding_iOS/Vendor/PopMenu/PopMenu.m b/Coding_iOS/Vendor/PopMenu/PopMenu.m
@@ -14,7 +14,7 @@
 #define MenuButtonHeight 110
 #define MenuButtonVerticalPadding 10
 #define MenuButtonHorizontalMargin 10
-#define MenuButtonAnimationTime 0.5
+#define MenuButtonAnimationTime 0.1
 #define MenuButtonAnimationInterval (MenuButtonAnimationTime / 5)
 
 #define kMenuButtonBaseTag 100
@@ -59,7 +59,7 @@ - (void)setup {
     _realTimeBlur = [[XHRealTimeBlur alloc] initWithFrame:self.bounds];
     _realTimeBlur.blurStyle = XHBlurStyleTranslucentWhite;
     _realTimeBlur.showDuration = 0.3;
-    _realTimeBlur.disMissDuration = 1.0;
+    _realTimeBlur.disMissDuration = 0.5;
     _realTimeBlur.willShowBlurViewcomplted = ^(void) {
         [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:YES];
         weakSelf.isShowed = YES;
@@ -172,8 +172,8 @@ - (void)showButtons {
             menuButton.frame = fromRect;
         }
         
-        double delayInSeconds = index * MenuButtonAnimationInterval;
-        
+        double delayInSeconds = (items.count - index) * MenuButtonAnimationInterval;
+//        NSLog(@"showButtons delayInSeconds:%d - %.3f", index, delayInSeconds);
         [self initailzerAnimationWithToPostion:toRect formPostion:fromRect atView:menuButton beginTime:delayInSeconds];
     }
 }
@@ -192,7 +192,7 @@ - (void)hidenButtons {
         
         switch (self.menuAnimationType) {
             case kPopMenuAnimationTypeSina:
-                toRect.origin.y = self.endPoint.y;
+                toRect.origin.y = self.endPoint.y ;
                 break;
             case kPopMenuAnimationTypeNetEase:
                 toRect.origin.x = self.endPoint.x - CGRectGetMidX(menuButton.bounds);
@@ -201,9 +201,10 @@ - (void)hidenButtons {
             default:
                 break;
         }
-//        double delayInSeconds = (items.count - index) * MenuButtonAnimationInterval;
-        double delayInSeconds = (items.count - index) * 0.05;
+        double delayInSeconds = index * MenuButtonAnimationInterval;
         
+//        NSLog(@"hidenButtons delayInSeconds:%d - %.3f", index, delayInSeconds);
+
         [self initailzerAnimationWithToPostion:toRect formPostion:fromRect atView:menuButton beginTime:delayInSeconds];
     }
 }
@@ -254,10 +255,12 @@ - (void)initailzerAnimationWithToPostion:(CGRect)toRect formPostion:(CGRect)from
     springAnimation.property = [POPAnimatableProperty propertyWithName:kPOPViewFrame];
     springAnimation.removedOnCompletion = YES;
     springAnimation.beginTime = beginTime + CACurrentMediaTime();
-    CGFloat springBounciness = 15 - beginTime * 2;
+//    CGFloat springBounciness = 6 - beginTime * 2;
+    CGFloat springBounciness = 6;
     springAnimation.springBounciness = springBounciness;    // value between 0-20
     
-    CGFloat springSpeed = 6 - beginTime * 2;
+//    CGFloat springSpeed = 6 - beginTime * 2;
+    CGFloat springSpeed = 2;
     springAnimation.springSpeed = springSpeed;     // value between 0-20
     springAnimation.toValue = [NSValue valueWithCGRect:toRect];
     springAnimation.fromValue = [NSValue valueWithCGRect:fromRect];
diff --git a/Coding_iOS/Vendor/XHRealTimeBlur/XHRealTimeBlur.m b/Coding_iOS/Vendor/XHRealTimeBlur/XHRealTimeBlur.m
@@ -90,7 +90,7 @@ - (void)hiddenAnimationCompletion:(void (^)(BOOL finished))completion {
         self.willDismissBlurViewCompleted();
     }
     
-    [UIView animateWithDuration:self.disMissDuration delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
+    [UIView animateWithDuration:self.disMissDuration delay:0.3 options:UIViewAnimationOptionCurveEaseInOut animations:^{
         self.alpha = 0.0;
     } completion:^(BOOL finished) {
         if (completion) {

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ -(void)addItemClicked:(id)sender{`
`234`	`234`	`break;`
`235`	`235`	`}`
`236`	`236`	`};`
`237`		`- [_myPopMenu showMenuAtView:kKeyWindow startPoint:CGPointMake(0, -100) endPoint:CGPointMake(0, kScreen_Height +100)];`
	`237`	`+ [_myPopMenu showMenuAtView:kKeyWindow startPoint:CGPointMake(0, -100) endPoint:CGPointMake(0, -100)];`
`238`	`238`
`239`	`239`	`// if ([KxMenu isShowingInView:self.view]) {`
`240`	`240`	`// [KxMenu dismissMenu:YES];`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ - (void)hiddenAnimationCompletion:(void (^)(BOOL finished))completion {`
`90`	`90`	`self.willDismissBlurViewCompleted();`
`91`	`91`	`}`
`92`	`92`
`93`		`- [UIView animateWithDuration:self.disMissDuration delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{`
	`93`	`+ [UIView animateWithDuration:self.disMissDuration delay:0.3 options:UIViewAnimationOptionCurveEaseInOut animations:^{`
`94`	`94`	`self.alpha = 0.0;`
`95`	`95`	`} completion:^(BOOL finished) {`
`96`	`96`	`if (completion) {`