修正iOS 接口 isPushStopped 的返回值，使stop 返回 1，非stop 返回 0

升级 Android SDK, 升级到 2.0.5

	modified:   plugin.xml
	modified:   src/android/MyReceiver.java

README.md

@@ -28,6 +28,9 @@ l## JPush PhoneGap Plugin ##
 		
 		<meta-data android:name="JPUSH_APPKEY" android:value="your appkey"/>
 
+4. 打开`$JPUSH_PLUGIN_DIR/src/ios/PushConfig.plist`文件将文件中的`7d431e42dfa6a6d693ac2d04`替换为在Portal上注册该应用的的Key,例如（9fed5bcb7b9b87413678c407）
+		
+
 5. 在`$JPUSH_PLUGIN_DIR/src/android/JPushPlugin.java` 文件`import your.package.name.R`替换为在Portal上注册该应用的包名，例如(com.thi.pushtest)
 
 
@@ -35,49 +38,6 @@ l## JPush PhoneGap Plugin ##
 
 		cordova plugin add $JPUSH_PLUGIN_DIR
 		cordova plugin add org.apache.cordova.device
-
-7. iOS添加初始化JPush sdk代码 如果你要先部署android平台，可以先忽略这一步，当需要iOS 平台时，只加上这个步骤即可
-	
-	+ 用xcode 打开 Myproj下的iOS工程 
-	+ 打开xcode右边工程目录下`Resources/PushConfig.plist`
-		
-			在APP_KEY和CHANNLE字段 分别添加您的appkey和channle
-		
-	+ 打开xcode右边工程目录下`AppDelegate.m`,包含以下头文件
-
-			#import "APService.h"
-		    #import "JPushPlugin.h"
-
-	+ 在AppDelegate.m文件中，添加JPush SDK 提供的 API 来实现功能
-
-			- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
-			   //原内容保持不变
-			   //Required add 
-			   [JPushPlugin setLaunchOptions:launchOptions];
-			    return YES;
-			}
-			- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken   {
-			    //原内容保持不变
-			    // Required add
-			    [APService registerDeviceToken:deviceToken];
-			}
-			- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-			    //原内容保持不变
-			    // Required
-			    [APService handleRemoteNotification:userInfo];
-	    		[[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
-	                                                               object:userInfo];
-			}
-			- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-
-			  // IOS 7 Support Required
-			  [APService handleRemoteNotification:userInfo];
-			  [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
-	                                                              object:userInfo];
-
-			  completionHandler(UIBackgroundFetchResultNewData);
-			}
-
 	
 7. 在js中调用函数,初始化jpush sdk
 

document/Common_detail_api.md

@@ -284,7 +284,7 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.ope
 		
                     var alertContent
                     if(device.platform == "Android"){
-                        alertContent=window.plugins.jPushPlugin.openNotification.alert;
+                        alertContent=window.plugins.jPushPlugin.receiveNotification.alert;
                     }else{
                         alertContent   = event.aps.alert;
                     }
@@ -351,7 +351,7 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.rec
                 }
             }
 
-ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
 
 + android
 

plugin.xml

@@ -29,10 +29,10 @@
             <source-file src="src/ios/Plugins/JPushPlugin.m"/>
            
             <header-file src="src/ios/lib/APService.h" />
-            <source-file src="src/ios/lib/libPushSDK-1.8.3.a" framework="true" />
-            
+            <source-file src="src/ios/lib/libPushSDK-1.8.8.a" framework="true" />
+            <header-file src="src/ios/Plugins/AppDelegate+JPush.h"/>
+            <source-file src="src/ios/Plugins/AppDelegate+JPush.m"/>
             <resource-file src="src/ios/PushConfig.plist" />
-                
             <framework src="CFNetwork.framework" weak="true" />
             <framework src="CoreFoundation.framework" weak="true" />
             <framework src="CoreTelephony.framework" weak="true" />
@@ -154,10 +154,10 @@
             <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
             <meta-data android:name="JPUSH_APPKEY" android:value="your appkey"/>
         </config-file>
-        <source-file src="src/android/jpush-sdk-release1.7.5.jar" target-dir="libs"/>
-        <source-file src="src/android/armeabi/libjpush175.so" target-dir="libs/armeabi"/>
-        <source-file src="src/android/armeabi-v7a/libjpush175.so" target-dir="libs/armeabi-v7a"/>
-        <source-file src="src/android/arm64-v8a/libjpush175.so" target-dir="libs/armeabi-v8a"/>
+        <source-file src="src/android/jpush-android-2.0.5.jar" target-dir="libs"/>
+        <source-file src="src/android/armeabi/libjpush205.so" target-dir="libs/armeabi"/>
+        <source-file src="src/android/armeabi-v7a/libjpush205.so" target-dir="libs/armeabi-v7a"/>
+        <source-file src="src/android/arm64-v8a/libjpush205.so" target-dir="libs/arm64-v8a"/>
         
         <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>
         <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap"/>

src/android/JPushPlugin.java

