改改改

wanghengheng · wanghengheng · commit 8b9dbafbc01f · 2015-07-09T11:10:59.000+08:00
diff --git a/Coding_iOS/Vendor/PopMenu/MenuButton.m b/Coding_iOS/Vendor/PopMenu/MenuButton.m
@@ -40,7 +40,7 @@ - (instancetype)initWithFrame:(CGRect)frame menuItem:(MenuItem *)menuItem {
         [self addSubview:self.iconImageView];
         
         self.titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.iconImageView.frame), CGRectGetWidth(self.bounds), 35)];
-        self.titleLabel.textColor = [UIColor whiteColor];
+        self.titleLabel.textColor = [UIColor blackColor];
         self.titleLabel.backgroundColor = [UIColor clearColor];
         self.titleLabel.font = [UIFont systemFontOfSize:14];
         self.titleLabel.textAlignment = NSTextAlignmentCenter;
@@ -54,6 +54,10 @@ - (instancetype)initWithFrame:(CGRect)frame menuItem:(MenuItem *)menuItem {
 }
 
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+    [self popBegan];
+}
+
+- (void)popBegan{
     // &#25773;&#25918;&#32553;&#25918;&#21160;&#30011;
     POPSpringAnimation *scaleAnimation = [POPSpringAnimation animation];
     scaleAnimation.springBounciness = 20;    // value between 0-20
@@ -81,13 +85,29 @@ - (void)disMissCompleted:(void(^)(BOOL finished))completed {
     [self pop_addAnimation:scaleAnimation forKey:@"scaleAnimationKey"];
 }
 
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event{
+    UITouch *curTouch = [touches anyObject];
+    if (CGRectContainsPoint(self.bounds, [curTouch locationInView:self]) &&
+        !CGRectContainsPoint(self.bounds, [curTouch previousLocationInView:self])) {
+        [self popBegan];
+    }else if (!CGRectContainsPoint(self.bounds, [curTouch locationInView:self]) &&
+              CGRectContainsPoint(self.bounds, [curTouch previousLocationInView:self])){
+        [self disMissCompleted:NULL];
+    }
+}
+
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    // &#22238;&#35843;
-    [self disMissCompleted:^(BOOL finished) {
-        if (self.didSelctedItemCompleted) {
-            self.didSelctedItemCompleted(self.menuItem);
-        }
-    }];
+    UITouch *curTouch = [touches anyObject];
+    if (CGRectContainsPoint(self.bounds, [curTouch locationInView:self])) {
+        // &#22238;&#35843;
+        [self disMissCompleted:^(BOOL finished) {
+            if (self.didSelctedItemCompleted) {
+                self.didSelctedItemCompleted(self.menuItem);
+            }
+        }];
+    }else{
+        [self disMissCompleted:NULL];
+    }
 }
 
 @end
diff --git a/Coding_iOS/Vendor/PopMenu/PopMenu.m b/Coding_iOS/Vendor/PopMenu/PopMenu.m
@@ -57,6 +57,7 @@ - (void)setup {
     
     typeof(self) __weak weakSelf = self;
     _realTimeBlur = [[XHRealTimeBlur alloc] initWithFrame:self.bounds];
+    _realTimeBlur.blurStyle = XHBlurStyleTranslucentWhite;
     _realTimeBlur.showDuration = 0.3;
     _realTimeBlur.disMissDuration = 0.5;
     _realTimeBlur.willShowBlurViewcomplted = ^(void) {
diff --git a/Coding_iOS/Vendor/XHRealTimeBlur/XHRealTimeBlur.h b/Coding_iOS/Vendor/XHRealTimeBlur/XHRealTimeBlur.h
@@ -27,8 +27,10 @@ static NSString * const XHRealTimeDidDismissBlurViewBlcokKey = @"XHRealTimeDidDi
 typedef NS_ENUM(NSInteger, XHBlurStyle) {
     // &#22402;&#30452;&#26799;&#24230;&#32972;&#26223;&#20174;&#40657;&#33394;&#21040;&#21322;&#36879;&#26126;&#30340;&#12290;
     XHBlurStyleBlackGradient = 0,
-    // &#31867;&#20284;UIToolbar&#30340;&#21322;&#36879;&#26126;&#32972;&#26223;
+    // &#31867;&#20284;UIToolbar&#30340;&#21322;&#36879;&#26126;&#32972;&#26223;&#65288;&#40657;&#65289;
     XHBlurStyleTranslucent,
+    // &#31867;&#20284;UIToolbar&#30340;&#21322;&#36879;&#26126;&#32972;&#26223;&#65288;&#30333;&#65289;
+    XHBlurStyleTranslucentWhite,
     // &#40657;&#33394;&#21322;&#36879;&#26126;&#32972;&#26223;
     XHBlurStyleBlackTranslucent,
     // &#32431;&#30333;&#33394;
diff --git a/Coding_iOS/Vendor/XHRealTimeBlur/XHRealTimeBlur.m b/Coding_iOS/Vendor/XHRealTimeBlur/XHRealTimeBlur.m
@@ -36,7 +36,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 @interface XHRealTimeBlur ()
 
 @property (nonatomic, strong) XHGradientView *gradientBackgroundView;
-@property (nonatomic, strong) UIToolbar *blurBackgroundView;
+@property (nonatomic, strong) UIToolbar *blurBackgroundView, *blurWhiteBackgroundView;
 @property (nonatomic, strong) UIView *blackTranslucentBackgroundView;
 @property (nonatomic, strong) UIView *whiteBackgroundView;
 
@@ -132,6 +132,14 @@ - (UIToolbar *)blurBackgroundView {
     return _blurBackgroundView;
 }
 
+- (UIToolbar *)blurWhiteBackgroundView {
+    if (!_blurWhiteBackgroundView) {
+        _blurWhiteBackgroundView = [[UIToolbar alloc] initWithFrame:self.bounds];
+        [_blurWhiteBackgroundView setBarStyle:UIBarStyleDefault];
+    }
+    return _blurWhiteBackgroundView;
+}
+
 - (UIView *)blackTranslucentBackgroundView {
     if (!_blackTranslucentBackgroundView) {
         _blackTranslucentBackgroundView = [[UIView alloc] initWithFrame:self.bounds];
@@ -156,6 +164,8 @@ - (UIView *)backgroundView {
             break;
         case XHBlurStyleTranslucent:
             return self.blurBackgroundView;
+        case XHBlurStyleTranslucentWhite:
+            return self.blurWhiteBackgroundView;
         case XHBlurStyleBlackTranslucent:
             return self.blackTranslucentBackgroundView;
             break;

-Original file line number
+Diff line change
 typedef NS_ENUM(NSInteger, XHBlurStyle) {
     // 垂直梯度背景从黑色到半透明的。
     XHBlurStyleBlackGradient = 0,
 -    // 类似UIToolbar的半透明背景
 +    // 类似UIToolbar的半透明背景（黑）
     XHBlurStyleTranslucent,
 +    // 类似UIToolbar的半透明背景（白）
 +    XHBlurStyleTranslucentWhite,
     // 黑色半透明背景
     XHBlurStyleBlackTranslucent,
     // 纯白色