fix android openNotification twice

This commit is contained in:
darkterrorooo 2015-12-09 17:55:10 +08:00
parent 0da9f0ed26
commit 42d64ca2f0
2 changed files with 17 additions and 8 deletions

View File

@ -56,7 +56,9 @@ public class JPushPlugin extends CordovaPlugin {
private ExecutorService threadPool = Executors.newFixedThreadPool(1); private ExecutorService threadPool = Executors.newFixedThreadPool(1);
private static JPushPlugin instance; private static JPushPlugin instance;
private static String TAG = "Client JPushPlugin";
public static boolean bOpenNotificationAlert = true;
public static String notificationAlert; public static String notificationAlert;
public static Map<String, Object> notificationExtras=new HashMap<String, Object>(); public static Map<String, Object> notificationExtras=new HashMap<String, Object>();
public static String openNotificationAlert; public static String openNotificationAlert;
@ -73,12 +75,19 @@ public class JPushPlugin extends CordovaPlugin {
//JPushPlugin.notificationAlert = alert; //JPushPlugin.notificationAlert = alert;
//JPushPlugin.notificationExtras = extras; //JPushPlugin.notificationExtras = extras;
if(JPushPlugin.openNotificationAlert != null){
JPushPlugin.transmitOpen(JPushPlugin.openNotificationAlert, JPushPlugin.openNotificationExtras); if(JPushPlugin.bOpenNotificationAlert){
}
if(JPushPlugin.notificationAlert!=null){ JPushPlugin.bOpenNotificationAlert = false;
JPushPlugin.transmitReceive(JPushPlugin.notificationAlert, JPushPlugin.notificationExtras); if(JPushPlugin.openNotificationAlert != null){
} JPushPlugin.transmitOpen(JPushPlugin.openNotificationAlert, JPushPlugin.openNotificationExtras);
}
if(JPushPlugin.notificationAlert!=null){
JPushPlugin.transmitReceive(JPushPlugin.notificationAlert, JPushPlugin.notificationExtras);
}
}
//JPushInterface.init(cordova.getActivity().getApplicationContext()); //JPushInterface.init(cordova.getActivity().getApplicationContext());
} }
@ -226,7 +235,7 @@ public class JPushPlugin extends CordovaPlugin {
JSONArray.class, CallbackContext.class); JSONArray.class, CallbackContext.class);
method.invoke(JPushPlugin.this, data, callbackContext); method.invoke(JPushPlugin.this, data, callbackContext);
} catch (Exception e) { } catch (Exception e) {
System.out.println(e.toString()); Log.e(TAG,e.toString());
} }
} }
}); });

View File

@ -48,7 +48,7 @@ public class MyReceiver extends BroadcastReceiver {
Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()); Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
launch.addCategory(Intent.CATEGORY_LAUNCHER); launch.addCategory(Intent.CATEGORY_LAUNCHER);
launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP); launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
JPushPlugin.bOpenNotificationAlert = true;
JPushPlugin.openNotificationAlert = alert; JPushPlugin.openNotificationAlert = alert;
JPushPlugin.openNotificationExtras = extras; JPushPlugin.openNotificationExtras = extras;