Merge branch 'dev'

plugin.xml

@@ -57,6 +57,7 @@
         <framework src="Security.framework" weak="true" />
         <framework src="AudioToolbox.framework" weak="true" />
         <framework src="MobileCoreServices.framework" weak="true" />
+        <framework src="UserNotifications.framework" weak="true" />
         <framework src="libz.tbd"/>
         <framework src="libsqlite3.0.tbd"/>
         <framework src="libresolv.tbd"/>

src/ios/Plugins/ConstantDef.h

@@ -15,6 +15,10 @@
 #define Plugin_Push_Name @"window.plugins.jPushPlugin"
 
 
+#define kJPushPluginReceiveNotification @"JPushPluginReceiveNofication"
+#define kJPushPluginiOS10ForegroundReceiveNotification @"kJPushPluginiOS10ForegroundReceiveNotification"
+#define kJPushPluginiOS10ClickNotification @"kJPushPluginiOS10ClickNotification"
+
 
 #define kJJMessageReceiveMessage @"kJJMessageReceiveMessage"
 #define kJJMessageSendMessageRespone @"kJJMessageSendMessageRespone"

src/ios/Plugins/JMessageHelper.m

@@ -15,6 +15,11 @@
 #import "JMessageHelper.h"
 #import "ConstantDef.h"
 #import <objc/runtime.h>
+#import <UserNotifications/UserNotifications.h>
+
+@interface JMessageHelper ()<JPUSHRegisterDelegate>
+
+@end
 
 @implementation JMessageHelper
 
@@ -36,14 +41,37 @@ -(void)initJMessage:(NSDictionary*)launchOptions{
                      appKey:appkey
                     channel:channel apsForProduction:NO
                    category:nil];
-    [JPUSHService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
-                                                      UIUserNotificationTypeSound |
-                                                      UIUserNotificationTypeAlert)
-                                          categories:nil];
+
+    JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init];
+    entity.types = UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound;
+    [JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
+
     [self registerJPushStatusNotification];
+}
+
+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{
 
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:notification.request.content.userInfo];
+
+    [userInfo setValue:kJPushPluginiOS10ForegroundReceiveNotification forKey:@"JPushNotificationType"];
+
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginiOS10ForegroundReceiveNotification object:userInfo];
+
+    completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert);
 }
 
+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:response.notification.request.content.userInfo];
+    @try {
+        [userInfo setValue:[response valueForKey:@"userText"] forKey:@"userText"];
+    } @catch (NSException *exception) { }
+    [userInfo setValue:response.actionIdentifier forKey:@"actionIdentifier"];
+    [userInfo setValue:kJPushPluginiOS10ClickNotification forKey:@"JPushNotificationType"];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginiOS10ClickNotification object:userInfo];
+    completionHandler();
+}
+
+
 - (void)registerJPushStatusNotification{
     NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
 

src/ios/Plugins/JMessagePlugin.m

@@ -91,8 +91,21 @@ -(void)initNotifications {
 
     [defaultCenter addObserver:self
                       selector:@selector(networkDidReceiveNotification:)
-                          name:kJJPushReceiveNotification
+                          name:kJPushPluginReceiveNotification
                         object:nil];
+
+    [defaultCenter addObserver:self
+                      selector:@selector(networkDidReceiveNotification:)
+                          name:kJPushPluginiOS10ForegroundReceiveNotification
+                        object:nil];
+
+    [defaultCenter addObserver:self
+                      selector:@selector(networkDidReceiveNotification:)
+                          name:kJPushPluginiOS10ClickNotification
+                        object:nil];
+
+
+
     [defaultCenter addObserver:self
                       selector:@selector(unreadChanged:)
                           name:kJJMessageUnreadChanged