diff --git a/package.json b/package.json index fcc9e36..9f32cf2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "2.1.8", + "version": "2.2.0", "description": "JPush for cordova plugin", "cordova": { "id": "cn.jpush.phonegap.JPushPlugin", @@ -16,6 +16,7 @@ "keywords": [ "JPush", "push", + "Push", "ecosystem:cordova", "cordova-ios", "cordova-android" diff --git a/plugin.xml b/plugin.xml index b811de3..b84a7c7 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="2.2.0"> JPush Plugin JPush for cordova plugin @@ -174,12 +174,12 @@ - - - - - - + + + + + + diff --git a/src/android/arm64-v8a/libjpush213.so b/src/android/arm64-v8a/libjpush213.so deleted file mode 100644 index 171d0d3..0000000 Binary files a/src/android/arm64-v8a/libjpush213.so and /dev/null differ diff --git a/src/android/arm64-v8a/libjpush215.so b/src/android/arm64-v8a/libjpush215.so new file mode 100644 index 0000000..0220705 Binary files /dev/null and b/src/android/arm64-v8a/libjpush215.so differ diff --git a/src/android/armeabi-v7a/libjpush213.so b/src/android/armeabi-v7a/libjpush213.so deleted file mode 100644 index a05ab39..0000000 Binary files a/src/android/armeabi-v7a/libjpush213.so and /dev/null differ diff --git a/src/android/armeabi-v7a/libjpush215.so b/src/android/armeabi-v7a/libjpush215.so new file mode 100644 index 0000000..bed2a1b Binary files /dev/null and b/src/android/armeabi-v7a/libjpush215.so differ diff --git a/src/android/armeabi/libjpush213.so b/src/android/armeabi/libjpush213.so deleted file mode 100644 index 41f6042..0000000 Binary files a/src/android/armeabi/libjpush213.so and /dev/null differ diff --git a/src/android/armeabi/libjpush215.so b/src/android/armeabi/libjpush215.so new file mode 100644 index 0000000..9e76dc8 Binary files /dev/null and b/src/android/armeabi/libjpush215.so differ diff --git a/src/android/jpush-android-2.1.3.jar b/src/android/jpush-android-2.1.3.jar deleted file mode 100644 index 624624f..0000000 Binary files a/src/android/jpush-android-2.1.3.jar and /dev/null differ diff --git a/src/android/jpush-android-2.1.5.jar b/src/android/jpush-android-2.1.5.jar new file mode 100644 index 0000000..800ee7b Binary files /dev/null and b/src/android/jpush-android-2.1.5.jar differ diff --git a/src/android/x86/libjpush213.so b/src/android/x86/libjpush213.so deleted file mode 100644 index ccf405e..0000000 Binary files a/src/android/x86/libjpush213.so and /dev/null differ diff --git a/src/android/x86/libjpush215.so b/src/android/x86/libjpush215.so new file mode 100644 index 0000000..8a27c21 Binary files /dev/null and b/src/android/x86/libjpush215.so differ diff --git a/src/android/x86_64/libjpush213.so b/src/android/x86_64/libjpush213.so deleted file mode 100644 index cc9a1b6..0000000 Binary files a/src/android/x86_64/libjpush213.so and /dev/null differ diff --git a/src/android/x86_64/libjpush215.so b/src/android/x86_64/libjpush215.so new file mode 100644 index 0000000..f9f0e56 Binary files /dev/null and b/src/android/x86_64/libjpush215.so differ diff --git a/src/ios/Plugins/JPushPlugin.m b/src/ios/Plugins/JPushPlugin.m index c83c180..c24ce44 100644 --- a/src/ios/Plugins/JPushPlugin.m +++ b/src/ios/Plugins/JPushPlugin.m @@ -16,7 +16,7 @@ static NSString *const JP_APP_CHANNEL = @"CHANNEL"; static NSString *const JP_APP_ISPRODUCTION = @"IsProduction"; static NSString *const JP_APP_ISIDFA = @"IsIDFA"; static NSString *const JPushConfigFileName = @"PushConfig"; -static NSDictionary *_luanchOptions = nil; +static NSDictionary *_launchOptions = nil; @implementation JPushPlugin @@ -92,8 +92,8 @@ static NSDictionary *_luanchOptions = nil; name:kJPushPluginReceiveNotification object:nil]; - if (_luanchOptions) { - NSDictionary *userInfo = [_luanchOptions + if (_launchOptions) { + NSDictionary *userInfo = [_launchOptions valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey]; if ([userInfo count] >0) { NSError *error; @@ -261,7 +261,7 @@ static NSDictionary *_luanchOptions = nil; #pragma mark- 内部方法 +(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{ - _luanchOptions = theLaunchOptions; + _launchOptions = theLaunchOptions; [JPUSHService setDebugMode]; @@ -289,7 +289,7 @@ static NSDictionary *_luanchOptions = nil; if(isIDFA){ advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString]; } - [JPUSHService setupWithOption:_luanchOptions + [JPUSHService setupWithOption:_launchOptions appKey:appkey channel:channel apsForProduction:[isProduction boolValue]