Merge pull request #490 from jpush/dev

Dev

Author: huangminlinux

documents/api.md

@@ -19,6 +19,7 @@
   * [setBadge](#setbadge)
   * [getBadge](#getbadge)
   * [setLocalNotification](#setlocalnotification)
+  * [getLaunchAppNotification](#getlaunchappnotification)
   * [点击推送启动应用事件](#open-notification-launch-app-event)
   * [网络成功登陆事件](#network-did-login-event)
 * [Android Only API](#android-only-api)
@@ -292,6 +293,22 @@ JPushModule.setLocalNotification(
 )
 ```
 
+#### getLaunchAppNotification
+
+点击推送启动应用的时候原生会将该 notification 缓存起来，该方法用于获取缓存的 notification。
+
+```javascript
+JPushModule.getLaunchAppNotification( notification => {
+  if (notification === undefined) {
+    // 说明应用不是通过点击通知启动的，是通过点击应用 icon
+  } else if (notification['aps'] === undefined) {
+    // 说明是 local notification
+  } else {
+    // 说明是 remote notification
+  }
+})
+```
+
 #### 点击推送启动应用事件
 
 **NOTE**: iOS 需要安装到 [email protected]+ 。

documents/api_en.md

@@ -19,6 +19,7 @@
   * [setBadge](#setbadge)
   * [getBadge](#getbadge)
   * [setLocalNotification](#setlocalnotification)
+  * [getLaunchAppNotification](#getlaunchappnotification)
   * [Open Notification Launch App Event](#open-notification-launch-app-event)
   * [Network Did Login Event](#network-did-login-event)
 * [Android Only API](#android-only-api)
@@ -263,6 +264,22 @@ JPushModule.setLocalNotification(
 )
 ```
 
+#### getLaunchAppNotification
+
+Get Launch app's notification, this function will get the launch notificatiton from cache .
+
+```javascript
+JPushModule.getLaunchAppNotification( notification => {
+  if (notification === undefined) {
+    // application was launch by tap app's icon
+  } else if (notification['aps'] === undefined) {
+    // application was launch by tap local notification
+  } else {
+    // application was launch by tap remote notification
+  }
+})
+```
+
 #### Open Notification Launch App Event
 
 **NOTE**: iOS need update to [email protected]+

ios/RCTJPushModule/RCTJPushModule.m

@@ -101,9 +101,10 @@ - (id)init {
                         name:kJPFOpenNotificationToLaunchApp
                       object:nil];
 
-  if ([RCTJPushActionQueue sharedInstance].openedLocalNotification != nil) {
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotificationToLaunchApp object:[RCTJPushActionQueue sharedInstance].openedLocalNotification];
-  }
+//  if ([RCTJPushActionQueue sharedInstance].openedLocalNotification != nil) {
+//    [self alert:@"openedLocalNotification is not nil"];
+//    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotificationToLaunchApp object:[RCTJPushActionQueue sharedInstance].openedLocalNotification];
+//  }
 
   return self;
 }
@@ -125,13 +126,16 @@ - (void)reactJSDidload {
   } else {
     [[NSNotificationCenter defaultCenter] postNotificationName:kJPFNetworkDidCloseNotification object:nil];
   }
-  
 }
 
 - (void)setBridge:(RCTBridge *)bridge {
   _bridge = bridge;
   [RCTJPushActionQueue sharedInstance].openedRemoteNotification = [_bridge.launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
-  [RCTJPushActionQueue sharedInstance].openedLocalNotification = [_bridge.launchOptions objectForKey:UIApplicationLaunchOptionsLocalNotificationKey];
+  if ([_bridge.launchOptions objectForKey:UIApplicationLaunchOptionsLocalNotificationKey]) {
+    UILocalNotification *localNotification = [_bridge.launchOptions objectForKey:UIApplicationLaunchOptionsLocalNotificationKey];
+    [RCTJPushActionQueue sharedInstance].openedLocalNotification = localNotification.userInfo;// null?
+  }
+  
 }
 
 // request push notification permissions only
@@ -146,34 +150,89 @@ - (void)setBridge:(RCTBridge *)bridge {
 }
 
 RCT_EXPORT_METHOD(getLaunchAppNotification:(RCTResponseSenderBlock)callback) {
-
+  NSDictionary *notification;
   if ([RCTJPushActionQueue sharedInstance].openedRemoteNotification != nil) {
-    callback(@[[RCTJPushActionQueue sharedInstance].openedRemoteNotification]);
+    notification = [self jpushFormatNotification: [RCTJPushActionQueue sharedInstance].openedRemoteNotification];
+    callback(@[notification]);
     return;
   }
-  
+
   if ([RCTJPushActionQueue sharedInstance].openedLocalNotification != nil) {
-    callback(@[[RCTJPushActionQueue sharedInstance].openedLocalNotification]);
+    notification = [self jpushFormatNotification:[RCTJPushActionQueue sharedInstance].openedLocalNotification];
+    callback(@[notification]);
     return;
   }
-  
+
   callback(@[]);
 }
 
 RCT_EXPORT_METHOD(getApplicationIconBadge:(RCTResponseSenderBlock)callback) {
   callback(@[@([UIApplication sharedApplication].applicationIconBadgeNumber)]);
 }
 
+// TODO:
 - (void)openNotificationToLaunchApp:(NSNotification *)notification {
-  id obj = [notification object];
-  [self.bridge.eventDispatcher sendAppEventWithName:@"openNotificationLaunchApp" body:obj];
+  NSDictionary *obj = [notification object];
+  [self.bridge.eventDispatcher sendAppEventWithName:@"openNotificationLaunchApp" body:[self jpushFormatNotification:obj]];
 }
 
+// TODO:
 - (void)openNotification:(NSNotification *)notification {
-  id obj = [notification object];
-  [self.bridge.eventDispatcher sendAppEventWithName:@"openNotification" body:obj];
+  NSDictionary *obj = [notification object];
+  [self.bridge.eventDispatcher sendAppEventWithName:@"openNotification" body: [self jpushFormatNotification:obj]];
+}
+
+- (NSMutableDictionary *)jpushFormatNotification:(NSDictionary *)dic {
+  if (!dic) {
+    return @[].mutableCopy;
+  }
+  if (dic.count == 0) {
+    return @[].mutableCopy;
+  }
+
+  if (dic[@"aps"]) {
+    return [self jpushFormatAPNSDic:dic];
+  } else {
+    return [self jpushFormatLocalNotificationDic:dic];
+  }
 }
 
+- (NSMutableDictionary *)jpushFormatLocalNotificationDic:(NSDictionary *)dic {
+  return [NSMutableDictionary dictionaryWithDictionary:dic];
+}
+  
+- (NSMutableDictionary *)jpushFormatAPNSDic:(NSDictionary *)dic {
+  NSMutableDictionary *extras = @{}.mutableCopy;
+  for (NSString *key in dic) {
+    if([key isEqualToString:@"_j_business"]      ||
+       [key isEqualToString:@"_j_msgid"]         ||
+       [key isEqualToString:@"_j_uid"]           ||
+       [key isEqualToString:@"actionIdentifier"] ||
+       [key isEqualToString:@"aps"]) {
+      continue;
+    }
+    // 和 android 统一将 extras 字段移动到 extras 里面
+    extras[key] = dic[key];
+  }
+  NSMutableDictionary *formatDic = dic.mutableCopy;
+  formatDic[@"extras"] = extras;
+  
+  // 新增 应用状态
+  switch ([UIApplication sharedApplication].applicationState) {
+    case UIApplicationStateInactive:
+      formatDic[@"appState"] = @"inactive";
+      break;
+    case UIApplicationStateActive:
+      formatDic[@"appState"] = @"active";
+      break;
+    case UIApplicationStateBackground:
+      formatDic[@"appState"] = @"background";
+      break;
+    default:
+      break;
+  }
+  return formatDic;
+}
 
 - (void)networkConnecting:(NSNotification *)notification {
   _isJPushDidLogin = false;
@@ -215,27 +274,13 @@ - (void)networkDidReceiveMessage:(NSNotification *)notification {
                                                body:[notification userInfo]];
 }
 
+
+// TODO:
 - (void)receiveRemoteNotification:(NSNotification *)notification {
 
   if ([RCTJPushActionQueue sharedInstance].isReactDidLoad == YES) {
     NSDictionary *obj = [notification object];
-    NSMutableDictionary *notificationDic = [[NSMutableDictionary alloc] initWithDictionary:obj];
-    
-    switch ([UIApplication sharedApplication].applicationState) {
-      case UIApplicationStateInactive:
-        notificationDic[@"appState"] = @"inactive";
-        break;
-      case UIApplicationStateActive:
-        notificationDic[@"appState"] = @"active";
-        break;
-      case UIApplicationStateBackground:
-        notificationDic[@"appState"] = @"background";
-        break;
-      default:
-        break;
-    }
-    NSDictionary *event = [NSDictionary dictionaryWithDictionary: notificationDic];
-    [self.bridge.eventDispatcher sendAppEventWithName:@"receiveNotification" body:event];
+    [self.bridge.eventDispatcher sendAppEventWithName:@"receiveNotification" body: [self jpushFormatNotification:obj]];
   } else {
     [[RCTJPushActionQueue sharedInstance] postNotification:notification];
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jpush-react-native",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "a jpush plugin for react native application",
   "main": "index.js",
   "scripts": {