Merge branch 'dev'

Author: pikacode

EBForeNotification.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "EBForeNotification"
-  s.version      = "1.0.2"
+  s.version      = "1.0.4"
   s.summary      = "iOS 前台推送及事件处理。iOS Foreground Push Notification and event-handle."
 
   # This description is used to generate tags and improve search results.
@@ -93,7 +93,7 @@ Pod::Spec.new do |s|
   #
 
   #s.source_files  = "Classes", "Classes/**/*.{h,m}"
-  s.source_files  = "EBForeNotification", "EBForeNotification/*.{h,m}"
+  s.source_files  = "EBForeNotification", "EBForeNotification/*.{h,m}","EBForeNotification/Classes", "EBForeNotification/Classes/*.{h,m}"
 
   #s.exclude_files = "Classes/Exclude"
 
@@ -109,7 +109,7 @@ Pod::Spec.new do |s|
   #
 
   # s.resource  = "icon.png"
-   s.resources = "EBForeNotification/*.xib"
+   s.resources = "EBForeNotification/*.xib", "EBForeNotification/Classes/*.xib"
 
   # s.preserve_paths = "FilesToSave", "MoreFilesToSave"
 

EBForeNotification/EBBannerView.h renamed to EBForeNotification/Classes/EBBannerView.h

@@ -11,7 +11,7 @@
 #define BannerStayTime 4.7
 #define BannerAnimationTime 0.3
 
-@interface EBBannerView : UIView
+@interface EBBannerView : UIWindow
 @property (nonatomic, retain)NSDictionary *userInfo;
 -(void)removeWithAnimation;
 @end

EBForeNotification/EBBannerView.m renamed to EBForeNotification/Classes/EBBannerView.m

@@ -8,11 +8,9 @@
 
 #import "EBBannerView.h"
 #import "EBForeNotification.h"
-#import "UIViewController+EBForeNotification.h"
 #import "UIImage+ColorAtPoint.h"
 
 @interface EBBannerView()
-
 @property (weak, nonatomic) IBOutlet UIImageView *icon_image;
 @property (weak, nonatomic) IBOutlet UILabel *title_label;
 @property (weak, nonatomic) IBOutlet UILabel *content_label;
@@ -25,11 +23,15 @@ @implementation EBBannerView
 #define BannerHeight 70
 #define BannerWidth [UIScreen mainScreen].bounds.size.width
 
+UIWindow *originWindow;
+
 -(void)awakeFromNib{
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarOrientationChange:) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
-    self.userInfo = [NSDictionary dictionary];
     [self apperWithAnimation];
     [self addGestureRecognizer];
+    self.windowLevel = UIWindowLevelAlert;
+    originWindow = [UIApplication sharedApplication].keyWindow;
+    [self makeKeyAndVisible];
     [super awakeFromNib];
 }
 
