Merge pull request #679 from jpush/dev

wicked-tc130 · web-flow · commit 1b5d7fd72d5e · 2019-09-26T17:25:55.000+08:00
升级到2.5.9.5
diff --git a/android/src/main/java/cn/jiguang/plugins/push/helper/JPushHelper.java b/android/src/main/java/cn/jiguang/plugins/push/helper/JPushHelper.java
@@ -52,10 +52,10 @@ public static WritableMap convertNotificationBundleToMap(String eventType, Bundl
         return writableMap;
     }
 
-
     public static WritableMap convertCustomMessage(CustomMessage customMessage) {
         WritableMap writableMap = Arguments.createMap();
         writableMap.putString(JPushConstans.MESSAGE_ID, customMessage.messageId);
+        writableMap.putString(JPushConstans.TITLE, customMessage.title);
         writableMap.putString(JPushConstans.CONTENT, customMessage.message);
         convertExtras(customMessage.extra, writableMap);
         return writableMap;
diff --git a/example/ios/example/AppDelegate.m b/example/ios/example/AppDelegate.m
@@ -23,7 +23,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // JPush初始化配置
   [JPUSHService setupWithOption:launchOptions appKey:@"129c21dc4cb5e6f6de194003"
                         channel:@"dev" apsForProduction:YES];
-  // Apns
+  // APNS
   JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init];
   entity.types = JPAuthorizationOptionAlert|JPAuthorizationOptionBadge|JPAuthorizationOptionSound|JPAuthorizationOptionProvidesAppNotificationSettings;
   [JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
@@ -51,15 +51,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 //************************************************JPush start************************************************
 
-//注册 APNs 成功并上报 DeviceToken
+//注册 APNS 成功并上报 DeviceToken
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
   [JPUSHService registerDeviceToken:deviceToken];
 }
 
