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.1.3-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-3.1.5-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)
 
@@ -69,7 +69,7 @@ Android 的推送通过长连接的方式实现，只有在连接保持的情况
 #### 打包时遇到 i386 打包失败怎么办？
 
 ```
-cordova platform update ios 
+cordova platform update ios
 ```
 
 #### ionic 2 如何调用 API？

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jpush-phonegap-plugin",
-    "version": "3.1.4",
+    "version": "3.1.5",
     "description": "JPush for cordova plugin",
     "cordova": {
         "id": "jpush-phonegap-plugin",
@@ -27,7 +27,7 @@
     }],
     "peerDependencies": {
         "cordova-plugin-device": ">=1.0.0",
-        "cordova-plugin-jcore": "1.1.2"
+        "cordova-plugin-jcore": "1.1.4"
     },
     "author": "JiGuang",
     "license": "MIT",

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="jpush-phonegap-plugin"
-  version="3.1.4">
+  version="3.1.5">
 
     <name>JPush</name>
     <description>JPush for cordova plugin</description>
@@ -38,7 +38,7 @@
         <source-file src="src/ios/Plugins/AppDelegate+JPush.m" />
 
         <header-file src="src/ios/lib/JPUSHService.h" />
-        <source-file src="src/ios/lib/jpush-ios-3.0.2.a" framework="true" />
+        <source-file src="src/ios/lib/jpush-ios-3.0.5.a" framework="true" />
         <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />
@@ -186,7 +186,7 @@
             <meta-data android:name="JPUSH_APPKEY" android:value="$APP_KEY" />
         </config-file>
 
-        <source-file src="src/android/libs/jpush-android_v3.0.5.jar" target-dir="libs" />
+        <source-file src="src/android/libs/jpush-android_v3.0.6.jar" target-dir="libs" />
 
         <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" />

src/android/libs/jpush-android_v3.0.5.jar

@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 3.0.2
+#define JPUSH_VERSION_NUMBER 3.0.5
 
 #import <Foundation/Foundation.h>
 
@@ -456,7 +456,7 @@ callbackSelector:(SEL)cbSelector
  *
  * SDK 默认开启的日志级别为: Info. 只显示必要的信息, 不打印调试日志.
  *
- * 调用本接口可打开日志级别为: Debug, 打印调试日志.
+ * 请在SDK启动后调用本接口，调用本接口可打开日志级别为: Debug, 打印调试日志.
  */
 + (void)setDebugMode;