diff --git a/README.md b/README.md index eebf525..59b553b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin) [![QQ Group](https://img.shields.io/badge/QQ%20Group-413602425-red.svg)]() -[![release](https://img.shields.io/badge/release-3.0.2-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases) +[![release](https://img.shields.io/badge/release-3.0.3-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases) [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jpush-phonegap-plugin) [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1) @@ -17,15 +17,15 @@ - 通过 Cordova Plugins 安装，要求 Cordova CLI 5.0+： - cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey + cordova plugin add jpush-phonegap-plugin --variable APP_KEY=your_jpush_appkey - 或直接通过 url 安装： - cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable API_KEY=your_jpush_appkey + cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable APP_KEY=your_jpush_appkey - 或下载到本地安装： - cordova plugin add Your_Plugin_Path --variable API_KEY=your_jpush_appkey + cordova plugin add Your_Plugin_Path --variable APP_KEY=your_jpush_appkey ## Usage diff --git a/package.json b/package.json index bf6a719..912cf0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "3.0.2", + "version": "3.0.3", "description": "JPush for cordova plugin", "cordova": { "id": "jpush-phonegap-plugin", diff --git a/plugin.xml b/plugin.xml index ce097a7..83ac96d 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="3.0.3"> JPush Plugin JPush for cordova plugin @@ -10,7 +10,7 @@ JPush,push MIT License - + @@ -39,7 +39,7 @@ - + @@ -54,9 +54,8 @@ - - - $API_KEY + + $APP_KEY @@ -81,8 +80,10 @@ - + + - + @@ -173,16 +176,16 @@ - + - - - - - - - + + + + + + + diff --git a/src/android/libs/arm64-v8a/libjcore100.so b/src/android/libs/arm64-v8a/libjcore110.so similarity index 99% rename from src/android/libs/arm64-v8a/libjcore100.so rename to src/android/libs/arm64-v8a/libjcore110.so index a3b9a27..6939067 100644 Binary files a/src/android/libs/arm64-v8a/libjcore100.so and b/src/android/libs/arm64-v8a/libjcore110.so differ diff --git a/src/android/libs/armeabi-v7a/libjcore100.so b/src/android/libs/armeabi-v7a/libjcore110.so similarity index 99% rename from src/android/libs/armeabi-v7a/libjcore100.so rename to src/android/libs/armeabi-v7a/libjcore110.so index 48361ed..9806be4 100644 Binary files a/src/android/libs/armeabi-v7a/libjcore100.so and b/src/android/libs/armeabi-v7a/libjcore110.so differ diff --git a/src/android/libs/armeabi/libjcore100.so b/src/android/libs/armeabi/libjcore110.so similarity index 99% rename from src/android/libs/armeabi/libjcore100.so rename to src/android/libs/armeabi/libjcore110.so index 2ccf40b..4ade21b 100644 Binary files a/src/android/libs/armeabi/libjcore100.so and b/src/android/libs/armeabi/libjcore110.so differ diff --git a/src/android/libs/jcore-android_v1.0.0.jar b/src/android/libs/jcore-android_v1.0.0.jar deleted file mode 100644 index bae85d6..0000000 Binary files a/src/android/libs/jcore-android_v1.0.0.jar and /dev/null differ diff --git a/src/android/libs/jcore-android_v1.1.0.jar b/src/android/libs/jcore-android_v1.1.0.jar new file mode 100644 index 0000000..1a24597 Binary files /dev/null and b/src/android/libs/jcore-android_v1.1.0.jar differ diff --git a/src/android/libs/jpush-android_v3.0.0.jar b/src/android/libs/jpush-android_v3.0.0.jar deleted file mode 100644 index 77ce508..0000000 Binary files a/src/android/libs/jpush-android_v3.0.0.jar and /dev/null differ diff --git a/src/android/libs/jpush-android_v3.0.1.jar b/src/android/libs/jpush-android_v3.0.1.jar new file mode 100644 index 0000000..ff4f27d Binary files /dev/null and b/src/android/libs/jpush-android_v3.0.1.jar differ diff --git a/src/android/libs/x86/libjcore100.so b/src/android/libs/x86/libjcore110.so similarity index 99% rename from src/android/libs/x86/libjcore100.so rename to src/android/libs/x86/libjcore110.so index c461fc1..9ea20cf 100644 Binary files a/src/android/libs/x86/libjcore100.so and b/src/android/libs/x86/libjcore110.so differ diff --git a/src/android/libs/x86_64/libjcore100.so b/src/android/libs/x86_64/libjcore110.so similarity index 99% rename from src/android/libs/x86_64/libjcore100.so rename to src/android/libs/x86_64/libjcore110.so index 69860f8..9118e48 100644 Binary files a/src/android/libs/x86_64/libjcore100.so and b/src/android/libs/x86_64/libjcore110.so differ diff --git a/src/ios/PushConfig.plist b/src/ios/JPushConfig.plist similarity index 81% rename from src/ios/PushConfig.plist rename to src/ios/JPushConfig.plist index ed5d3e9..e5a23bf 100644 --- a/src/ios/PushConfig.plist +++ b/src/ios/JPushConfig.plist @@ -3,9 +3,9 @@ Appkey - 1c29cb5814072b5b1f8ef829 + Channel - Subscription + channel name IsProduction IsIDFA diff --git a/src/ios/Plugins/AppDelegate+JPush.m b/src/ios/Plugins/AppDelegate+JPush.m index 21cb7eb..862b1e7 100644 --- a/src/ios/Plugins/AppDelegate+JPush.m +++ b/src/ios/Plugins/AppDelegate+JPush.m @@ -31,15 +31,26 @@ NSDictionary *_launchOptions; -(void)applicationDidLaunch:(NSNotification *)notification{ + if (notification) { if (notification.userInfo) { NSDictionary *userInfo1 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey]; if (userInfo1.count > 0) { - [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo1 toJsonString]]; + [NSTimer scheduledTimerWithTimeInterval:0.1 repeats:YES block:^(NSTimer * _Nonnull timer) { + if (SharedJPushPlugin) { + [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo1 toJsonString]]; + [timer invalidate]; + } + }]; } NSDictionary *userInfo2 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey]; if (userInfo2.count > 0) { - [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_StartLocalNotification jsString:[userInfo1 toJsonString]]; + [NSTimer scheduledTimerWithTimeInterval:0.1 repeats:YES block:^(NSTimer * _Nonnull timer) { + if (SharedJPushPlugin) { + [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo2 toJsonString]]; + [timer invalidate]; + } + }]; } } [JPUSHService setDebugMode]; @@ -91,7 +102,7 @@ NSDictionary *_launchOptions; -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{ [JPUSHService handleRemoteNotification:userInfo]; - [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]]; + [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]]; } -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{ @@ -110,30 +121,23 @@ NSDictionary *_launchOptions; default: break; } - [SharedJPushPlugin jpushFireDocumentEvent:eventName jsString:[userInfo toJsonString]]; + [JPushPlugin fireDocumentEvent:eventName jsString:[userInfo toJsonString]]; completionHandler(UIBackgroundFetchResultNewData); } -(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{ NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:notification.request.content.userInfo]; - - if ([SharedJPushPlugin respondsToSelector:@selector(jpushFireDocumentEvent:jsString:)]) { - - } - [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]]; + [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]]; completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert); } -(void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{ - if ([SharedJPushPlugin respondsToSelector:@selector(jpushFireDocumentEvent:jsString:)]) { - - } 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"]; - [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo toJsonString]]; + [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo toJsonString]]; completionHandler(); } diff --git a/src/ios/Plugins/JPushDefine.h b/src/ios/Plugins/JPushDefine.h index 02e59af..357b0ad 100644 --- a/src/ios/Plugins/JPushDefine.h +++ b/src/ios/Plugins/JPushDefine.h @@ -15,7 +15,7 @@ #define WEAK_SELF(weakSelf) __weak __typeof(&*self)weakSelf = self; -static NSString *const JPushConfig_FileName = @"PushConfig"; +static NSString *const JPushConfig_FileName = @"JPushConfig"; static NSString *const JPushConfig_Appkey = @"Appkey"; static NSString *const JPushConfig_Channel = @"Channel"; static NSString *const JPushConfig_IsProduction = @"IsProduction"; diff --git a/src/ios/Plugins/JPushPlugin.h b/src/ios/Plugins/JPushPlugin.h index 1befbfd..daf08b2 100644 --- a/src/ios/Plugins/JPushPlugin.h +++ b/src/ios/Plugins/JPushPlugin.h @@ -75,7 +75,7 @@ # pragma mark - private --(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString; ++(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString; +(void)setupJPushSDK:(NSDictionary*)userInfo; diff --git a/src/ios/Plugins/JPushPlugin.m b/src/ios/Plugins/JPushPlugin.m index 8f6f1b3..9c15fc6 100644 --- a/src/ios/Plugins/JPushPlugin.m +++ b/src/ios/Plugins/JPushPlugin.m @@ -90,10 +90,8 @@ object:nil]; } --(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{ - dispatch_async(dispatch_get_main_queue(), ^{ - [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]]; - }); ++(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{ + [SharedJPushPlugin.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]]; } -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{ @@ -322,12 +320,12 @@ @"tags" :tags == nil ? [NSNull null] : [tags allObjects], @"alias" :alias == nil ? [NSNull null] : alias }; - [self jpushFireDocumentEvent:JPushDocumentEvent_SetTagsWithAlias jsString:[dict toJsonString]]; + [JPushPlugin fireDocumentEvent:JPushDocumentEvent_SetTagsWithAlias jsString:[dict toJsonString]]; } - (void)networkDidReceiveMessage:(NSNotification *)notification { if (notification && notification.userInfo) { - [self jpushFireDocumentEvent:JPushDocumentEvent_ReceiveMessage jsString:[notification.userInfo toJsonString]]; + [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveMessage jsString:[notification.userInfo toJsonString]]; } }