Merge pull request #268 from jpush/dev

update to 1.7.0

Author: huangminlinux

example/documents/iOS_API.md

@@ -1,57 +1,69 @@
-## jpush-react-native iOS API
-
-All apis can find in jpush-react-native/index.js.
-
-- setBadge(badge, cb)
-
-设置 badge 值
-```
-JPushModule.setBadge(5, (success) => {
-  console.log(success)
-});
-```
-
-- setLocalNotification( date,
-                        textContain,     // date
-                        badge,           // int
-                        alertAction,     // String
-                        notificationKey, // String
-                        userInfo,   // Dictionary
-                        soundName   // String
-                        )
-
-设置本地推送
-```
-  JPushModule.setLocalNotification( this.state.date, 
-                                    this.state.textContain,
-                                    5, 
-                                    'dfsa',
-                                    'dfaas',
-                                    null,
-                                    null);
-```
-
-## 事件
-监听 `ReceiveNotification` 事件，收到到推送的时候会回调
-```
-var subscription = NativeAppEventEmitter.addListener(
-  'ReceiveNotification',
-  (notification) => console.log(notification)
-);
-```
-
-监听 `OpenNotification` 事件，点击推送的时候会执行这个回调
-```
-var subscription = NativeAppEventEmitter.addListener(
-  'OpenNotification',
-  (notification) => console.log(notification)
-);
-```
-
-监听 `networkDidReceiveMessage` 事件，收到 JPush 应用内消息会执行这个回调
-```
-var subscription = NativeAppEventEmitter.addListener(
-  'networkDidReceiveMessage',
-  (message) => console.log(message)
-);
-```
+## jpush-react-native iOS API
+
+All apis can find in jpush-react-native/index.js.
+
+- setBadge(badge, cb)
+
+设置 badge 值
+```
+JPushModule.setBadge(5, (success) => {
+  console.log(success)
+});
+```
+
+- setLocalNotification( date,
+         textContain,     // date
+         badge,           // int
+         alertAction,     // String
+         notificationKey, // String
+         userInfo,   // Dictionary
+         soundName   // String
+         )
+
+设置本地推送
+```
+  JPushModule.setLocalNotification( this.state.date, 
+                                    this.state.textContain,
+                                    5, 
+                                    'dfsa',
+                                    'dfaas',
+                                    null,
+                                    null);
+```
+
+## 事件
+监听 `ReceiveNotification` 事件，收到到推送的时候会回调
+```
+var subscription = NativeAppEventEmitter.addListener(
+  'ReceiveNotification',
+  (notification) => console.log(notification)
+);
+```
+
+监听 `OpenNotificationToLaunchApp` 事件，点击推送**启动 App **的时候会触发这个事件
+
+```
+var subscription = NativeAppEventEmitter.addListener(
+  'OpenNotificationToLaunchApp',
+  (notification) => console.log(notification)
+);
+```
+
+
+
+监听 `OpenNotification` 事件，点击推送的时候会执行这个回调(注意：iOS10 才开始触发这个事件)
+
+```
+var subscription = NativeAppEventEmitter.addListener(
+  'OpenNotification',
+  (notification) => console.log(notification)
+);
+```
+
+监听 `networkDidReceiveMessage` 事件，收到 JPush 应用内消息会执行这个回调
+```
+var subscription = NativeAppEventEmitter.addListener(
+  'networkDidReceiveMessage',
+  (message) => console.log(message)
+);
+```

ios/RCTJPushModule/RCTJPushModule/RCTJPushModule.h

@@ -20,7 +20,8 @@
 
 #define kJPFDidReceiveRemoteNotification  @"kJPFDidReceiveRemoteNotification"
 
-#define kJPFOpenNotification @"kJPFOpenNotification" // 通过点击通知 Notification 启动应用
+#define kJPFOpenNotification @"kJPFOpenNotification" // 通过点击通知事件
+#define kJPFOpenNotificationToLaunchApp @"kJPFOpenNotificationToLaunchApp" // 通过点击通知启动应用
 
 @interface RCTJPushModule : NSObject <RCTBridgeModule>
 @property(strong,nonatomic)RCTResponseSenderBlock asyCallback;

ios/RCTJPushModule/RCTJPushModule/RCTJPushModule.m

@@ -86,6 +86,15 @@ - (id)init {
                         name:kJPFOpenNotification
                       object:nil];
 
+  [defaultCenter addObserver:self
+                    selector:@selector(openNotificationToLaunchApp:)
+                        name:kJPFOpenNotificationToLaunchApp
+                      object:nil];
+  
+  if ([RCTJPushActionQueue sharedInstance].openedLocalNotification != nil) {
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotificationToLaunchApp object:[RCTJPushActionQueue sharedInstance].openedLocalNotification];
+  }
+  
   return self;
 }
 
@@ -94,11 +103,11 @@ - (void)reactJSDidload {
   [[RCTJPushActionQueue sharedInstance] scheduleNotificationQueue];
 
   if ([RCTJPushActionQueue sharedInstance].openedRemoteNotification != nil) {
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotification object:[RCTJPushActionQueue sharedInstance].openedRemoteNotification];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotificationToLaunchApp object:[RCTJPushActionQueue sharedInstance].openedRemoteNotification];
   }
 
   if ([RCTJPushActionQueue sharedInstance].openedLocalNotification != nil) {
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotification object:[RCTJPushActionQueue sharedInstance].openedLocalNotification];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotificationToLaunchApp object:[RCTJPushActionQueue sharedInstance].openedLocalNotification];
   }
 
 }
@@ -126,6 +135,11 @@ - (void)setBridge:(RCTBridge *)bridge {
     }
 }
 
+- (void)openNotificationToLaunchApp:(NSNotification *)notification {
+  id obj = [notification object];
+  [self.bridge.eventDispatcher sendAppEventWithName:@"OpenNotificationToLaunchApp" body:obj];
+}
+
 - (void)openNotification:(NSNotification *)notification {
   id obj = [notification object];
   [self.bridge.eventDispatcher sendAppEventWithName:@"OpenNotification" body:obj];

package.json

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