修复 iOS register 监听事件不生效的问题(#17)

Author: Jeepeng

README.md

@@ -89,13 +89,26 @@ AppDelegate.m:
   return YES;
 }
 
+// Required to register for notifications
+- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
+{
+  [XGPushManager didRegisterUserNotificationSettings:notificationSettings];
+}
+
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    NSLog(@"[XGDemo] device token is %@", [[XGPushTokenManager defaultTokenManager] deviceTokenString]);
+    [XGPushManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
 }
 
+// Required for the registrationError event.
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-	NSLog(@"[XGDemo] register APNS fail.\n[XGDemo] reason : %@", error);
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"registerDeviceFailed" object:nil];
+	NSLog(@"[XGPush] register APNS fail.\n[XGPush] reason : %@", error);
+  [XGPushManager didFailToRegisterForRemoteNotificationsWithError:error];
+}
+
+// Required for the localNotification event.
+- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
+{
+  [XGPushManager didReceiveLocalNotification:notification];
 }
 
 /**
@@ -106,8 +119,8 @@ AppDelegate.m:
  @param completionHandler 完成回调
  */
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-  NSLog(@"[XGDemo] receive slient Notification");
-  NSLog(@"[XGDemo] userinfo %@", userInfo);
+  NSLog(@"[XGPush] receive slient Notification");
+  NSLog(@"[XGPush] userinfo %@", userInfo);
   UIApplicationState state = [application applicationState];
   BOOL isClicked = (state != UIApplicationStateActive);
   NSMutableDictionary *remoteNotification = [NSMutableDictionary dictionaryWithDictionary:userInfo];
@@ -116,7 +129,7 @@ AppDelegate.m:
     remoteNotification[@"background"] = @YES;
   }
   [[XGPush defaultManager] reportXGNotificationInfo:remoteNotification];
-  completionHandler(UIBackgroundFetchResultNewData);
+  [XGPushManager didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
 }
 
 // iOS 10 新增 API
@@ -127,7 +140,7 @@ AppDelegate.m:
 // App 用户在通知中心清除消息
 // 无论本地推送还是远程推送都会走这个回调
 - (void)xgPushUserNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler {
-	NSLog(@"[XGDemo] click notification");
+	NSLog(@"[XGPush] click notification");
 	if ([response.actionIdentifier isEqualToString:@"xgaction001"]) {
 		NSLog(@"click from Action1");
 	} else if ([response.actionIdentifier isEqualToString:@"xgaction002"]) {

example/ios/example/AppDelegate.m

@@ -38,13 +38,26 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
+// Required to register for notifications
+- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
+{
+  [XGPushManager didRegisterUserNotificationSettings:notificationSettings];
+}
+
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    NSLog(@"[XGDemo] device token is %@", [[XGPushTokenManager defaultTokenManager] deviceTokenString]);
+    [XGPushManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
 }
 
+// Required for the registrationError event.
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-	NSLog(@"[XGDemo] register APNS fail.\n[XGDemo] reason : %@", error);
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"registerDeviceFailed" object:nil];
+	NSLog(@"[XGPush] register APNS fail.\n[XGPush] reason : %@", error);
+  [XGPushManager didFailToRegisterForRemoteNotificationsWithError:error];
+}
+
+// Required for the localNotification event.
+- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
+{
+  [XGPushManager didReceiveLocalNotification:notification];
 }
 
 /**
@@ -55,8 +68,8 @@ - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotif
  @param completionHandler 完成回调
  */
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-  NSLog(@"[XGDemo] receive slient Notification");
-  NSLog(@"[XGDemo] userinfo %@", userInfo);
+  NSLog(@"[XGPush] receive slient Notification");
+  NSLog(@"[XGPush] userinfo %@", userInfo);
   UIApplicationState state = [application applicationState];
   BOOL isClicked = (state != UIApplicationStateActive);
   NSMutableDictionary *remoteNotification = [NSMutableDictionary dictionaryWithDictionary:userInfo];
@@ -65,7 +78,7 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
     remoteNotification[@"background"] = @YES;
   }
   [[XGPush defaultManager] reportXGNotificationInfo:remoteNotification];
-  completionHandler(UIBackgroundFetchResultNewData);
+  [XGPushManager didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
 }
 
 // iOS 10 新增 API
@@ -76,7 +89,7 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
 // App 用户在通知中心清除消息
 // 无论本地推送还是远程推送都会走这个回调
 - (void)xgPushUserNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler {
-	NSLog(@"[XGDemo] click notification");
+	NSLog(@"[XGPush] click notification");
 	if ([response.actionIdentifier isEqualToString:@"xgaction001"]) {
 		NSLog(@"click from Action1");
 	} else if ([response.actionIdentifier isEqualToString:@"xgaction002"]) {