@@ -54,10 +56,12 @@ -(void)setUserInfo:(NSDictionary *)userInfo{
     self.title_label.text   = appName;
     self.content_label.text = self.userInfo[@"aps"][@"alert"];
     self.time_label.text = EBBannerViewTimeText;
+    [originWindow makeKeyAndVisible];
     self.time_label.textColor      = [UIImage colorAtPoint:self.time_label.center];
     self.time_label.alpha = 0.7;
-    self.line_view.backgroundColor = [UIImage colorAtPoint:self.line_view.center];
-    self.line_view.alpha  = 0.7;
+    CGPoint lineCenter = self.line_view.center;
+    self.line_view.backgroundColor = [UIImage colorAtPoint:CGPointMake(lineCenter.x, lineCenter.y - 7)];
+    self.line_view.alpha = 0.5;
 }
 
 -(void)statusBarOrientationChange:(NSNotification *)notification{
@@ -83,13 +87,6 @@ -(void)swipeGesture:(UISwipeGestureRecognizer*)gesture{
 }
 
 -(void)apperWithAnimation{
-    if ([[EBBannerView appRootViewController] isKindOfClass:[UINavigationController class]]) {
-        UINavigationController *controller = (UINavigationController*)[EBBannerView appRootViewController];
-        controller.EBForegroundNotificationStatusBarHidden = YES;
-        controller.childViewControllerForStatusBarHidden.EBForegroundNotificationStatusBarHidden = YES;
-    }else{
-        [EBBannerView appRootViewController].EBForegroundNotificationStatusBarHidden = YES;
-    }
     self.frame = CGRectMake(0, 0, BannerWidth, 0);
     [UIView animateWithDuration:BannerAnimationTime animations:^{
         self.frame = CGRectMake(0, 0, BannerWidth, BannerHeight);
@@ -111,13 +108,6 @@ -(void)removeWithAnimation{
     } completion:^(BOOL finished) {
         self.frame = CGRectMake(0, 0, BannerWidth, 0);
         [self removeFromSuperview];
-        if ([[EBBannerView appRootViewController] isKindOfClass:[UINavigationController class]]) {
-            UINavigationController *controller = (UINavigationController*)[EBBannerView appRootViewController];
-            controller.childViewControllerForStatusBarHidden.EBForegroundNotificationStatusBarHidden = NO;
-            controller.EBForegroundNotificationStatusBarHidden = NO;
-        }else{
-            [EBBannerView appRootViewController].EBForegroundNotificationStatusBarHidden = YES;
-        }
         SharedBannerView = nil;
     }];
 }

demo/iOS-Foreground-Push-Notification/iOS-Foreground-Push-Notification/EBBannerView.xib renamed to EBForeNotification/Classes/EBBannerView.xib

@@ -99,7 +99,7 @@
                 <outlet property="time_label" destination="Zvg-9L-jbZ" id="Zqp-sX-vo1"/>
                 <outlet property="title_label" destination="SfK-LV-meM" id="tuy-Is-x7O"/>
             </connections>
-            <point key="canvasLocation" x="423" y="298.5"/>
+            <point key="canvasLocation" x="306" y="219.5"/>
         </view>
     </objects>
 </document>

demo/iOS-Foreground-Push-Notification/iOS-Foreground-Push-Notification/EBForeNotification.m renamed to EBForeNotification/Classes/EBForeNotification.m

@@ -10,7 +10,8 @@
 #import <AudioToolbox/AudioToolbox.h>
 #import <UIKit/UIKit.h>
 #import "EBBannerView.h"
-#import "UIViewController+EBForeNotification.h"
+#import "UIImage+ColorAtPoint.h"
+
 
 NSString *const EBBannerViewDidClick = @"EBBannerViewDidClick";
 

EBForeNotification/UIImage+ColorAtPoint.h renamed to EBForeNotification/Classes/UIImage+ColorAtPoint.h

@@ -18,14 +18,10 @@ +(UIColor *)colorAtPoint:(CGPoint)point{
 
     UIImage *viewImage = UIGraphicsGetImageFromCurrentImageContext();
 
-
     if (!CGRectContainsPoint(CGRectMake(0.0f, 0.0f, viewImage.size.width, viewImage.size.height), point)) {
-
         return nil;
-
     }
 
-
     NSInteger pointX = trunc(point.x);
 
     NSInteger pointY = trunc(point.y);
@@ -46,19 +42,7 @@ +(UIColor *)colorAtPoint:(CGPoint)point{
 
     unsigned char pixelData[4] = { 0, 0, 0, 0 };
 
-    CGContextRef context = CGBitmapContextCreate(pixelData,
-
-                                                 1,
-
-                                                 1,
-
-                                                 bitsPerComponent,
-
-                                                 bytesPerRow,
-
-                                                 colorSpace,
-
-                                                 kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
+    CGContextRef context = CGBitmapContextCreate(pixelData, 1, 1, bitsPerComponent, bytesPerRow, colorSpace, kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
 
     CGColorSpaceRelease(colorSpace);
 
@@ -86,5 +70,4 @@ +(UIColor *)colorAtPoint:(CGPoint)point{
     return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
 }
 
-
 @end