diff --git a/package.json b/package.json index ad6b404..99c3a9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "3.8.2", + "version": "3.8.3", "description": "JPush for cordova plugin", "cordova": { "id": "jpush-phonegap-plugin", diff --git a/plugin.xml b/plugin.xml index e5a8199..2a96ee8 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="3.8.3"> JPush JPush for cordova plugin @@ -49,7 +49,7 @@ - + @@ -107,9 +107,11 @@ - + + + @@ -117,9 +119,16 @@ + android:name="cn.jpush.android.ui.PopWinActivity" + android:exported="true" + android:theme="@style/MyDialogStyle" > + + + + + + + @@ -140,7 +149,8 @@ + android:enabled="true" + android:exported="false"> @@ -187,7 +197,7 @@ - + @@ -215,18 +225,33 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -238,7 +263,20 @@ - + + + + + + + + - + @@ -283,6 +321,8 @@ target="res/drawable-hdpi/jpush_ic_action_close.png" /> + @@ -296,6 +336,8 @@ target="res/layout/push_notification_middle.xml" /> + @@ -311,5 +353,7 @@ + diff --git a/src/android/JPushPlugin.java b/src/android/JPushPlugin.java index 39ce64f..d62ca8e 100644 --- a/src/android/JPushPlugin.java +++ b/src/android/JPushPlugin.java @@ -247,6 +247,7 @@ public class JPushPlugin extends CordovaPlugin { } void init(JSONArray data, CallbackContext callbackContext) { + JPushInterface.setNotificationCallBackEnable(mContext, true); JPushInterface.init(mContext); } diff --git a/src/android/libs/jpush-android-4.2.8.jar b/src/android/libs/jpush-android-4.2.8.jar deleted file mode 100755 index f6ab268..0000000 Binary files a/src/android/libs/jpush-android-4.2.8.jar and /dev/null differ diff --git a/src/android/libs/jpush-android-4.7.2.jar b/src/android/libs/jpush-android-4.7.2.jar new file mode 100644 index 0000000..9ae265f Binary files /dev/null and b/src/android/libs/jpush-android-4.7.2.jar differ diff --git a/src/android/res/drawable-hdpi/jpush_btn_bg_green_playable.xml b/src/android/res/drawable-hdpi/jpush_btn_bg_green_playable.xml new file mode 100644 index 0000000..f79de52 --- /dev/null +++ b/src/android/res/drawable-hdpi/jpush_btn_bg_green_playable.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/src/android/res/layout/jpush_popwin_layout.xml b/src/android/res/layout/jpush_popwin_layout.xml index f43e478..c472c3a 100755 --- a/src/android/res/layout/jpush_popwin_layout.xml +++ b/src/android/res/layout/jpush_popwin_layout.xml @@ -5,7 +5,7 @@ style="@style/MyDialogStyle" android:orientation="vertical" android:layout_width="280dp" - android:layout_height="250dp" > + android:layout_height="380dp" > - + android:background="#000000" />--> \ No newline at end of file diff --git a/src/android/res/layout/push_download_notification_layout.xml b/src/android/res/layout/push_download_notification_layout.xml new file mode 100644 index 0000000..c7495d6 --- /dev/null +++ b/src/android/res/layout/push_download_notification_layout.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/android/res/values/jpush_style.xml b/src/android/res/values/jpush_style.xml index 81dfdbb..c69df39 100755 --- a/src/android/res/values/jpush_style.xml +++ b/src/android/res/values/jpush_style.xml @@ -10,4 +10,13 @@ @android:style/Animation.Dialog true + \ No newline at end of file diff --git a/src/android/res/xml/jpush_file_paths.xml b/src/android/res/xml/jpush_file_paths.xml new file mode 100644 index 0000000..8b1f242 --- /dev/null +++ b/src/android/res/xml/jpush_file_paths.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file