From 40c98f4f04699baef6141a0c13f2aaa18d7acf22 Mon Sep 17 00:00:00 2001 From: Hevin <328066446@qq.com> Date: Sat, 12 Mar 2016 22:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/android/JPushPlugin.java | 61 +++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/src/android/JPushPlugin.java b/src/android/JPushPlugin.java index e5d3bc1..43a6403 100644 --- a/src/android/JPushPlugin.java +++ b/src/android/JPushPlugin.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.app.Notification; import android.content.ComponentName; import android.content.Intent; +import android.content.Context; import android.util.Log; import __PACKAGE_NAME__.R; @@ -82,7 +83,9 @@ public class JPushPlugin extends CordovaPlugin { public void initialize(CordovaInterface cordova, CordovaWebView webView) { super.initialize(cordova, webView); - Log.i(TAG, "---------------- initialize" + "-" + JPushPlugin.openNotificationAlert + "-" + JPushPlugin.notificationAlert); + Log.i(TAG, "---------------- initialize" + "-" + + JPushPlugin.openNotificationAlert + "-" + + JPushPlugin.notificationAlert); cordovaActivity = this.cordova.getActivity(); @@ -104,15 +107,17 @@ public class JPushPlugin extends CordovaPlugin { Log.i(TAG, "---------------- onPause"); shouldCacheMsg = true; if (isStatisticsOpened) { - JPushInterface.onPause(this.cordova.getActivity()); + JPushInterface.onPause(cordovaActivity); } } public void onResume(boolean multitasking) { shouldCacheMsg = false; - Log.i(TAG, "---------------- onResume" + "-" + JPushPlugin.openNotificationAlert + "-" + JPushPlugin.notificationAlert); + Log.i(TAG, "---------------- onResume" + "-" + + JPushPlugin.openNotificationAlert + "-" + + JPushPlugin.notificationAlert); if (isStatisticsOpened) { - JPushInterface.onResume(this.cordova.getActivity()); + JPushInterface.onResume(cordovaActivity); } if (JPushPlugin.openNotificationAlert != null) { JPushPlugin.notificationAlert = null; @@ -245,7 +250,7 @@ public class JPushPlugin extends CordovaPlugin { } void init(JSONArray data, CallbackContext callbackContext) { - JPushInterface.init(this.cordova.getActivity().getApplicationContext()); + JPushInterface.init(cordovaActivity.getApplicationContext()); //callbackContext.success(); } @@ -268,18 +273,18 @@ public class JPushPlugin extends CordovaPlugin { } void stopPush(JSONArray data, CallbackContext callbackContext) { - JPushInterface.stopPush(this.cordova.getActivity().getApplicationContext()); + JPushInterface.stopPush(cordovaActivity.getApplicationContext()); callbackContext.success(); } void resumePush(JSONArray data, CallbackContext callbackContext) { - JPushInterface.resumePush(this.cordova.getActivity().getApplicationContext()); + JPushInterface.resumePush(cordovaActivity.getApplicationContext()); callbackContext.success(); } void isPushStopped(JSONArray data, CallbackContext callbackContext) { boolean isStopped = JPushInterface.isPushStopped( - this.cordova.getActivity().getApplicationContext()); + cordovaActivity.getApplicationContext()); if (isStopped) { callbackContext.success(1); } else { @@ -297,7 +302,7 @@ public class JPushPlugin extends CordovaPlugin { } if (num != -1) { JPushInterface.setLatestNotificationNumber( - this.cordova.getActivity().getApplicationContext(), num); + cordovaActivity.getApplicationContext(), num); } else { callbackContext.error("error num"); } @@ -323,30 +328,30 @@ public class JPushPlugin extends CordovaPlugin { } catch (JSONException e) { callbackContext.error("error reading hour json"); } - Context context = this.cordova.getActivity().getApplicationContext(); + Context context = cordovaActivity.getApplicationContext(); JPushInterface.setPushTime(context, days, startHour, endHour); callbackContext.success(); } void getRegistrationID(JSONArray data, CallbackContext callbackContext) { - Context context = this.cordova.getActivity().getApplicationContext(); + Context context = cordovaActivity.getApplicationContext(); String regID = JPushInterface.getRegistrationID(context); callbackContext.success(regID); } void onResume(JSONArray data, CallbackContext callbackContext) { - JPushInterface.onResume(this.cordova.getActivity()); + JPushInterface.onResume(cordovaActivity); } void onPause(JSONArray data, CallbackContext callbackContext) { - JPushInterface.onPause(this.cordova.getActivity()); + JPushInterface.onPause(cordovaActivity); } void reportNotificationOpened(JSONArray data, CallbackContext callbackContext) { try { String msgID; msgID = data.getString(0); - JPushInterface.reportNotificationOpened(this.cordova.getActivity(), msgID); + JPushInterface.reportNotificationOpened(cordovaActivity, msgID); } catch (JSONException e) { e.printStackTrace(); } @@ -358,8 +363,8 @@ public class JPushPlugin extends CordovaPlugin { for (int i = 0; i < data.length(); i++) { tags.add(data.getString(i)); } - JPushInterface.setTags(this.cordova.getActivity() - .getApplicationContext(), tags, mTagWithAliasCallback); + JPushInterface.setTags(cordovaActivity.getApplicationContext(), + tags, mTagWithAliasCallback); callbackContext.success(); } catch (JSONException e) { e.printStackTrace(); @@ -370,8 +375,8 @@ public class JPushPlugin extends CordovaPlugin { void setAlias(JSONArray data, CallbackContext callbackContext) { try { String alias = data.getString(0); - JPushInterface.setAlias(this.cordova.getActivity() - .getApplicationContext(), alias, mTagWithAliasCallback); + JPushInterface.setAlias(cordovaActivity.getApplicationContext(), + alias, mTagWithAliasCallback); callbackContext.success(); } catch (JSONException e) { e.printStackTrace(); @@ -388,8 +393,8 @@ public class JPushPlugin extends CordovaPlugin { for (int i = 0; i < tagsArray.length(); i++) { tags.add(tagsArray.getString(i)); } - JPushInterface.setAliasAndTags(this.cordova.getActivity() - .getApplicationContext(), alias, tags, mTagWithAliasCallback); + JPushInterface.setAliasAndTags(cordovaActivity.getApplicationContext(), + alias, tags, mTagWithAliasCallback); callbackContext.success(); } catch (JSONException e) { e.printStackTrace(); @@ -418,7 +423,7 @@ public class JPushPlugin extends CordovaPlugin { void setBasicPushNotificationBuilder(JSONArray data, CallbackContext callbackContext) { BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder( - this.cordova.getActivity()); + cordovaActivity); builder.developerArg0 = "Basic builder 1"; JPushInterface.setPushNotificationBuilder(1, builder); JSONObject obj = new JSONObject(); @@ -433,7 +438,7 @@ public class JPushPlugin extends CordovaPlugin { void setCustomPushNotificationBuilder(JSONArray data, CallbackContext callbackContext) { CustomPushNotificationBuilder builder = new CustomPushNotificationBuilder( - this.cordova.getActivity(), R.layout.test_notification_layout, + cordovaActivity, R.layout.test_notification_layout, R.id.icon, R.id.title, R.id.text); builder.developerArg0 = "Custom Builder 1"; builder.layoutIconDrawable = R.drawable.jpush_notification_icon; @@ -448,7 +453,7 @@ public class JPushPlugin extends CordovaPlugin { } void clearAllNotification(JSONArray data, CallbackContext callbackContext) { - JPushInterface.clearAllNotifications(this.cordova.getActivity()); + JPushInterface.clearAllNotifications(cordovaActivity); //callbackContext.success(); } @@ -461,8 +466,7 @@ public class JPushPlugin extends CordovaPlugin { callbackContext.error("error reading id json"); } if (notificationId != -1) { - JPushInterface.clearNotificationById(this.cordova.getActivity(), - notificationId); + JPushInterface.clearNotificationById(cordovaActivity, notificationId); } else { callbackContext.error("error id"); } @@ -486,18 +490,17 @@ public class JPushPlugin extends CordovaPlugin { ln.setBroadcastTime(System.currentTimeMillis() + broadcastTime); ln.setExtras(extras.toString()); - JPushInterface.addLocalNotification(this.cordova.getActivity(), ln); + JPushInterface.addLocalNotification(cordovaActivity, ln); } void removeLocalNotification(JSONArray data, CallbackContext callbackContext) throws JSONException { int notificationID = data.getInt(0); - JPushInterface.removeLocalNotification(this.cordova.getActivity(), - notificationID); + JPushInterface.removeLocalNotification(cordovaActivity, notificationID); } void clearLocalNotifications(JSONArray data, CallbackContext callbackContext) { - JPushInterface.clearLocalNotifications(this.cordova.getActivity()); + JPushInterface.clearLocalNotifications(cordovaActivity); } /**