Merge pull request #100 from darkterrorooo/master

fix #99 android jpush.openNotification 事件调用两次

Author: darkterrorooo

example/index.html

@@ -54,13 +54,13 @@
             }
             var onReceiveNotification = function(event){
                 try{
-                	var alert
+                	var alertContent
                     if(device.platform == "Android"){
-                  		 alert = window.plugins.jPushPlugin.receiveNotification.alert;
+                  		 alertContent = window.plugins.jPushPlugin.receiveNotification.alert;
                     }else{
-                         alert   = event.aps.alert;
+                         alertContent   = event.aps.alert;
                     }
-                    $("#notificationResult").html(alert);
+                    $("#notificationResult").html(alertContent);
 
                 }
                 catch(exeption){

src/android/JPushPlugin.java

@@ -26,6 +26,8 @@
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.data.JPushLocalNotification;
 import cn.jpush.android.api.TagAliasCallback;
+import android.util.Log;
+
 
 public class JPushPlugin extends CordovaPlugin {
 	private final static List<String> methodList = 
@@ -56,7 +58,9 @@ public class JPushPlugin extends CordovaPlugin {
 
 	private ExecutorService threadPool = Executors.newFixedThreadPool(1);
 	private static JPushPlugin instance;
+    private static String TAG = "Client JPushPlugin";
 
+    public static boolean bOpenNotificationAlert = true;
 	public static String notificationAlert;
 	public static Map<String, Object> notificationExtras=new HashMap<String, Object>();
 	public static String openNotificationAlert;
@@ -73,12 +77,19 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
 
 		 //JPushPlugin.notificationAlert = alert;
 		 //JPushPlugin.notificationExtras = extras;
-		 if(JPushPlugin.openNotificationAlert != null){
-			 JPushPlugin.transmitOpen(JPushPlugin.openNotificationAlert, JPushPlugin.openNotificationExtras);
-		 }
-		 if(JPushPlugin.notificationAlert!=null){
-			 JPushPlugin.transmitReceive(JPushPlugin.notificationAlert, JPushPlugin.notificationExtras);
-		 }
+        
+        if(JPushPlugin.bOpenNotificationAlert){
+            
+            JPushPlugin.bOpenNotificationAlert = false;
+            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());
 	}
@@ -226,7 +237,7 @@ public void run() {
 							JSONArray.class, CallbackContext.class);
 					method.invoke(JPushPlugin.this, data, callbackContext);
 				} catch (Exception e) {
-					System.out.println(e.toString());
+                    Log.e(TAG,e.toString());
 				}
 			}
 		});

src/android/MyReceiver.java

@@ -48,7 +48,7 @@ private void handlingNotificationOpen(Context context,Intent intent){
 		 Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
 		 launch.addCategory(Intent.CATEGORY_LAUNCHER);
 		 launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
-		 
+         JPushPlugin.bOpenNotificationAlert = true;
 		 JPushPlugin.openNotificationAlert = alert;
 		 JPushPlugin.openNotificationExtras = extras;