Merge branch 'dev'

Author: lhw5123

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

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",

plugin.xml

@@ -2,15 +2,15 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="jpush-phonegap-plugin"
-  version="3.0.2">
+  version="3.0.3">
 
     <name>JPush Plugin</name>
     <description>JPush for cordova plugin</description>
     <author>JPush</author>
     <keywords>JPush,push</keywords>
     <license>MIT License</license>
 
-    <preference name="API_KEY" />
+    <preference name="APP_KEY" />
 
     <engines>
         <engine name="cordova" version=">=3.0" />
@@ -39,7 +39,7 @@
         <header-file src="src/ios/lib/JPUSHService.h" />
         <source-file src="src/ios/lib/jpush-ios-3.0.0.a" framework="true" />
         <source-file src="src/ios/lib/jcore-ios-1.0.0.a" framework="true" />
-        <resource-file src="src/ios/PushConfig.plist" />
+        <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />
         <framework src="CoreFoundation.framework" weak="true" />
@@ -54,9 +54,8 @@
         <framework src="UserNotifications.framework" weak="true" />
         <framework src="libresolv.tbd" weak="true" />
 
-
-        <config-file target="*PushConfig.plist" parent="Appkey">
-            <string>$API_KEY</string>
+        <config-file target="*JPushConfig.plist" parent="Appkey">
+            <string>$APP_KEY</string>
         </config-file>
     </platform>
 
@@ -81,8 +80,10 @@
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
             <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
             <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-            <permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
+            <permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
+               android:protectionLevel="signature" />
         </config-file>
+
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <!-- Required SDK核心功能-->
             <activity android:name="cn.jpush.android.ui.PushActivity"
@@ -140,7 +141,9 @@
 
             <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
             <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
-            <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true">
+            <service android:name="cn.jpush.android.service.DaemonService"
+               android:enabled="true"
+               android:exported="true">
                 <intent-filter>
                     <action android:name="cn.jpush.android.intent.DaemonService" />
                     <category android:name="$PACKAGE_NAME" />
@@ -173,16 +176,16 @@
             <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
             <!-- Required. Enable it you can get statistics data with channel -->
             <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
-            <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY" />
+            <meta-data android:name="JPUSH_APPKEY" android:value="$APP_KEY" />
         </config-file>
 
-        <source-file src="src/android/libs/jpush-android_v3.0.0.jar" target-dir="libs" />
-        <source-file src="src/android/libs/jcore-android_v1.0.0.jar" target-dir="libs" />
-        <source-file src="src/android/libs/armeabi/libjcore100.so" target-dir="libs/armeabi" />
-        <source-file src="src/android/libs/armeabi-v7a/libjcore100.so" target-dir="libs/armeabi-v7a" />
-        <source-file src="src/android/libs/arm64-v8a/libjcore100.so" target-dir="libs/arm64-v8a" />
-        <source-file src="src/android/libs/x86/libjcore100.so" target-dir="libs/x86" />
-        <source-file src="src/android/libs/x86_64/libjcore100.so" target-dir="libs/x86_64" />
+        <source-file src="src/android/libs/jpush-android_v3.0.1.jar" target-dir="libs" />
+        <source-file src="src/android/libs/jcore-android_v1.1.0.jar" target-dir="libs" />
+        <source-file src="src/android/libs/armeabi/libjcore110.so" target-dir="libs/armeabi" />
+        <source-file src="src/android/libs/armeabi-v7a/libjcore110.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="src/android/libs/arm64-v8a/libjcore110.so" target-dir="libs/arm64-v8a" />
+        <source-file src="src/android/libs/x86/libjcore110.so" target-dir="libs/x86" />
+        <source-file src="src/android/libs/x86_64/libjcore110.so" target-dir="libs/x86_64" />
 
         <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap" />
         <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap" />