-//iOS 7 Apns
+//iOS 7 APNS
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:  (NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
   // iOS 10 以下 Required
-  NSLog(@"iOS 7 Apns");
+  NSLog(@"iOS 7 APNS");
   [JPUSHService handleRemoteNotification:userInfo];
   [[NSNotificationCenter defaultCenter] postNotificationName:J_APNS_NOTIFICATION_ARRIVED_EVENT object:userInfo];
   completionHandler(UIBackgroundFetchResultNewData);
@@ -77,7 +77,7 @@ - (void)jpushNotificationCenter:(UNUserNotificationCenter *)center  willPresentN
   NSDictionary * userInfo = notification.request.content.userInfo;
   if([notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
     // Apns
-    NSLog(@"iOS 10 Apns 前台收到消息");
+    NSLog(@"iOS 10 APNS 前台收到消息");
     [JPUSHService handleRemoteNotification:userInfo];
     [[NSNotificationCenter defaultCenter] postNotificationName:J_APNS_NOTIFICATION_ARRIVED_EVENT object:userInfo];
   }
@@ -93,17 +93,20 @@ - (void)jpushNotificationCenter:(UNUserNotificationCenter *)center  willPresentN
 - (void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler: (void (^)())completionHandler {
   NSDictionary * userInfo = response.notification.request.content.userInfo;
   if([response.notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
-    NSLog(@"iOS 10 Apns 消息事件回调");
+    NSLog(@"iOS 10 APNS 消息事件回调");
     // Apns
     [JPUSHService handleRemoteNotification:userInfo];
+    // 保障应用被杀死状态下，用户点击推送消息，打开app后可以收到点击通知事件
+    [[RCTJPushEventQueue sharedInstance]._notificationQueue insertObject:userInfo atIndex:0];
     [[NSNotificationCenter defaultCenter] postNotificationName:J_APNS_NOTIFICATION_OPENED_EVENT object:userInfo];
   }
   else {
     // 本地通知 todo
     NSLog(@"iOS 10 本地通知 消息事件回调");
     [[NSNotificationCenter defaultCenter] postNotificationName:J_LOCAL_NOTIFICATION_EVENT object:userInfo];
   }
-  completionHandler();  // 系统要求执行这个方法
+  // 系统要求执行这个方法
+  completionHandler();
 }
 
 //自定义消息
diff --git a/index.js b/index.js
@@ -34,6 +34,8 @@ export default class JPush {
   static init() {
     if (Platform.OS == "android") {
       JPushModule.init()
+    }else{
+      JPushModule.loadJS()
     }
   }
 
@@ -324,7 +326,7 @@ export default class JPush {
   /*
   * 通知事件
   *
-  * @param {Fucntion} callback = (result) => {"messageID":int,"title":int，"content":StringArray,"extras":{String:String}},"notificationType":String}
+  * @param {Fucntion} callback = (result) => {"messageID":String,"title":String，"content":String,"extras":{String:String},"notificationEventType":String}
   *
   * messageID:唯一标识通知消息的 ID
   *
@@ -334,11 +336,9 @@ export default class JPush {
   *
   * extras:对应 Portal 推送消息界面上的“可选设置”里的附加字段
   *
-  * notificationType：分为notificationArrived和notificationOpened两种
+  * notificationEventType：分为notificationArrived和notificationOpened两种
   *
-  * 注意：1.应用在存活状态下点击通知不会有跳转行为，应用在被杀死状态下点击通知会启动应用
-  *      2.请在JS的componentDidMount()中调用JPush.init()保证消息点击事件到达率
-  *      3.请在Android的Application onCreate()中调用JPushModule.registerActivityLifecycle(this)保证应用后台点击通知能切到前台
+  * 注意：应用在存活状态下点击通知不会有跳转行为，应用在被杀死状态下点击通知会启动应用
   *
   * */
   static addNotificationListener(callback) {
@@ -351,7 +351,7 @@ export default class JPush {
   /*
   * 自定义消息事件
   *
-  * @param {Fucntion} callback = (result) => {"messageID":int，"content":StringArray,"extras":{String:String}}}
+  * @param {Fucntion} callback = (result) => {"messageID":String，"content":String,"extras":{String:String}}}
   *
   * messageID:唯一标识自定义消息的 ID
   *
@@ -378,7 +378,7 @@ export default class JPush {
   /*
   * tag alias事件
   *
-  * @param {Fucntion} callback = (result) => {"code":int,"sequence":int，"tags":StringArray,"tag":String,"tagEnable":boolean,"alias":String}
+  * @param {Fucntion} callback = (result) => {"code":int,"sequence":int，"tags":String,"tag":String,"tagEnable":boolean,"alias":String}
   *
   * code:结果，0为操作成功
   *
diff --git a/ios/RCTJPushModule/RCTJPushEventQueue.h b/ios/RCTJPushModule/RCTJPushEventQueue.h
@@ -0,0 +1,18 @@
+//
+//  RCTJPushEventQueue.h
+//  DoubleConversion
+//
+//  Created by wicked on 2019/9/26.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface RCTJPushEventQueue : NSObject
+
++ (nonnull instancetype) sharedInstance;
+
+@property NSMutableArray<NSDictionary *> *_notificationQueue;;
+
+@end
+
diff --git a/ios/RCTJPushModule/RCTJPushEventQueue.m b/ios/RCTJPushModule/RCTJPushEventQueue.m
@@ -0,0 +1,31 @@
+//
+//  RCTJPushEventQueue.m
+//  DoubleConversion
+//
+//  Created by wicked on 2019/9/26.
+//
+
+#import "RCTJPushEventQueue.h"
+
+@implementation RCTJPushEventQueue
+
++ (instancetype)sharedInstance {
+    static RCTJPushEventQueue *instance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[self alloc] init];
+    });
+    return instance;
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    self._notificationQueue = [NSMutableArray new];
+  }
+  return self;
+}
+
+ 
+@end
diff --git a/ios/RCTJPushModule/RCTJPushModule.h b/ios/RCTJPushModule/RCTJPushModule.h
@@ -11,6 +11,7 @@
 #endif
 
 #import "JPUSHService.h"
+#import "RCTJPushEventQueue.h"
 
 #define J_APNS_NOTIFICATION_ARRIVED_EVENT @"J_APNS_NOTIFICATION_ARRIVED_EVENT"
 #define J_APNS_NOTIFICATION_OPENED_EVENT  @"J_APNS_NOTIFICATION_OPENED_EVENT"
diff --git a/ios/RCTJPushModule/RCTJPushModule.m b/ios/RCTJPushModule/RCTJPushModule.m
@@ -27,6 +27,7 @@
 
 //通知事件类型
 #define NOTIFICATION_TYPE         @"notificationType"
+#define NOTIFICATION_EVENT_TYPE   @"notificationEventType"
 #define NOTIFICATION_ARRIVED      @"notificationArrived"
 #define NOTIFICATION_OPENED       @"notificationOpened"
 #define NOTIFICATION_DISMISSED    @"notificationDismissed"
@@ -51,7 +52,8 @@ @implementation RCTJPushModule
 
 RCT_EXPORT_MODULE(JPushModule);
 
-- (id)init {
+- (id)init
+{
     self = [super init];
     NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
     
@@ -95,7 +97,6 @@ - (id)init {
     return self;
 }
 
-
 RCT_EXPORT_METHOD(setDebugMode: (NSDictionary *)options)
 {
     BOOL isDebug = false;
@@ -107,6 +108,14 @@ - (id)init {
     }
 }
 
+RCT_EXPORT_METHOD(loadJS)
+{
+    NSMutableArray *list = [RCTJPushEventQueue sharedInstance]._notificationQueue;
+    if(list.count) {
+        [self sendApnsNotificationEventByDictionary:list[0]];
+    }
+}
+
 RCT_EXPORT_METHOD(getRegisterId:(RCTResponseSenderBlock) callback)
 {
     [JPUSHService registrationIDCompletionHandler:^(int resCode, NSString *registrationID) {
@@ -116,7 +125,6 @@ - (id)init {
     }];
 }
 
-
 //tag
 RCT_EXPORT_METHOD(addTags:(NSDictionary *)params)
 {
@@ -298,13 +306,29 @@ - (void)sendConnectEvent:(NSNotification *)data {
                     completion:NULL];
 }
 
+//APNS通知消息
 - (void)sendApnsNotificationEvent:(NSNotification *)data
 {
     NSDictionary *responseData = [self convertApnsMessage:data];
     [self.bridge enqueueJSCall:@"RCTDeviceEventEmitter"
                         method:@"emit"
                           args:@[NOTIFICATION_EVENT, responseData]
                     completion:NULL];
+    if([RCTJPushEventQueue sharedInstance]._notificationQueue.count){
+         [[RCTJPushEventQueue sharedInstance]._notificationQueue removeAllObjects];
+    }
+}
+
+- (void)sendApnsNotificationEventByDictionary:(NSDictionary *)data
+{
+    NSDictionary *responseData = [self convertApnsMessage:data];
+    [self.bridge enqueueJSCall:@"RCTDeviceEventEmitter"
+                        method:@"emit"
+                          args:@[NOTIFICATION_EVENT, responseData]
+                    completion:NULL];
+    if([RCTJPushEventQueue sharedInstance]._notificationQueue.count){
+         [[RCTJPushEventQueue sharedInstance]._notificationQueue removeAllObjects];
+    }
 }
 
 //自定义消息
@@ -356,10 +380,18 @@ -(NSDictionary *)convertConnect:(NSNotification *)data {
     return responseData;
 }
 
--(NSDictionary *)convertApnsMessage:(NSNotification *)data{
-    NSNotificationName notificationName = data.name;
-    NSDictionary *objectData = data.object;
-    NSString *notificationType = ([notificationName isEqualToString:J_APNS_NOTIFICATION_OPENED_EVENT])?NOTIFICATION_OPENED:NOTIFICATION_ARRIVED;
+-(NSDictionary *)convertApnsMessage:(id)data
+{
+    NSNotificationName notificationName;
+    NSDictionary *objectData;
+    if([data isKindOfClass:[NSNotification class]]){
+        notificationName = [(NSNotification *)data name];
+        objectData = [(NSNotification *)data object];
+    }else if([data isKindOfClass:[NSDictionary class]]){
+        notificationName = J_APNS_NOTIFICATION_OPENED_EVENT;
+        objectData = data;
+    }
+    NSString *notificationEventType = ([notificationName isEqualToString:J_APNS_NOTIFICATION_OPENED_EVENT])?NOTIFICATION_OPENED:NOTIFICATION_ARRIVED;
     id alertData =  objectData[@"aps"][@"alert"];
     NSString *title = @"";
     NSString *content = @"";
@@ -370,7 +402,6 @@ -(NSDictionary *)convertApnsMessage:(NSNotification *)data{
         title = alertData[@"title"]?alertData[@"title"]:@"";
         content = alertData[@"body"]?alertData[@"body"]:@"";
     }
-    
     NSDictionary *responseData;
     NSMutableDictionary * copyData = [[NSMutableDictionary alloc] initWithDictionary:objectData];
     if (copyData[@"_j_business"]) {
@@ -392,28 +423,33 @@ -(NSDictionary *)convertApnsMessage:(NSNotification *)data{
         NSString *value = [copyData objectForKey:key];
         [extrasData setObject:value forKey:key];
     };
-   
+    NSString *messageID = objectData[@"_j_msgid"]?objectData[@"_j_msgid"]:@"";
     if (extrasData.count > 0) {
-        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],TITLE:title,CONTENT:content,EXTRAS:extrasData,NOTIFICATION_TYPE:notificationType};
+        responseData = @{MESSAGE_ID:messageID,TITLE:title,CONTENT:content,EXTRAS:extrasData,NOTIFICATION_EVENT_TYPE:notificationEventType};
     }
     else {
-        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],TITLE:title,CONTENT:content,NOTIFICATION_TYPE:notificationType};
+        responseData = @{MESSAGE_ID:messageID,TITLE:title,CONTENT:content,NOTIFICATION_EVENT_TYPE:notificationEventType};
     }
     return responseData;
 }
 
--(NSDictionary *)convertCustomMessage:(NSNotification *)data {
+-(NSDictionary *)convertCustomMessage:(NSNotification *)data
+{
     NSDictionary *objectData = data.object;
     NSDictionary *responseData;
+    NSString *messageID = objectData[@"_j_msgid"]?objectData[@"_j_msgid"]:@"";
+    NSString *title = objectData[@"title"]?objectData[@"title"]:@"";
+    NSString *content = objectData[@"content"]?objectData[@"content"]:@"";
     if(objectData[@"extras"]){
-        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],CONTENT:objectData[@"content"],EXTRAS:objectData[@"extras"]};
+        responseData = @{MESSAGE_ID:messageID,TITLE:title,CONTENT:content,EXTRAS:objectData[@"extras"]};
     }else{
-        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],CONTENT:objectData[@"content"]};
+        responseData = @{MESSAGE_ID:messageID,TITLE:title,CONTENT:content};
     }
     return responseData;
 }
 
--(NSDictionary *)convertLocalMessage:(NSNotification *)data {
+-(NSDictionary *)convertLocalMessage:(NSNotification *)data
+{
     //NSLog(@"convertConnect 结果返回：%@", data);
     NSMutableDictionary *responseData = [[NSMutableDictionary alloc] init];
     return responseData;
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ export default class JPush {`
`34`	`34`	`static init() {`
`35`	`35`	`if (Platform.OS == "android") {`
`36`	`36`	`JPushModule.init()`
	`37`	`+ }else{`
	`38`	`+ JPushModule.loadJS()`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`
`@@ -324,7 +326,7 @@ export default class JPush {`
`324`	`326`	`/*`
`325`	`327`	`* 通知事件`
`326`	`328`	`*`
`327`		`- * @param {Fucntion} callback = (result) => {"messageID":int,"title":int，"content":StringArray,"extras":{String:String}},"notificationType":String}`
	`329`	`+ * @param {Fucntion} callback = (result) => {"messageID":String,"title":String，"content":String,"extras":{String:String},"notificationEventType":String}`
`328`	`330`	`*`
`329`	`331`	`* messageID:唯一标识通知消息的 ID`
`330`	`332`	`*`
`@@ -334,11 +336,9 @@ export default class JPush {`
`334`	`336`	`*`
`335`	`337`	`* extras:对应 Portal 推送消息界面上的“可选设置”里的附加字段`
`336`	`338`	`*`
`337`		`- * notificationType：分为notificationArrived和notificationOpened两种`
	`339`	`+ * notificationEventType：分为notificationArrived和notificationOpened两种`
`338`	`340`	`*`
`339`		`- * 注意：1.应用在存活状态下点击通知不会有跳转行为，应用在被杀死状态下点击通知会启动应用`
`340`		`- * 2.请在JS的componentDidMount()中调用JPush.init()保证消息点击事件到达率`
`341`		`- * 3.请在Android的Application onCreate()中调用JPushModule.registerActivityLifecycle(this)保证应用后台点击通知能切到前台`
	`341`	`+ * 注意：应用在存活状态下点击通知不会有跳转行为，应用在被杀死状态下点击通知会启动应用`
`342`	`342`	`*`
`343`	`343`	`* */`
`344`	`344`	`static addNotificationListener(callback) {`
`@@ -351,7 +351,7 @@ export default class JPush {`
`351`	`351`	`/*`
`352`	`352`	`* 自定义消息事件`
`353`	`353`	`*`
`354`		`- * @param {Fucntion} callback = (result) => {"messageID":int，"content":StringArray,"extras":{String:String}}}`
	`354`	`+ * @param {Fucntion} callback = (result) => {"messageID":String，"content":String,"extras":{String:String}}}`
`355`	`355`	`*`
`356`	`356`	`* messageID:唯一标识自定义消息的 ID`
`357`	`357`	`*`
`@@ -378,7 +378,7 @@ export default class JPush {`
`378`	`378`	`/*`
`379`	`379`	`* tag alias事件`
`380`	`380`	`*`
`381`		`- * @param {Fucntion} callback = (result) => {"code":int,"sequence":int，"tags":StringArray,"tag":String,"tagEnable":boolean,"alias":String}`
	`381`	`+ * @param {Fucntion} callback = (result) => {"code":int,"sequence":int，"tags":String,"tag":String,"tagEnable":boolean,"alias":String}`
`382`	`382`	`*`
`383`	`383`	`* code:结果，0为操作成功`
`384`	`384`	`*`