public/jpush-phonegap-plugin
9
0
Fork 0
forked from github/jpush-phonegap-plugin
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #335 from jpush/dev

Browse Source 
Dev
This commit is contained in:
huangminlinux
2018-04-16 15:15:14 +08:00
committed by GitHub
parent 6c80b47bad 2d71db888f
commit a0e408f05f
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ios/Plugins/AppDelegate+JPush.m
+17 -19
View File
@@ -51,11 +51,11 @@ NSDictionary *_launchOptions;
if ([notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey]) {
UILocalNotification *localNotification = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey];
NSDictionary* localNotificationEvent = @{@"content":localNotification.alertBody,
@"badge": @(localNotification.applicationIconBadgeNumber),
@"extras":localNotification.userInfo,
};
NSMutableDictionary *localNotificationEvent = @{}.mutableCopy;
localNotificationEvent[@"content"] = localNotification.alertBody;
localNotificationEvent[@"badge"] = @(localNotification.applicationIconBadgeNumber);
localNotificationEvent[@"extras"] = localNotification.userInfo;
[JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[localNotificationEvent toJsonString]];
}
}
@@ -158,10 +158,9 @@ NSDictionary *_launchOptions;
userInfo = [self jpushFormatAPNSDic:notification.request.content.userInfo];
} else {
UNNotificationContent *content = notification.request.content;
userInfo = [NSMutableDictionary dictionaryWithDictionary:@{@"content": content.body,
@"badge": content.badge,
@"extras": content.userInfo
}];
userInfo[@"content"] = content.body;
userInfo[@"badge"] = content.badge;
userInfo[@"extras"] = content.userInfo;
userInfo[@"identifier"] = notification.request.identifier;
}
@@ -177,16 +176,15 @@ NSDictionary *_launchOptions;
-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{
UNNotification *notification = response.notification;
NSMutableDictionary *userInfo = nil;
NSMutableDictionary *userInfo = @{}.mutableCopy;
if ([notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
userInfo = [self jpushFormatAPNSDic:notification.request.content.userInfo];
} else {
UNNotificationContent *content = notification.request.content;
userInfo = [NSMutableDictionary dictionaryWithDictionary:@{@"content": content.body,
@"badge": content.badge,
@"extras": content.userInfo
}];
userInfo[@"content"] = content.body;
userInfo[@"badge"] = content.badge;
userInfo[@"extras"] = content.userInfo;
userInfo[@"identifier"] = notification.request.identifier;
}
@@ -195,12 +193,12 @@ NSDictionary *_launchOptions;
}
- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
NSDictionary* localNotificationEvent = @{@"content":notification.alertBody,
@"badge": @(notification.applicationIconBadgeNumber),
@"extras":notification.userInfo,
};
NSMutableDictionary *localNotificationEvent = @{}.mutableCopy;
localNotificationEvent[@"content"] = notification.alertBody;
localNotificationEvent[@"badge"] = @(notification.applicationIconBadgeNumber);
localNotificationEvent[@"extras"] = notification.userInfo;
[[NSNotificationCenter defaultCenter] postNotificationName:JPushDocumentEvent_ReceiveLocalNotification object:localNotificationEvent];
[[NSNotificationCenter defaultCenter] postNotificationName:JPushDocumentEvent_ReceiveLocalNotification object:localNotificationEvent];
}
- (void)applicationWillEnterForeground:(UIApplication *)application {
www/JPushPlugin.js
+1 -1
View File
@@ -353,7 +353,7 @@ JPushPlugin.prototype.reportNotificationOpened = function (msgID) {
/**
* 用于在 Android 6.0 及以上系统，申请一些权限
* 具体可看：http://docs.jpush.io/client/android_api/#android-60
* 具体可看：https://docs.jiguang.cn/jpush/client/Android/android_api/#android-60
*/
JPushPlugin.prototype.requestPermission = function () {
if (device.platform === 'Android') {