diff --git a/src/android/JPushPlugin.java b/src/android/JPushPlugin.java index 6c3f841..d86117f 100644 --- a/src/android/JPushPlugin.java +++ b/src/android/JPushPlugin.java @@ -37,11 +37,11 @@ public class JPushPlugin extends CordovaPlugin { "isPushStopped", "setLatestNotificationNum", "setPushTime"); - private ExecutorService executorService = Executors.newFixedThreadPool(1); + private ExecutorService threadPool = Executors.newFixedThreadPool(1); private static JPushPlugin instance; - public static String incomingAlert; - public static Map incomingExtras; + public static String notificationAlert; + public static Map notificationExtras; public JPushPlugin() { instance = this; @@ -66,7 +66,7 @@ public class JPushPlugin extends CordovaPlugin { return data; } - static void raisePush(String message, Map extras) { + static void transmitPush(String message, Map extras) { if (instance == null) { return; } @@ -89,7 +89,7 @@ public class JPushPlugin extends CordovaPlugin { if (!methodList.contains(action)) { return false; } - executorService.execute(new Runnable() { + threadPool.execute(new Runnable() { @Override public void run() { try { @@ -230,9 +230,9 @@ public class JPushPlugin extends CordovaPlugin { } } - void getIncoming(JSONArray data, CallbackContext callBackContext) { - String alert = JPushPlugin.incomingAlert; - Map extras = JPushPlugin.incomingExtras; + void getNotification(JSONArray data, CallbackContext callBackContext) { + String alert = JPushPlugin.notificationAlert; + Map extras = JPushPlugin.notificationExtras; JSONObject jsonData = new JSONObject(); try { @@ -244,8 +244,8 @@ public class JPushPlugin extends CordovaPlugin { callBackContext.success(jsonData); - JPushPlugin.incomingAlert = ""; - JPushPlugin.incomingExtras = new HashMap(); + JPushPlugin.notificationAlert = ""; + JPushPlugin.notificationExtras = new HashMap(); } void setBasicPushNotificationBuilder(JSONArray data, diff --git a/src/android/MyReceiver.java b/src/android/MyReceiver.java index 15c7cc5..5734cf1 100644 --- a/src/android/MyReceiver.java +++ b/src/android/MyReceiver.java @@ -37,7 +37,7 @@ public class MyReceiver extends BroadcastReceiver { String msg = intent.getStringExtra(JPushInterface.EXTRA_MESSAGE); Map extras = getNotificationExtras(intent); - JPushPlugin.raisePush(msg, extras); + JPushPlugin.transmitPush(msg, extras); } private void handlingNotificationOpen(Context context,Intent intent){ String alert = intent.getStringExtra(JPushInterface.EXTRA_ALERT); @@ -47,8 +47,8 @@ public class MyReceiver extends BroadcastReceiver { launch.addCategory(Intent.CATEGORY_LAUNCHER); launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP); - JPushPlugin.incomingAlert = alert; - JPushPlugin.incomingExtras = extras; + JPushPlugin.notificationAlert = alert; + JPushPlugin.notificationExtras = extras; context.startActivity(launch); } diff --git a/www/JPushPlugin.js b/www/JPushPlugin.js index 87104fd..8334285 100644 --- a/www/JPushPlugin.js +++ b/www/JPushPlugin.js @@ -32,8 +32,8 @@ JPushPlugin.prototype.pushCallback = function (data) { } -JPushPlugin.prototype.getIncoming = function (callback) { - this.call_native(callback, "getIncoming"); +JPushPlugin.prototype.getNotification = function (callback) { + this.call_native(callback, "getNotification"); } JPushPlugin.prototype.setBasicPushNotificationBuilder = function(callback){