diff --git a/package.json b/package.json index b725397..9e4c4d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "4.8.6", + "version": "5.0.3", "description": "JPush for cordova plugin", "cordova": { "id": "jpush-phonegap-plugin", @@ -23,7 +23,7 @@ ], "devDependencies": { "cordova-plugin-device": "*", - "cordova-plugin-jcore": ">=1.4.0" + "cordova-plugin-jcore": ">=4.2.2" }, "author": "JiGuang", "license": "MIT", diff --git a/plugin.xml b/plugin.xml index 0884448..8b92684 100644 --- a/plugin.xml +++ b/plugin.xml @@ -141,20 +141,7 @@ - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - @@ -279,10 +236,13 @@ - + - + @@ -290,6 +250,21 @@ + + + + + + + + + + + + + + extras) { if (instance == null) { diff --git a/src/android/libs/jpush-android-4.8.5.jar b/src/android/libs/jpush-android-4.8.5.jar deleted file mode 100644 index ec3dad5..0000000 Binary files a/src/android/libs/jpush-android-4.8.5.jar and /dev/null differ diff --git a/src/android/libs/jpush-android-5.0.3.jar b/src/android/libs/jpush-android-5.0.3.jar new file mode 100644 index 0000000..04a8417 Binary files /dev/null and b/src/android/libs/jpush-android-5.0.3.jar differ diff --git a/src/android/res/drawable-hdpi/jpush_btn_blue_bg.xml b/src/android/res/drawable-hdpi/jpush_btn_blue_bg.xml new file mode 100644 index 0000000..027cebf --- /dev/null +++ b/src/android/res/drawable-hdpi/jpush_btn_blue_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/android/res/drawable-hdpi/jpush_btn_grey_bg.xml b/src/android/res/drawable-hdpi/jpush_btn_grey_bg.xml new file mode 100644 index 0000000..d60ac61 --- /dev/null +++ b/src/android/res/drawable-hdpi/jpush_btn_grey_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/android/res/drawable-hdpi/jpush_cancel_btn_bg.xml b/src/android/res/drawable-hdpi/jpush_cancel_btn_bg.xml new file mode 100644 index 0000000..814e760 --- /dev/null +++ b/src/android/res/drawable-hdpi/jpush_cancel_btn_bg.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/src/android/res/drawable-hdpi/jpush_close.xml b/src/android/res/drawable-hdpi/jpush_close.xml new file mode 100644 index 0000000..697c141 --- /dev/null +++ b/src/android/res/drawable-hdpi/jpush_close.xml @@ -0,0 +1,19 @@ + + + + diff --git a/src/android/res/drawable-hdpi/jpush_contain_bg.xml b/src/android/res/drawable-hdpi/jpush_contain_bg.xml new file mode 100644 index 0000000..30d811f --- /dev/null +++ b/src/android/res/drawable-hdpi/jpush_contain_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/android/res/drawable-hdpi/jpush_interstitial_bg.xml b/src/android/res/drawable-hdpi/jpush_interstitial_bg.xml new file mode 100644 index 0000000..769b36d --- /dev/null +++ b/src/android/res/drawable-hdpi/jpush_interstitial_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/android/res/layout/jpush_banner.xml b/src/android/res/layout/jpush_banner.xml new file mode 100644 index 0000000..675c1bc --- /dev/null +++ b/src/android/res/layout/jpush_banner.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/android/res/layout/jpush_full.xml b/src/android/res/layout/jpush_full.xml new file mode 100644 index 0000000..8736f28 --- /dev/null +++ b/src/android/res/layout/jpush_full.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + diff --git a/src/android/res/layout/jpush_interstitial.xml b/src/android/res/layout/jpush_interstitial.xml new file mode 100644 index 0000000..b0bdcc9 --- /dev/null +++ b/src/android/res/layout/jpush_interstitial.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/JPushPlugin.js b/www/JPushPlugin.js index f491bd3..79b682c 100644 --- a/www/JPushPlugin.js +++ b/www/JPushPlugin.js @@ -369,6 +369,20 @@ JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data) { this.receiveMessage = JSON.parse(data); cordova.fireDocumentEvent("jpush.receiveMessage", this.receiveMessage); }; +JPushPlugin.prototype.receiveInAppMessageClickCallback = function(data) { + if (device.platform === "Android") { + data = JSON.stringify(data); + this.receiveMessage = JSON.parse(data); + cordova.fireDocumentEvent("jpush.receiveInAppMessageClick", this.receiveMessage); + } +}; +JPushPlugin.prototype.receiveInAppMessageShowCallback = function(data) { + if (device.platform === "Android") { + data = JSON.stringify(data); + this.receiveMessage = JSON.parse(data); + cordova.fireDocumentEvent("jpush.receiveInAppMessageShow", this.receiveMessage); + } +}; JPushPlugin.prototype.openNotificationInAndroidCallback = function(data) { data = JSON.stringify(data);