@@ -58,6 +58,8 @@ public class JPushPlugin extends CordovaPlugin {
 
 	public static String notificationAlert;
 	public static Map<String, Object> notificationExtras=new HashMap<String, Object>();
+	public static String openNotificationAlert;
+	public static Map<String, Object> openNotificationExtras=new HashMap<String, Object>();
 
 	public JPushPlugin() {
 		instance = this;
@@ -67,6 +69,16 @@ public class JPushPlugin extends CordovaPlugin {
 	public void initialize(CordovaInterface cordova, CordovaWebView webView) {
 		super.initialize(cordova, webView);
 		//JPushInterface.setDebugMode(true);
+		
+		 //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);
+		 }
+
 		//JPushInterface.init(cordova.getActivity().getApplicationContext());
 	}
 

src/android/MyReceiver.java

@@ -18,7 +18,7 @@ public class MyReceiver extends BroadcastReceiver {
 
         if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
         	
-        }else if (JPushInterface.ACTION_UNREGISTER.equals(intent.getAction())){
+//        }else if (JPushInterface.ACTION_UNREGISTER.equals(intent.getAction())){
         	
         } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
         	handlingReceivedMessage(intent);
@@ -49,8 +49,8 @@ public class MyReceiver extends BroadcastReceiver {
 		 launch.addCategory(Intent.CATEGORY_LAUNCHER);
 		 launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
 		 
-		 JPushPlugin.notificationAlert = alert;
-		 JPushPlugin.notificationExtras = extras;
+		 JPushPlugin.openNotificationAlert = alert;
+		 JPushPlugin.openNotificationExtras = extras;
 		 
 		 JPushPlugin.transmitOpen(alert, extras);
 

src/ios/Plugins/AppDelegate+JPush.h

@@ -0,0 +1,15 @@
+//
+//  AppDelegate+JPush.h
+//  delegateExtention
+//
+//  Created by 张庆贺 on 15/8/3.
+//  Copyright (c) 2015年 JPush. All rights reserved.
+//
+
+#import "AppDelegate.h"
+
+@interface AppDelegate (JPush)
+
+//@property(nonatomic,strong)NSDictionary *luanchOption;
+
+@end

src/ios/Plugins/AppDelegate+JPush.m

@@ -0,0 +1,74 @@
+//
+//  AppDelegate+JPush.m
+//  delegateExtention
+//
+//  Created by 张庆贺 on 15/8/3.
+//  Copyright (c) 2015年 JPush. All rights reserved.
+//
+
+#import "AppDelegate+JPush.h"
+#import <objc/runtime.h>
+#import "JPushPlugin.h"
+#import "APService.h"
+
+static char launchNotificationKey;
+
+@implementation AppDelegate (JPush)
+
++(void)load{
+    
+    Method origin;
+    Method swizzle;
+    
+    origin=class_getInstanceMethod([self class],@selector(init));
+    swizzle=class_getInstanceMethod([self class], @selector(init_plus));
+    method_exchangeImplementations(origin, swizzle);
+}
+
+-(instancetype)init_plus{
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(applicationDidLaunch:)
+                                                 name:@"UIApplicationDidFinishLaunchingNotification"
+                                               object:nil];
+    return [self init_plus];
+}
+
+-(void)applicationDidLaunch:(NSNotification *)notification{
+
+    if (notification) {
+        [JPushPlugin setLaunchOptions:notification.userInfo];
+    }
+}
+
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+    [APService registerDeviceToken:deviceToken];
+}
+-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
+    
+    [APService handleRemoteNotification:userInfo];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
+                                                        object:userInfo];
+
+}
+-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+    
+    [APService handleRemoteNotification:userInfo];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
+                                                        object:userInfo];
+
+    
+}
+
+//delegate里不能声明变量，所以采用关联对象这种技术绕过这个限制
+//-(NSDictionary *)luanchOption{
+//    return objc_getAssociatedObject(self, &launchNotificationKey);
+//}
+//-(void)setLuanchOption:(NSDictionary *)luanchOption{
+//    objc_setAssociatedObject(self, &launchNotificationKey, luanchOption, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+//}
+//-(void)dealloc{
+//    self.luanchOption=nil;
+//}
+
+@end

src/ios/Plugins/JPushPlugin.m

@@ -109,9 +109,9 @@ static NSDictionary *_luanchOptions=nil;
 
     NSNumber *result;
     if ([[UIApplication sharedApplication] isRegisteredForRemoteNotifications ]) {
-        result=@(1);
-    }else{
         result=@(0);
+    }else{
+        result=@(1);
     }
     CDVPluginResult * pushResult=[self pluginResultForValue:result];
     if (pushResult) {

src/ios/lib/APService.h

@@ -4,7 +4,7 @@
 //
 //  Created by JPush on 12-8-15.
 //  Copyright (c) 2012年 HXHG. All rights reserved.
-//  Version: 1.8.3
+//  Version: 1.8.8
 
 @class CLRegion;
 @class UILocalNotification;