Merge pull request #73 from ZoMinster/UserNotifications_support

User notifications support
alibaba · May 10, 2017 · 29a648a · 29a648a
2 parents 2901167 + 691ad30
commit 29a648a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 2 deletions.
diff --git a/BeeHive/BHAppDelegate.h b/BeeHive/BHAppDelegate.h
@@ -8,21 +8,35 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
+#import <UserNotifications/UserNotifications.h>
+#endif
 
 
 @interface BHAppDelegate : UIResponder <UIApplicationDelegate>
 
 @end
 
-typedef void (^notificationResultHandler)(UIBackgroundFetchResult);
+typedef void (^BHNotificationResultHandler)(UIBackgroundFetchResult);
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
+typedef void (^BHNotificationPresentationOptionsHandler)(UNNotificationPresentationOptions options);
+typedef void (^BHNotificationCompletionHandler)();
+#endif
 
 @interface BHNotificationsItem : NSObject
 
 @property (nonatomic, strong) NSError *notificationsError;
 @property (nonatomic, strong) NSData *deviceToken;
 @property (nonatomic, strong) NSDictionary *userInfo;
-@property (nonatomic, assign) notificationResultHandler notificationResultHander;
+@property (nonatomic, weak) BHNotificationResultHandler notificationResultHander;
 @property (nonatomic, strong) UILocalNotification *localNotification;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
+@property (nonatomic, strong) UNNotification *notification;
+@property (nonatomic, strong) UNNotificationResponse *notificationResponse;
+@property (nonatomic, weak) BHNotificationPresentationOptionsHandler notificationPresentationOptionsHandler;
+@property (nonatomic, weak) BHNotificationCompletionHandler notificationCompletionHandler;
+@property (nonatomic, strong) UNUserNotificationCenter *center;
+#endif
 
 @end
 

diff --git a/BeeHive/BHAppDelegate.m b/BeeHive/BHAppDelegate.m
@@ -13,6 +13,11 @@
 #import "BHModuleManager.h"
 #import "BHTimeProfiler.h"
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
+#import <UserNotifications/UserNotifications.h>
+#endif
+
+
 @interface BHAppDelegate ()
 
 @end
@@ -168,6 +173,21 @@ - (BOOL)application:(UIApplication *)application willContinueUserActivityWithTyp
     return YES;
 }
 #endif
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler {
+    [[BeeHive shareInstance].context.notificationsItem setNotification: notification];
+    [[BeeHive shareInstance].context.notificationsItem setNotificationPresentationOptionsHandler: completionHandler];
+    [[BeeHive shareInstance].context.notificationsItem setCenter:center];
+    [[BHModuleManager sharedManager] triggerEvent:BHMWillPresentNotificationEvent];
+};
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler {
+    [[BeeHive shareInstance].context.notificationsItem setNotificationResponse: response];
+    [[BeeHive shareInstance].context.notificationsItem setNotificationCompletionHandler:completionHandler];
+    [[BeeHive shareInstance].context.notificationsItem setCenter:center];
+    [[BHModuleManager sharedManager] triggerEvent:BHMDidReceiveNotificationResponseEvent];
+};
+#endif
 
 @end
 

diff --git a/BeeHive/BHModuleManager.h b/BeeHive/BHModuleManager.h
@@ -33,6 +33,8 @@ typedef NS_ENUM(NSInteger, BHModuleEventType)
     BHMDidRegisterForRemoteNotificationsEvent,
     BHMDidReceiveRemoteNotificationEvent,
     BHMDidReceiveLocalNotificationEvent,
+    BHMWillPresentNotificationEvent,
+    BHMDidReceiveNotificationResponseEvent,
     BHMWillContinueUserActivityEvent,
     BHMContinueUserActivityEvent,
     BHMDidFailToContinueUserActivityEvent,

diff --git a/BeeHive/BHModuleManager.m b/BeeHive/BHModuleManager.m
@@ -33,6 +33,8 @@
 static  NSString *kDidRegisterForRemoteNotificationsSelector = @"modDidRegisterForRemoteNotifications:";
 static  NSString *kDidReceiveRemoteNotificationsSelector = @"modDidReceiveRemoteNotification:";
 static  NSString *kDidReceiveLocalNotificationsSelector = @"modDidReceiveLocalNotification:";
+static  NSString *kWillPresentNotificationSelector = @"modWillPresentNotification:";
+static  NSString *kDidReceiveNotificationResponseSelector = @"modDidReceiveNotificationResponse:";
 static  NSString *kWillContinueUserActivitySelector = @"modWillContinueUserActivity:";
 static  NSString *kContinueUserActivitySelector = @"modContinueUserActivity:";
 static  NSString *kDidUpdateContinueUserActivitySelector = @"modDidUpdateContinueUserActivity:";
@@ -162,6 +164,12 @@ - (void)triggerEvent:(BHModuleEventType)eventType
         case BHMDidReceiveRemoteNotificationEvent:
             [self handleModuleEvent:kDidReceiveRemoteNotificationsSelector];
             break;
+        case BHMWillPresentNotificationEvent:
+            [self handleModuleEvent:kWillPresentNotificationSelector];
+            break;
+        case BHMDidReceiveNotificationResponseEvent:
+            [self handleModuleEvent:kDidReceiveNotificationResponseSelector];
+            break;
 
         case BHMDidFailToRegisterForRemoteNotificationsEvent:
             [self handleModuleEvent:kFailToRegisterForRemoteNotificationsSelector];

diff --git a/BeeHive/BHModuleProtocol.h b/BeeHive/BHModuleProtocol.h
@@ -61,6 +61,10 @@
 
 - (void)modDidReceiveLocalNotification:(BHContext *)context;
 
+- (void)modWillPresentNotification:(BHContext *)context;
+
+- (void)modDidReceiveNotificationResponse:(BHContext *)context;
+
 - (void)modWillContinueUserActivity:(BHContext *)context;
 
 - (void)modContinueUserActivity:(BHContext *)context;