Merge remote-tracking branch 'refs/remotes/origin/dev'

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"

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cn.jpush.phonegap.JPushPlugin"
-        version="2.1.8">
+        version="2.2.0">
 
     <name>JPush Plugin</name>
     <description>JPush for cordova plugin</description>
@@ -174,12 +174,12 @@
             <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY"/>
         </config-file>
 
-        <source-file src="src/android/jpush-android-2.1.3.jar" target-dir="libs"/>
-        <source-file src="src/android/armeabi/libjpush213.so" target-dir="libs/armeabi"/>
-        <source-file src="src/android/armeabi-v7a/libjpush213.so" target-dir="libs/armeabi-v7a"/>
-        <source-file src="src/android/arm64-v8a/libjpush213.so" target-dir="libs/arm64-v8a"/>
-        <source-file src="src/android/x86/libjpush213.so" target-dir="libs/x86"/>
-        <source-file src="src/android/x86_64/libjpush213.so" target-dir="libs/x86_64"/>
+        <source-file src="src/android/jpush-android-2.1.5.jar" target-dir="libs"/>
+        <source-file src="src/android/armeabi/libjpush215.so" target-dir="libs/armeabi"/>
+        <source-file src="src/android/armeabi-v7a/libjpush215.so" target-dir="libs/armeabi-v7a"/>
+        <source-file src="src/android/arm64-v8a/libjpush215.so" target-dir="libs/arm64-v8a"/>
+        <source-file src="src/android/x86/libjpush215.so" target-dir="libs/x86"/>
+        <source-file src="src/android/x86_64/libjpush215.so" target-dir="libs/x86_64"/>
 
         <!--<source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>-->
         <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap"/>

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]