diff --git a/README.md b/README.md index 005dab8..d4f86ef 100644 --- a/README.md +++ b/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) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jpush/jpush-phonegap-plugin) -[![release](https://img.shields.io/badge/release-2.1.4-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases) +[![release](https://img.shields.io/badge/release-2.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) diff --git a/package.json b/package.json index 6454456..59781b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "2.1.6", + "version": "2.1.7", "description": "JPush for cordova plugin", "cordova": { "id": "cn.jpush.phonegap.JPushPlugin", diff --git a/plugin.xml b/plugin.xml index 342682b..d37581a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="2.1.7"> JPush Plugin JPush for cordova plugin @@ -95,6 +95,13 @@ + + + + + @@ -177,5 +185,14 @@ + + + + + + + + + diff --git a/src/android/MyReceiver.java b/src/android/MyReceiver.java index 5e35039..bcea33a 100644 --- a/src/android/MyReceiver.java +++ b/src/android/MyReceiver.java @@ -30,6 +30,10 @@ public class MyReceiver extends BroadcastReceiver { handlingNotificationReceive(context, intent); } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(action)) { handlingNotificationOpen(context, intent); + } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(action)) { + // 当在 HTML 页面中调用 JPushWeb.triggerNativeAction(String params) 方法时触发此方法, + // 再进行相关的操作。 + } else { Log.d(TAG, "Unhandled intent - " + action); } diff --git a/src/android/ic_richpush_actionbar_back.png b/src/android/ic_richpush_actionbar_back.png new file mode 100644 index 0000000..c9f4e4d Binary files /dev/null and b/src/android/ic_richpush_actionbar_back.png differ diff --git a/src/android/ic_richpush_actionbar_divider.png b/src/android/ic_richpush_actionbar_divider.png new file mode 100644 index 0000000..f289651 Binary files /dev/null and b/src/android/ic_richpush_actionbar_divider.png differ diff --git a/src/android/jpush_popwin_layout.xml b/src/android/jpush_popwin_layout.xml new file mode 100644 index 0000000..f43e478 --- /dev/null +++ b/src/android/jpush_popwin_layout.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/src/android/jpush_style.xml b/src/android/jpush_style.xml new file mode 100644 index 0000000..81dfdbb --- /dev/null +++ b/src/android/jpush_style.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/src/android/jpush_webview_layout.xml b/src/android/jpush_webview_layout.xml new file mode 100644 index 0000000..19faa43 --- /dev/null +++ b/src/android/jpush_webview_layout.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/richpush_btn_selector.xml b/src/android/richpush_btn_selector.xml new file mode 100644 index 0000000..4750de9 --- /dev/null +++ b/src/android/richpush_btn_selector.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + \ No newline at end of file