diff --git a/README.md b/README.md index 311110a..0c82b4e 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ >注意:插件从 v3.4.0 开始支持 cordova-android 7.0.0,因 cordova-android 7.0.0 修改了 Android 项目结构,因此不兼容之前的版本,升级前请务必注意。 > ->如果需要安装之前版本的插件,请先安装 v1.2.0 以下版本(建议安装 v1.1.12)的 [cordova-plugin-jcore](https://github.com/jpush/cordova-plugin-jcore),再安装旧版本插件(比如 v3.3.2),否则运行会报错。 -> >如果需要在cordova-android 7.0.0之前版本集成最新插件,参照[这篇文章](https://www.jianshu.com/p/23b117ca27a6) > +>如果需要安装之前版本的插件,请先安装 v1.2.0 以下版本(建议安装 v1.1.12)的 [cordova-plugin-jcore](https://github.com/jpush/cordova-plugin-jcore),再安装旧版本插件(比如 v3.3.2),否则运行会报错。 +> >[Cordova Android版本与原生版本对应表](http://cordova.apache.org/docs/en/latest/guide/platforms/android/index.html#requirements-and-support) ## Install diff --git a/package.json b/package.json index 7d5fa04..63bf9fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "3.4.7", + "version": "3.5.0", "description": "JPush for cordova plugin", "cordova": { "id": "jpush-phonegap-plugin", diff --git a/plugin.xml b/plugin.xml index 4b878bf..f66d8ad 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="3.5.0"> JPush JPush for cordova plugin @@ -85,40 +85,20 @@ - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + android:enabled="true"> @@ -154,18 +157,46 @@ - - - + + - + + - + - + + + + + + + + + + + + + + + + + + + + + + @@ -179,34 +210,17 @@ - - - - - - - - - - - - - + - - - + + + diff --git a/src/android/libs/jpush-android-3.1.6.jar b/src/android/libs/jpush-android-3.1.6.jar deleted file mode 100755 index daf9720..0000000 Binary files a/src/android/libs/jpush-android-3.1.6.jar and /dev/null differ diff --git a/src/android/libs/jpush-android-3.1.7.jar b/src/android/libs/jpush-android-3.1.7.jar new file mode 100755 index 0000000..bf0a170 Binary files /dev/null and b/src/android/libs/jpush-android-3.1.7.jar differ diff --git a/src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml b/src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml old mode 100644 new mode 100755 diff --git a/src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml b/src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml old mode 100644 new mode 100755 diff --git a/src/android/res/layout/jpush_popwin_layout.xml b/src/android/res/layout/jpush_popwin_layout.xml old mode 100644 new mode 100755 diff --git a/src/android/res/layout/jpush_webview_layout.xml b/src/android/res/layout/jpush_webview_layout.xml old mode 100644 new mode 100755 diff --git a/src/android/res/values/jpush_style.xml b/src/android/res/values/jpush_style.xml old mode 100644 new mode 100755