Merge pull request #114 from darkterrorooo/master

升级 android sdk to 2.0.6
2026-02-08 00:05:13 +08:00 · 2016-01-21 17:28:52 +08:00 · 2016-01-21 17:20:31 +08:00 · 2016-01-21 15:31:25 +08:00 · 2016-01-21 15:23:53 +08:00 · 2016-01-21 15:15:48 +08:00
28 changed files with 2419 additions and 1224 deletions
--- a/README.md
+++ b/README.md
@@ -1,284 +1,83 @@
 ## JPush PhoneGap Plugin ##
-###创建项目###
+
+jpush-phonegap-plugin 支持 iOS,Android 的推送插件。
+
+**功能特性：**
+>+ 发送推送通知
+ 发送推送自定义消息
+ 设置推送标签和别名
+ 设置角标（iOS）
+
+*如需要 IM 功能插件，请关注[jmessage-phonegap-plugin](https://github.com/jpush/jmessage-phonegap-plugin)*
+
+
+## 安装 ##
+###准备工作
+
 1. cordova create 文件夹名字 包名 应用名字

 		cordova create Myproj com.myproj.jpush MyTestProj
 		
 2. 添加平台

-		cd Myproj :不进入项目会出现[RangeError:Maximum call stack size exceeded]
+		cd Myproj 
 		cordova platform add android  
 		cordova platform add ios

-### Android使用PhoneGap/Cordova CLI自动安装
-
-1. 使用git命令将jpush phonegap插件下载的本地,将这个目录标记为`$JPUSH_PLUGIN_DIR`
+		ps:这里请注意iOS平台，必须先执行 `cordova platform add ios`,
+		然后再执行`cordova plugin add xxxxx`命令，不然有一些必须要的链接库需要手动添加
 		
-		git clone https://github.com/jpush/jpush-phonegap-plugin.git
-		
-2. 将`$JPUSH_PLUGIN_DIR/plugin.xml`文件中的AppKey替换为在Portal上注册该应用的的Key,例如（9fed5bcb7b9b87413678c407）
-		
-		<meta-data android:name="JPUSH_APPKEY" android:value="your appkey"/>

-3. 在`$JPUSH_PLUGIN_DIR/src/android/JPushPlugin.java` 文件`import your.package.name.R`替换为在Portal上注册该应用的包名，例如(com.thi.pushtest)
+###Cordova CLI/Phonegap 安装 Android & iOS
+
+1).  安装JPush PhoneGap Plugin。 有两种方法。
+
+方法一： 在线安装
+
+    cordova plugin add  https://github.com/jpush/jpush-phonegap-plugin.git --variable API_KEY=your_jpush_appkey  
+
+方法二：下载到本地再安装
+
+使用git命令将jpush phonegap插件下载的本地,将这个目录标记为`$JPUSH_PLUGIN_DIR`


-4. cordova cli 添加jpush phonegap插件和依赖的device插件: 
-
-		cordova plugin add $JPUSH_PLUGIN_DIR
-		cordova plugin add org.apache.cordova.device
+    git clone https://github.com/jpush/jpush-phonegap-plugin.git
+    cordova plugin add $JPUSH_PLUGIN_DIR  --variable API_KEY=your_jpush_appkey


-5. 在js中调用函数,初始化jpush sdk

-		 window.plugins.jPushPlugin.init();
-		 window.plugins.jPushPlugin.setDebugMode(true);
+2).  安装org.apache.cordova.device
+
+     cordova plugin add org.apache.cordova.device


-###IOS使用PhoneGap/Cordova CLI自动安装
+3). 在js中调用函数,初始化jpush sdk

-1. 使用PhoneGap/Cordova CLI命令安装
-
-		cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git
-		cordova build ios
-
-2. 修改Resources/PushConfig.plist文件
-
-在APP_KEY和CHANNLE字段 分别添加您的appkey和channle
-
-3. 添加监听系统事件，相应地调用 JPush SDK 提供的 API 来实现功能
+    window.plugins.jPushPlugin.init();	
+    //由于phonegap插件采用了Lazy load的特性，	所以这里建议在js文件能执行的最开始就加


-		- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
-		    self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
-		    self.window.backgroundColor = [UIColor whiteColor];
-		    [self.window makeKeyAndVisible];
-		    // Required
-		#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1
-		   if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
-		    //可以添加自定义categories
-		    [APService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
-		                                                   UIUserNotificationTypeSound |
-		                                                   UIUserNotificationTypeAlert)
-		                                       categories:nil];
-		  } else {
-		    //categories 必须为nil
-		    [APService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
-		                                                   UIRemoteNotificationTypeSound |
-		                                                   UIRemoteNotificationTypeAlert)
-		                                       categories:nil];
-		  }
-		#else
-		    //categories 必须为nil
-		  [APService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
-		                                                 UIRemoteNotificationTypeSound |
-		                                                 UIRemoteNotificationTypeAlert)
-		                                     categories:nil];
-		#endif
-		    // Required
-		    [APService setupWithOption:launchOptions];
-		    return YES;
-		}
-		- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-		    // Required
-		    [APService registerDeviceToken:deviceToken];
-		}
-		- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-		    // Required
-		    [APService handleRemoteNotification:userInfo];
-		}
-
-###Android 手工安装###
-1. 复制src/android/*.java 到cn/jpush/phonega/目录下(即：cn.jpush.phonegap的包下)
-2. 复制src/android/armeabi/libjpush.so 到lib/armeabi/
-3. 复制src/android/jpush-sdk-release1.5.0.jar 到lib/
-4. 复制src/android/test_notification_layout.xml到res/layout/
-5. 复制src/android/jpush_notification_icon.png 到res/drawable/
-6. 修改 AndroidManifest.xml 在 manifest 节点下添加以下权限
-
-		<!-- Required  一些系统要求的权限，如访问网络等-->
-		<uses-permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"/>
-		<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
-		<uses-permission android:name="android.permission.INTERNET"/>
-		<uses-permission android:name="android.permission.WAKE_LOCK"/>
-		<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-		<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-		<uses-permission android:name="android.permission.VIBRATE"/>
-		<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-		<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-		<permission
-		      android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
-		      android:protectionLevel="signature"/>
-
-7. 修改AndroidManifest.xml 在 manifest/application 节点下添加SDK相关组件声明
-
-		<activity
-			android:name="cn.jpush.android.ui.PushActivity"
-			android:theme="@android:style/Theme.Translucent.NoTitleBar"
-			android:configChanges="orientation|keyboardHidden">
-			<intent-filter>
-			<action android:name="cn.jpush.android.ui.PushActivity"/>
-			<category android:name="android.intent.category.DEFAULT"/>
-			<category android:name="$PACKAGE_NAME"/>
-			</intent-filter>
-		</activity>
-		<!-- Required  SDK核心功能-->
-		<service
-			android:name="cn.jpush.android.service.DownloadService"
-			android:enabled="true"
-			android:exported="false">
-		</service>
-		<!-- Required SDK 核心功能-->
-		<service
-			android:name="cn.jpush.android.service.PushService"
-			android:enabled="true"
-			android:exported="false">
-			<intent-filter>
-				<action android:name="cn.jpush.android.intent.REGISTER"/>
-				<action android:name="cn.jpush.android.intent.REPORT"/>
-				<action android:name="cn.jpush.android.intent.PushService"/>
-				<action android:name="cn.jpush.android.intent.PUSH_TIME"/>
-			
-			</intent-filter>
-		</service>
-		<!-- Required SDK核心功能-->
-		<receiver
-		android:name="cn.jpush.android.service.PushReceiver"
-		android:enabled="true">
-			<intent-filter android:priority="1000">
-				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
-				<!--Required  显示通知栏 -->
-				<category android:name="$PACKAGE_NAME"/>
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.USER_PRESENT"/>
-				<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
-			</intent-filter>
-			<!-- Optional -->
-			<intent-filter>
-				<action android:name="android.intent.action.PACKAGE_ADDED"/>
-				<action android:name="android.intent.action.PACKAGE_REMOVED"/>
-				<data android:scheme="package"/>
-			</intent-filter>
-		</receiver>
-		
-		<!-- User defined.  For test only  用户自定义的广播接收器 -->
-		<receiver
-		android:name="cn.jpush.phonegap.MyReceiver"
-		android:enabled="true">
-			<intent-filter android:priority="1000">
-				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
-				<!-- Required  显示通知栏 -->
-				<category android:name="$PACKAGE_NAME"/>
-				</intent-filter>
-			<intent-filter>
-			<action android:name="cn.jpush.android.intent.REGISTRATION"/>
-			<!-- Required  用户注册SDK的intent -->
-			<action android:name="cn.jpush.android.intent.UNREGISTRATION"/>
-			<action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED"/>
-			<!-- Required  用户接收SDK消息的intent -->
-			<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED"/>
-			<!-- Required  用户接收SDK通知栏信息的intent -->
-			<action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/>
-			<!-- Required  用户打开自定义通知栏的intent -->
-			<action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK"/>
-			<!-- Optional 用户接受Rich Push Javascript 回调函数的intent -->
-			<category android:name="$PACKAGE_NAME"/>
-			</intent-filter>
-		</receiver>
-		<!-- Required SDK核心功能-->
-		<receiver android:name="cn.jpush.android.service.AlarmReceiver"/>
-		<!-- Required  . Enable it you can get statistics data with channel -->
-		<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
-		<meta-data android:name="JPUSH_APPKEY" android:value="299d0fee887820e7d90a68b2"/>
+### Android 手工安装

+[Android 手工安装文档地址](document/Android_handle_install.md)
+	

 ### IOS手工安装

-1. 添加src/ios/Plugins/到project中  
-2. 添加src/ios/lib/到project中  
-3. 设置 Search Paths 下的 User Header Search Paths 和 Library Search Paths  
+[IOS手工安装文档地址](document/iOS_handle_install.md)

-比如SDK文件夹（默认为lib）与工程文件在同一级目录下，则都设置为"$(SRCROOT)/[文件夹名称]"即可。
-
-4. 确认一下的框架是存在的(Target -> Build Phases -> Link Binary With Libraries)
-
-		CFNetwork.framework
-		CoreFoundation.framework
-		CoreTelephony.framework
-		SystemConfiguration.framework
-		CoreGraphics.framework
-		Foundation.framework
-		UIKit.framework
-
-
-5. 在你的工程中创建一个新的Property List文件
-
-		并将其命名为PushConfig.plist，填入Portal为你的应用提供的APP_KEY等参数
-
-
-6. 调用代码,监听系统事件，相应地调用 JPush SDK 提供的 API 来实现功能
-
-		- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-		{
-		    self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
-		    self.window.backgroundColor = [UIColor whiteColor];
-		    [self.window makeKeyAndVisible];
-		 
-		    // Required
-		    [APService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
-		                                                    UIRemoteNotificationTypeSound |
-		                                                    UIRemoteNotificationTypeAlert)];
-		    // Required
-		    [APService setupWithOption:launchOptions];
-		     
-		    return YES;
-		}
-		 
-		- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-		     
-		    // Required
-		    [APService registerDeviceToken:deviceToken];
-		}
-		 
-		- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-		     
-		    // Required
-		    [APService handleRemoteNotification:userInfo];
-		}
-
-
-7. 修改phonegap config.xml文件用来包含Plugin/内的插件
-
-
-		<feature name="JPushPlugin">
-		    <param name="ios-package" value="JPushPlugin" />
-		    <param name="onload" value="true" />
-		</feature>
-
-
-8. 复制www/PushNotification.js到工程的www目录下面  
-9. 在需要使用插件处加入
-
-		<script type="text/javascript" src="JPushPlugin.js"></script>

 ###示例

-1. 完整的示例可以点击网页右侧的"Download Zip"下载，下载完成后在文件的"src/ios/example"文件夹内找到并拷贝以下文件
+1. "$JPUSH_PLUGIN_DIR/example"文件夹内找到并拷贝以下文件

-		src/ios/example/index.html to www/index.html
-		src/ios/example/css/* to www/css
-		src/ios/example/js/* to www/js
+		src/example/index.html to www/index.html
+		src/example/css/* to www/css
+		src/example/js/* to www/js

 ###关于'phonegap build'云服务
-该项目基于cordova实现，目前无法使用'phonegap build'云服务进行打包，建议使用本地环境进行打包
-###常见错误
-1. androd

-		eclipse中phonegap工程import之后出现:`Type CallbackContext cannot be resolved to a type`
-		解决方案：eclipse中右键单击工程名，Build Path->Config Build Path->Projects->选中 工程名称－CordovaLib->点击 add
+该项目基于cordova实现，目前无法使用'phonegap build'云服务进行打包，建议使用本地环境进行打包

 ### API说明

@@ -287,470 +86,127 @@
 *  android:[YOUR__ANDROID_PROJECT]/assets/www/plugins/cn.jpush.phonegap.JPushPlugin/www
 *  iOS:[YOUR_iOS_PROJEcT]/www/plugins/cn.jpush.phonegap.JPushPlugin/www

-这里只说明public的函数
+具体的API请参考这里
+
+#### iOS和adnroid通用API简介
+
+ 停止与恢复推送服务 API
+		
+		window.plugins.jPushPlugin.init()
+		window.plugins.jPushPlugin.stopPush()
+		window.plugins.jPushPlugin.resumePush()
+		window.plugins.jPushPlugin.isPushStopped(callback)


-#### API - setTagsWithAlias,setTags,setAlias
+ 获取 RegistrationID API

-提供几个相关 API 用来设置别名（alias）与标签（tags）。
-
-这几个 API 可以在 App 里任何地方调用。
-
-别名 alias
-
-为安装了应用程序的用户，取个别名来标识。以后给该用户 Push 消息时，就可以用此别名来指定。
-
-每个用户只能指定一个别名。
-
-同一个应用程序内，对不同的用户，建议取不同的别名。这样，尽可能根据别名来唯一确定用户。
-
-系统不限定一个别名只能指定一个用户。如果一个别名被指定到了多个用户，当给指定这个别名发消息时，服务器端API会同时给这多个用户发送消息。
-
-举例：在一个用户要登录的游戏中，可能设置别名为 userid。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userid 调用服务器端API发通知到客户端提醒用户。
-
-标签 tag
-
-为安装了应用程序的用户，打上标签。其目的主要是方便开发者根据标签，来批量下发 Push 消息。
-
-可为每个用户打多个标签。
-
-不同应用程序、不同的用户，可以打同样的标签。
-
-举例： game, old_page, women
-
-##### 接口定义
-
-	JPushPlugin.prototype.setTagsWithAlias = function(tags,alias)
-	JPushPlugin.prototype.setTags = function(tags)
-	JPushPlugin.prototype.setAlias = function(alias)
-
-#####使用平台
-android iOS
-
-
-##### 参数说明
-* tags
-	* 参数类型为数组	
-	* nil 此次调用不设置此值
-	* 空集合表示取消之前的设置 
-	* 每次调用至少设置一个 tag，覆盖之前的设置，不是新增
-	* 有效的标签组成：字母（区分大小写）、数字、下划线、汉字
-	* 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节。（判断长度需采用UTF-8编码）
-	* 单个设备最多支持设置 100 个 tag。App 全局 tag 数量无限制。
-* alias 
-	* 参数类型为字符串
-	* nil 此次调用不设置此值
-	* 空字符串 （""）表示取消之前的设置
-	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
-	* 限制：alias 命名长度限制为 40 字节。（判断长度需采用UTF-8编码）
+		window.plugins.jPushPlugin.getRegistrationID(callback)
+		
+ 别名与标签 API
 	
-##### 返回值说明
+		window.plugins.jPushPlugin.setTagsWithAlias(tags,alias)
+		window.plugins.jPushPlugin.setTags(tags)
+		window.plugins.jPushPlugin.setAlias(alias)
+ 获取点击通知内容
+		
+		event - jpush.openNotification
+ 获取通知内容
+		
+		event - jpush.receiveNotification

-函数本身无返回值，但需要注册`jpush.setTagsWithAlias	`事件来监听设置结果
+ 获取自定义消息推送内容
+
+		event - jpush.receiveMessage
+
+
+[通用API详细说明](document/Common_detail_api.md)
+
+#### iOS API简介
+
+ 获取自定义消息推送内容
+
+		event - jpush.receiveMessage
+		//推荐使用事件的方式传递，但同时保留了receiveMessageIniOSCallback的回调函数，兼容以前的代码
+		window.plugins.jPushPlugin.receiveMessageIniOSCallback(data)
+		
+ 页面的统计
 	
-	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
-    var onTagsWithAlias = function(event){
-       try{
-           console.log("onTagsWithAlias");    
-           var result="result code:"+event.resultCode+" ";
-           result+="tags:"+event.tags+" ";
-           result+="alias:"+event.alias+" ";
-           $("#tagAliasResult").html(result);
-       }
-       catch(exception){
-           console.log(exception)
-       }
-   }
+		window.plugins.jPushPlugin.startLogPageView (pageName)
+		window.plugins.jPushPlugin.stopLogPageView (pageName)
+		window.plugins.jPushPlugin.beginLogPageView (pageName,duration)
+ 设置Badge

-	 	 	
-#####错误码定义
+		window.plugins.jPushPlugin.setBadge(value)
+		window.plugins.jPushPlugin.resetBadge()
+		window.plugins.jPushPlugin.setApplicationIconBadgeNumber(badge)
+ 本地通知
+
+	+ 后续版本加入
+		
+ 日志等级设置
+	
+		window.plugins.jPushPlugin.setDebugModeFromIos ()
+		window.plugins.jPushPlugin.setLogOFF()
+		
+		
+[iOS API详细说明](document/iOS_detail_api.md)


-|Code|描述|详细解释|
-|-|-|-|
-|6001|	无效的设置，tag/alias 不应参数都为 null||	
-|6002|	设置超时|	建议重试|
-|6003|	alias| 字符串不合法	有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
-|6004|	alias超长。最多 40个字节	中文 UTF-8 是 3 个字节|
-|6005|	某一个 tag 字符串不合法|	有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
-|6006|	某一个 tag 超长。|一个 tag 最多 40个字节	中文 UTF-8 是 3 个字节|
-|6007|	tags 数量超出限制。最多 100个|	这是一台设备的限制。一个应用全局的标签数量无限制。|
-|6008|	tag/alias 超出总长度限制。|总长度最多 1K 字节|
-|6011|	10s内设置tag或alias大于3次|	短时间内操作过于频繁|
+#### adnroid API简介
+		
+ 获取集成日志
+		window.plugins.jPushPlugin.setDebugMode(mode)

+ 接收推送消息和点击通知
+		
+		//下面这两个api 是兼容旧有的代码
+		window.plugins.jPushPlugin.receiveMessageInAndroidCallback(data)
+		window.plugins.jPushPlugin.openNotificationInAndroidCallback(data)

-#### API - startLogPageView,stopLogPageView,beginLogPageView
+ 统计分析 API

-本 API 用于“用户指定页面使用时长”的统计，并上报到服务器，在 Portal 上展示给开发者。页面统计集成正确，才能够获取正确的页面访问路径、访问深度（PV）的数据。
+		onResume / onPause(java api)
+			
+ 清除通知 API

-##### 接口定义
-	JPushPlugin.prototype.startLogPageView = function(pageName)
-	JPushPlugin.prototype.stopLogPageView = function(pageName)
-	JPushPlugin.prototype.beginLogPageView = function(pageName,duration)
+		window.plugins.jPushPlugin.clearAllNotification()

-#####平台
-iOS
+ 通知栏样式定制 API

-#####参数说明
-pageName 需要统计页面自定义名称
-duration 自定义的页面时间
+		window.plugins.jPushPlugin.setBasicPushNotificationBuilder = function()
+		window.plugins.jPushPlugin.setCustomPushNotificationBuilder = function()

-#####调用说明
-应在所有的需要统计得页面得 viewWillAppear 和 viewWillDisappear 加入 startLogPageView 和 stopLogPageView 来统计当前页面的停留时间。
+ 设置保留最近通知条数 API
+		
+		window.plugins.jPushPlugin.setLatestNotificationNum(num)
+		
+ 本地通知API
+		
+		window.plugins.jPushPlugin.addLocalNotification(builderId,
+												    content,
+												    title,
+												    notificaitonID,
+												    broadcastTime,
+											 	    extras)
+		window.plugins.jPushPlugin.removeLocalNotification(notificationID)
+		window.plugins.jPushPlugin.clearLocalNotifications()

-	或者直接使用 beginLogPageView 来自定义加入页面和时间信息。
+[Android API详细说明](document/Android_detail_api.md)

+###常见问题

-#####返回值说明
-无
+####1. androd

-#####代码示例
+	eclipse中phonegap工程import之后出现:`Type CallbackContext cannot be resolved to a type`
+	解决方案：eclipse中右键单击工程名，Build Path->Config Build Path->Projects->选中 工程名称－CordovaLib->点击 add

-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.beginLogPageView("newPage",5);
-		window.plugins.jPushPlugin.startLogPageView("onePage");
-		window.plugins.jPushPlugin.stopLogPageView("onePage");
-	}
+####2. iOS 设置/修改 APP_KEY
+	
+    在PushConfig.plist 中修改。PushConfig.plist 其他值说明： 
+    CHANNEL 渠道标识
+    IsProduction 是否生产环境（暂未启用）
 	


-#### API - setBadge,resetBadge
-
-badge是iOS用来标记应用程序状态的一个数字，出现在程序图标右上角。 JPush封装badge功能，允许应用上传badge值至JPush服务器，由JPush后台帮助管理每个用户所对应的推送badge值，简化了设置推送badge的操作。
-
-实际应用中，开发者可以直接对badge值做增减操作，无需自己维护用户与badge值之间的对应关系。
-
-##### 接口定义
-
-	JPushPlugin.prototype.setBadge = function(value)
-	JPushPlugin.prototype.resetBadge = function()
-
-`resetBadge相当于setBadge(0)`
-
-##### 平台
-iOS
-
-##### 参数说明
-
-value 取值范围：[0,99999]
-
-##### 返回值
-
-无，控制台会有log打印设置结果
-
-
-#####代码示例
-
-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.setBadge(5);
-		window.plugins.jPushPlugin.reSetBadge();
-	}
-#### API - setDebugModeFromIos
-
-API 用于开启Debug模式，显示更多的日志信息
-
-建议调试时开启这个选项，不调试的时候注释这句代码，这个函数setLogOFF是相反的一对
-
-##### 接口定义
-
-	JPushPlugin.prototype.setDebugModeFromIos = function()
-	
-##### 平台
-iOS
-
-#####代码示例
-
-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.setDebugModeFromIos();
-	}
-
-#### API - setLogOFF
-
-API用来关闭日志信息（除了必要的错误信息）
-
-不需要任何调试信息的时候，调用此API （发布时建议调用此API，用来屏蔽日志信息，节省性能消耗)
-
-##### 平台
-iOS
-
-##### 接口定义 
-
-	JPushPlugin.prototype.setLogOFF = function()
-
-#####代码示例
-
-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.setLogOFF();
-	}
-
-#### API - receiveMessageIniOSCallback
-
-用于iOS收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
-
-##### 使用平台
-iOS
-
-##### 参数说明
-
- data 	是一个js字符串使用如下代码解析，js具体key根据应用内消息来确定
-	
-		var bToObj = JSON.parse(data);
-
-
-
-
-
-
-#### API - init
-
-调用此API,用来
-JPush SDK 提供的推送服务是默认开启的。
-
-
-##### 接口定义
-
-	JPushPlugin.prototype.init = function()
-
-##### 参数说明
-无
-##### 返回值
-无
-
-
-#### API - setDebugMode
-
-用于开启调试模式，可以查看集成JPush过程中的log，如果集成失败，可方便定位问题所在
-
-##### 接口定义
-
-	JPushPlugin.prototype.setDebugMode = function(mode)
-
-##### 参数说明
-
- num 保存的条数
-
-##### 返回值
-无
-
-
-
-#### API - stopPush
-
-
-开发者App可以通过调用停止推送服务API来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
-
-调用了本 API 后，JPush 推送服务完全被停止。具体表现为：
-
-－ JPush Service 不在后台运行
-－ 收不到推送消息
-－ 不能通过 JPushInterface.init 恢复，需要调用resumePush恢复
-－ 极光推送所有的其他 API 调用都无效
-
-
-
-##### 接口定义 
-
-	JPushPlugin.prototype.stopPush = function()
-	
-#####平台
-android
-
-	
-##### 参数说明
-无
-##### 返回值
-无
-
-#### API - resumePush
-
-恢复推送服务。
-调用了此 API 后，极光推送完全恢复正常工作。
-
-##### 接口定义
-
-	JPushPlugin.prototype.resumePush = function()
-
-##### 参数说明
-无
-##### 返回值
-无
-
-#### API - isPushStopped
-
-用来检查 Push Service 是否已经被停止
-
-##### 接口定义
-
-	JPushPlugin.prototype.isPushStopped = function(callback)
-
-
-#####平台
-android
-
-##### 参数说明
-
-+ callback 回调函数，用来通知JPush的推送服务是否开启
-
-		var onCallback = function(data) {
-		    if(data>0){
-		    	//开启
-		    }else{
-		    	//关闭
-		    }
-		}
-
-##### 返回值
-无
-
-
-
-#### API - setBasicPushNotificationBuilder,setCustomPushNotificationBuilder
-
-当用户需要定制默认的通知栏样式时，则可调用此方法。
-极光 Push SDK 提供了 2 个用于定制通知栏样式的构建类：
-
- setBasicPushNotificationBuilder 
-	- Basic 用于定制 Android Notification 里的 defaults / flags / icon 等基础样式（行为）
- setCustomPushNotificationBuilder
-	- 继承 Basic 进一步让开发者定制 Notification Layout
-	
-如果不调用此方法定制，则极光Push SDK 默认的通知栏样式是：Android标准的通知栏提示。
-
-#####平台
-android
-
-##### 接口定义 
-
-	JPushPlugin.prototype.setBasicPushNotificationBuilder = function()
-	JPushPlugin.prototype.setCustomPushNotificationBuilder = function()
-
-#### 参数说明
-
-无
-
-##### 返回值
-
-无
-
-#### API - clearAllNotification
-
-推送通知到客户端时，由 JPush SDK 展现通知到通知栏上。
-
-此 API 提供清除通知的功能，包括：清除所有 JPush 展现的通知（不包括非 JPush SDK 展现的）
-
-
-##### 接口定义
-
-	JPushPlugin.prototype.clearAllNotification = function()
-
-#####平台
-android
-
-##### 参数说明
-无
-##### 返回值
-无
-
-#### API - setLatestNotificationNum
-
-通过极光推送，推送了很多通知到客户端时，如果用户不去处理，就会有很多保留在那里。
-
-新版本 SDK (v1.3.0) 增加此功能，限制保留的通知条数。默认为保留最近 5 条通知。
-
-开发者可通过调用此 API 来定义为不同的数量。
-
-
-
-##### 接口定义
-
-	JPushPlugin.prototype.setLatestNotificationNum = function(num)
-	
-	
-#####平台
-android
-
-##### 参数说明
-
- num 保存的条数
-
-##### 返回值
-无
-
-
-#### API - addLocalNotification,removeLocalNotification,clearLocalNotifications
-
-
-本地通知API不依赖于网络，无网条件下依旧可以触发
-
-本地通知与网络推送的通知是相互独立的，不受保留最近通知条数上限的限制
-
-本地通知的定时时间是自发送时算起的，不受中间关机等操作的影响
-
-
-三个接口的功能分别为：添加一个本地通知，删除一个本地通知，删除所有的本地通知
-
-#####接口定义
-
-	JPushPlugin.prototype.addLocalNotification = function(builderId,
-											    content,
-												title,
-												notificaitonID,
-												broadcastTime,
-												extras)
-	JPushPlugin.prototype.removeLocalNotification = function(notificationID)
-	JPushPlugin.prototype.clearLocalNotifications = function()
-
-#####平台
-android
-
-##### 参数说明
-
- builderId 设置本地通知样式
- content 设置本地通知的content
- title 设置本地通知的title
- notificaitonID 设置本地通知的ID
- broadcastTime 设置本地通知触发时间，为距离当前时间的数值，单位是毫秒
- extras 设置额外的数据信息extras为json字符串
-
-##### 返回值说明
-
-无
-
-
-#### API - receiveMessageInAndroidCallback
-
-用于iOS收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
-
-##### 接口定义
-
-	JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data)
-
-
-#####平台
-android
-
-##### 参数说明
-
- data 接收到的js字符串
-
-##### 返回值
-无
-
-#### API - receiveMessageInAndroidCallback
-
-用于iOS收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
-
-##### 接口定义
-
-	JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data)
-
-#####平台
-android
-
-##### 参数说明
- data 接收到的js字符串，包含的key:value请进入该函数体查看
-
-##### 返回值
-无
-
-
+###更多
+ [JPush官网文档](http://docs.jpush.io/)
--- a/document/Android_detail_api.md
+++ b/document/Android_detail_api.md
@@ -0,0 +1,185 @@
+## adnroid API简介
+
+
+
+### 获取集成日志
+
+#### API - setDebugMode
+
+用于开启调试模式，可以查看集成JPush过程中的log，如果集成失败，可方便定位问题所在
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.setDebugMode (mode)
+
+##### 参数说明
+
+- mode的值
+
+	- true  显示集成日志
+	- false 不显示集成日志
+
+
+###  接收消息和点击通知事件
+#### API - receiveMessageInAndroidCallback
+
+用于android收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.receiveMessageInAndroidCallback = function(data)
+	
+##### 参数说明
+- data 接收到的js字符串，包含的key:value请进入该函数体查看
+
+##### 代码示例
+
+#### API - openNotificationInAndroidCallback
+
+当点击android手机的通知栏进入应用程序时,会调用这个函数，这个函数不需要主动调用，是作为回调函数来用的
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.openNotificationInAndroidCallback = function(data)
+	
+##### 参数说明
+- data js字符串
+
+##### 代码示例
+
+###  统计分析 API
+
+#### API - onResume / onPause
+这是一个 android local api，不是js的api，请注意
+本 API 用于“用户使用时长”，“活跃用户”，“用户打开次数”的统计，并上报到服务器，在 Portal 上展示给开发者。
+
+
+
+####接口定义
+
+		public static void onResume(final Activity activity)
+		public static void onPause(final Activity activity)
+####参数说明
+
+ ＋ Activity activity 当前所在的Activity。
+####调用说明
+
+应在所有的 Activity 的 onResume / onPause 方法里调用。
+
+####代码示例
+
+	@Override
+	protected void onResume() {
+	    super.onResume();
+	    JPushInterface.onResume(this);
+	}
+	@Override
+	protected void onPause() {
+	    super.onPause();
+	    JPushInterface.onPause(this);
+	}
+
+
+#### API - reportNotificationOpened
+
+用于上报用户的通知栏被打开，或者用于上报用户自定义消息被展示等客户端需要统计的事件。
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.reportNotificationOpened(msgID)
+	
+##### 参数说明
+- msgID
+	-收到的通知或者自定义消息的id 	
+
+
+###  清除通知 API
+
+#### API - clearAllNotification
+
+推送通知到客户端时，由 JPush SDK 展现通知到通知栏上。
+
+此 API 提供清除通知的功能，包括：清除所有 JPush 展现的通知（不包括非 JPush SDK 展现的）
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.clearAllNotification = function()
+
+###  设置允许推送时间 API
+###  设置通知静默时间 API
+###  通知栏样式定制 API
+
+#### API - setBasicPushNotificationBuilder,setCustomPushNotificationBuilder
+
+当用户需要定制默认的通知栏样式时，则可调用此方法。
+极光 Push SDK 提供了 2 个用于定制通知栏样式的构建类：
+
+- setBasicPushNotificationBuilder 
+	- Basic 用于定制 Android Notification 里的 defaults / flags / icon 等基础样式（行为）
+- setCustomPushNotificationBuilder
+	- 继承 Basic 进一步让开发者定制 Notification Layout
+	
+如果不调用此方法定制，则极光Push SDK 默认的通知栏样式是：Android标准的通知栏提示。
+
+##### 接口定义 
+
+	window.plugins.jPushPlugin.setBasicPushNotificationBuilder = function()
+	window.plugins.jPushPlugin.setCustomPushNotificationBuilder = function()
+
+
+###  设置保留最近通知条数 API
+
+#### API - setLatestNotificationNum
+
+通过极光推送，推送了很多通知到客户端时，如果用户不去处理，就会有很多保留在那里。
+
+新版本 SDK (v1.3.0) 增加此功能，限制保留的通知条数。默认为保留最近 5 条通知。
+
+开发者可通过调用此 API 来定义为不同的数量。
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.setLatestNotificationNum(num)
+	
+##### 参数说明
+
+- num 保存的条数
+
+
+###  本地通知API
+#### API - addLocalNotification,removeLocalNotification,clearLocalNotifications
+
+
+本地通知API不依赖于网络，无网条件下依旧可以触发
+
+本地通知与网络推送的通知是相互独立的，不受保留最近通知条数上限的限制
+
+本地通知的定时时间是自发送时算起的，不受中间关机等操作的影响
+
+
+三个接口的功能分别为：添加一个本地通知，删除一个本地通知，删除所有的本地通知
+
+#####接口定义
+
+	window.plugins.jPushPlugin.addLocalNotification = function(builderId,
+											    content,
+												title,
+												notificaitonID,
+												broadcastTime,
+												extras)
+	window.plugins.jPushPlugin.removeLocalNotification = function(notificationID)
+	window.plugins.jPushPlugin.clearLocalNotifications = function()
+
+##### 参数说明
+
+- builderId 设置本地通知样式
+- content 设置本地通知的content
+- title 设置本地通知的title
+- notificaitonID 设置本地通知的ID
+- broadcastTime 设置本地通知触发时间，为距离当前时间的数值，单位是毫秒
+- extras 设置额外的数据信息extras为json字符串
+
+
--- a/document/Android_handle_install.md
+++ b/document/Android_handle_install.md
@@ -0,0 +1,108 @@
+#Android 手工安装
+
+下载jpush phonegap插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
+
+1. 复制：`$JPUSH_PLUGIN_DIR`/src/android/*.java 到cn/jpush/phonega/目录下(即：cn.jpush.phonegap的包下)
+2. 复制：`$JPUSH_PLUGIN_DIR`/src/android/armeabi/libjpush.so 到lib/armeabi/
+3. 复制：`$JPUSH_PLUGIN_DIR`/src/android/jpush-sdk-release1.5.0.jar 到lib/
+4. 复制：`$JPUSH_PLUGIN_DIR`/src/android/test_notification_layout.xml到res/layout/
+5. 复制：`$JPUSH_PLUGIN_DIR`/src/android/jpush_notification_icon.png 到res/drawable/
+6. 修改 AndroidManifest.xml 在 manifest 节点下添加以下权限
+
+		<!-- Required  一些系统要求的权限，如访问网络等-->
+		<uses-permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"/>
+		<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
+		<uses-permission android:name="android.permission.INTERNET"/>
+		<uses-permission android:name="android.permission.WAKE_LOCK"/>
+		<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+		<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+		<uses-permission android:name="android.permission.VIBRATE"/>
+		<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+		<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+		<permission
+		      android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
+		      android:protectionLevel="signature"/>
+
+7. 修改AndroidManifest.xml 在 manifest/application 节点下添加SDK相关组件声明
+
+		<activity
+			android:name="cn.jpush.android.ui.PushActivity"
+			android:theme="@android:style/Theme.Translucent.NoTitleBar"
+			android:configChanges="orientation|keyboardHidden">
+			<intent-filter>
+			<action android:name="cn.jpush.android.ui.PushActivity"/>
+			<category android:name="android.intent.category.DEFAULT"/>
+			<category android:name="$PACKAGE_NAME"/>
+			</intent-filter>
+		</activity>
+		<!-- Required  SDK核心功能-->
+		<service
+			android:name="cn.jpush.android.service.DownloadService"
+			android:enabled="true"
+			android:exported="false">
+		</service>
+		<!-- Required SDK 核心功能-->
+		<service
+			android:name="cn.jpush.android.service.PushService"
+			android:enabled="true"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="cn.jpush.android.intent.REGISTER"/>
+				<action android:name="cn.jpush.android.intent.REPORT"/>
+				<action android:name="cn.jpush.android.intent.PushService"/>
+				<action android:name="cn.jpush.android.intent.PUSH_TIME"/>
+			
+			</intent-filter>
+		</service>
+		<!-- Required SDK核心功能-->
+		<receiver
+		android:name="cn.jpush.android.service.PushReceiver"
+		android:enabled="true">
+			<intent-filter android:priority="1000">
+				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
+				<!--Required  显示通知栏 -->
+				<category android:name="$PACKAGE_NAME"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.USER_PRESENT"/>
+				<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+			</intent-filter>
+			<!-- Optional -->
+			<intent-filter>
+				<action android:name="android.intent.action.PACKAGE_ADDED"/>
+				<action android:name="android.intent.action.PACKAGE_REMOVED"/>
+				<data android:scheme="package"/>
+			</intent-filter>
+		</receiver>
+		
+		<!-- User defined.  For test only  用户自定义的广播接收器 -->
+		<receiver
+		android:name="cn.jpush.phonegap.MyReceiver"
+		android:enabled="true">
+			<intent-filter android:priority="1000">
+				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
+				<!-- Required  显示通知栏 -->
+				<category android:name="$PACKAGE_NAME"/>
+				</intent-filter>
+			<intent-filter>
+			<action android:name="cn.jpush.android.intent.REGISTRATION"/>
+			<!-- Required  用户注册SDK的intent -->
+			<action android:name="cn.jpush.android.intent.UNREGISTRATION"/>
+			<action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED"/>
+			<!-- Required  用户接收SDK消息的intent -->
+			<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED"/>
+			<!-- Required  用户接收SDK通知栏信息的intent -->
+			<action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/>
+			<!-- Required  用户打开自定义通知栏的intent -->
+			<action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK"/>
+			<!-- Optional 用户接受Rich Push Javascript 回调函数的intent -->
+			<category android:name="$PACKAGE_NAME"/>
+			</intent-filter>
+		</receiver>
+		<!-- Required SDK核心功能-->
+		<receiver android:name="cn.jpush.android.service.AlarmReceiver"/>
+		<!-- Required  . Enable it you can get statistics data with channel -->
+		<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
+		<meta-data android:name="JPUSH_APPKEY" android:value="299d0fee887820e7d90a68b2"/>
--- a/document/Common_detail_api.md
+++ b/document/Common_detail_api.md
@@ -0,0 +1,375 @@
+#通用API说明
+
+
+## 停止与恢复推送服务 API	
+### API - init
+
+调用此API,用来开启
+JPush SDK 提供的推送服务。
+
+开发者App可以通过调用停止推送服务API来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
+
+```
+本功能是一个完全本地的状态操作。也就是说：停止推送服务的状态不会保存到服务器上。
+
+如果停止推送服务后，开发者App被重新安装，或者被清除数据，
+
+JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数据被清除掉了）。 
+本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，
+
+恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
+```
+
+#### 接口定义
+
+	window.plugins.jPushPlugin.init()
+
+### API - stopPush
+ 在android平台 
+
+	+ 开发者App可以通过调用停止推送服务API来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
+	
+	
+	+ 调用了本 API 后，JPush 推送服务完全被停止。具体表现为：
+		
+		+ JPush Service 不在后台运行
+		+ 收不到推送消息
+		+ 不能通过 JPushInterface.init 恢复，需要调用resumePush恢复
+		+ 极光推送所有的其他 API 调用都无效
+
+ iOS平台
+
+	+ 不推荐调用，因为这个API只是让你的DeviceToken失效，在设置－通知 中您的应用程序没有任何变化
+    + 推荐：设置一个UI界面， 提醒用户在在设置－通知关闭推送服务
+
+### 接口定义 
+    
+    window.plugins.jPushPlugin.stopPush()
+	
+
+#### API - resumePush
+
+
+恢复推送服务。调用了此 API 后
+
+ 在android平台 
+
+	+ 极光推送完全恢复正常工作，
+
+ iOS平台
+	
+	+ 重新去APNS注册
+
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.resumePush()
+
+#### API - isPushStopped
+
+ 在android平台 
+
+	+ 用来检查 Push Service 是否已经被停止
+
+ iOS平台
+	
+	+ 平台检查推送服务是否注册
+
+
+##### 接口定义
+
+	    window.plugins.jPushPlugin.isPushStopped(callback)
+
+
+##### 参数说明
+
+ callback 回调函数，用来通知JPush的推送服务是否开启
+
+####代码示例
+	    window.plugins.jPushPlugin.resumePush(callback)
+		var onCallback = function(data) {
+		    if(data>0){
+		    	//开启
+		    }else{
+		    	//关闭
+		    }
+		}
+
+
+##获取 RegistrationID API
+
+### API - getRegistrationID
+
+RegistrationID 定义
+
+集成了 JPush SDK 的应用程序在第一次成功注册到 JPush 服务器时，JPush 服务器会给客户端返回一个唯一的该设备的标识 - RegistrationID。JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
+
+应用程序可以把此 RegistrationID 保存以自己的应用服务器上，然后就可以根据 RegistrationID 来向设备推送消息或者通知。
+
+#### 接口定义
+
+	JPushPlugin.prototype.getRegistrationID = function(callback)
+
+##### 参数说明
+无
+#### 返回值
+
+调用此 API 来取得应用程序对应的 RegistrationID。 只有当应用程序成功注册到 JPush 的服务器时才返回对应的值，否则返回空字符串。
+
+#### 调用示例
+
+ 	window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+	var onGetRegistradionID = function(data) {
+		try{
+			console.log("JPushPlugin:registrationID is "+data)		}
+		catch(exception){
+			console.log(exception);
+		}
+	}
+
+##别名与标签 API
+
+### API - setTagsWithAlias,setTags,setAlias
+
+提供几个相关 API 用来设置别名（alias）与标签（tags）。
+
+这几个 API 可以在 App 里任何地方调用。
+
+别名 alias
+
+为安装了应用程序的用户，取个别名来标识。以后给该用户 Push 消息时，就可以用此别名来指定。
+
+每个用户只能指定一个别名。
+
+同一个应用程序内，对不同的用户，建议取不同的别名。这样，尽可能根据别名来唯一确定用户。
+
+系统不限定一个别名只能指定一个用户。如果一个别名被指定到了多个用户，当给指定这个别名发消息时，服务器端API会同时给这多个用户发送消息。
+
+举例：在一个用户要登录的游戏中，可能设置别名为 userid。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userid 调用服务器端API发通知到客户端提醒用户。
+
+标签 tag
+
+为安装了应用程序的用户，打上标签。其目的主要是方便开发者根据标签，来批量下发 Push 消息。
+
+可为每个用户打多个标签。
+
+不同应用程序、不同的用户，可以打同样的标签。
+
+举例： game, old_page, women
+
+#### 接口定义
+
+	JPushPlugin.prototype.setTagsWithAlias = function(tags,alias)
+	JPushPlugin.prototype.setTags = function(tags)
+	JPushPlugin.prototype.setAlias = function(alias)
+
+####使用平台
+android iOS
+
+
+#### 参数说明
+* tags
+	* 参数类型为数组	
+	* nil 此次调用不设置此值
+	* 空集合表示取消之前的设置 
+	* 每次调用至少设置一个 tag，覆盖之前的设置，不是新增
+	* 有效的标签组成：字母（区分大小写）、数字、下划线、汉字
+	* 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节。（判断长度需采用UTF-8编码）
+	* 单个设备最多支持设置 100 个 tag。App 全局 tag 数量无限制。
+* alias 
+	* 参数类型为字符串
+	* nil 此次调用不设置此值
+	* 空字符串 （""）表示取消之前的设置
+	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
+	* 限制：alias 命名长度限制为 40 字节。（判断长度需采用UTF-8编码）
+	
+#### 返回值说明
+
+函数本身无返回值，但需要注册`jpush.setTagsWithAlias	`事件来监听设置结果
+	
+	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
+    var onTagsWithAlias = function(event){
+       try{
+           console.log("onTagsWithAlias");    
+           var result="result code:"+event.resultCode+" ";
+           result+="tags:"+event.tags+" ";
+           result+="alias:"+event.alias+" ";
+           $("#tagAliasResult").html(result);
+       }
+       catch(exception){
+           console.log(exception)
+       }
+   }
+
+####错误码定义
+
+
+
+
+|Code|描述|详细解释|
+|-|-|-|
+|6001|	无效的设置，tag/alias 不应参数都为 null||	
+|6002|	设置超时|	建议重试|
+|6003|	alias| 字符串不合法	有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
+|6004|	alias超长。最多 40个字节	中文 UTF-8 是 3 个字节|
+|6005|	某一个 tag 字符串不合法|	有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
+|6006|	某一个 tag 超长。|一个 tag 最多 40个字节	中文 UTF-8 是 3 个字节|
+|6007|	tags 数量超出限制。最多 100个|	这是一台设备的限制。一个应用全局的标签数量无限制。|
+|6008|	tag/alias 超出总长度限制。|总长度最多 1K 字节|
+|6011|	10s内设置tag或alias大于3次|	短时间内操作过于频繁|
+
+### 获取点击通知内容
+
+#### event - jpush.openNotification
+
+点击通知进入应用程序时会出发改事件
+
+#####代码示例
+
+- 在你需要接收通知的的js文件中加入:
+	           
+		document.addEventListener("jpush.openNotification", onOpenNotification, false);
+
+- onOpenNotification需要这样写：
+		
+		
+                    var alertContent
+                    if(device.platform == "Android"){
+                        alertContent=window.plugins.jPushPlugin.openNotification.alert;
+                    }else{
+                        alertContent   = event.aps.alert;
+                    }
+                    alert("open Notificaiton:"+alertContent);
+
+ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+	
+ android
+
+		{"alert":"ding",
+		"extras":{
+			     "cn.jpush.android.MSG_ID":"1691785879",
+			     "app":"com.thi.pushtest",
+			     "cn.jpush.android.ALERT":"ding",
+			     "cn.jpush.android.EXTRA":{},
+			     "cn.jpush.android.PUSH_ID":"1691785879",
+			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
+			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
+		
+ iOS 
+
+		{
+		"aps":{
+			  "badge":1,
+			  "sound":"default",
+			  "alert":"今天去哪儿"
+			  },
+		"_j_msgid":154604475
+		}
+
+### 获取通知内容
+
+#### event - jpush.receiveNotification
+
+点击通知进入应用程序时会触发该事件
+
+#####代码示例
+
+- 在你需要接收通知的的js文件中加入:
+	           
+		document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+
+- onReceiveNotification需要这样写：
+		
+		
+                    var alertContent
+                    if(device.platform == "Android"){
+                        alertContent=window.plugins.jPushPlugin.receiveNotification.alert;
+                    }else{
+                        alertContent   = event.aps.alert;
+                    }
+                    alert("open Notificaiton:"+alertContent);
+
+ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+	
+ android
+
+		{"alert":"ding",
+		"extras":{
+			     "cn.jpush.android.MSG_ID":"1691785879",
+			     "app":"com.thi.pushtest",
+			     "cn.jpush.android.ALERT":"ding",
+			     "cn.jpush.android.EXTRA":{},
+			     "cn.jpush.android.PUSH_ID":"1691785879",
+			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
+			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
+		
+ iOS 
+
+		{
+		"aps":{
+			  "badge":1,
+			  "sound":"default",
+			  "alert":"今天去哪儿"
+			  },
+		"_j_msgid":154604475
+		}
+
+
+### 获取自定义消息推送内容
+
+
+####event - jpush.receiveMessage
+
+收到应用内消息时触发这个事件
+
+`推荐使用事件的方式传递，但同时保留了receiveMessageIniOSCallback的回调函数，兼容以前的代码`
+
+
+#####代码示例
+
+- 在你需要接收通知的的js文件中加入:
+	           
+		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+
+- onReceiveMessage需要这样写：
+		
+		
+            var onReceiveMessage = function(event){
+                try{
+                    var message
+                    if(device.platform == "Android"){
+                  		 message = window.plugins.jPushPlugin.receiveMessage.message;
+                    }else{
+                         message   = event.content;
+                    }          
+                     $("#messageResult").html(message);
+                     
+                }
+                catch(exception){
+                    console.log("JPushPlugin:onReceiveMessage-->"+exception);
+                }
+            }
+
+ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+
+ android
+
+		{"message":"今天去哪儿",
+		"extras"{
+				"cn.jpush.android.MSG_ID":"154378013",
+				"cn.jpush.android.CONTENT_TYPE":"",
+				"cn.jpush.android.EXTRA":{"key":"不添没有"}
+				}
+		}
+ iOS
+
+		 {
+		 "content":"今天去哪儿",
+		 "extras":
+		          {
+		 		  "key":"不填写没有"
+		 		  }
+		 }
+	
+
--- a/document/iOS_detail_api.md
+++ b/document/iOS_detail_api.md
@@ -0,0 +1,150 @@
+## iOS API简介
+
+### 获取 APNs（通知） 推送内容
+
+
+#### API - receiveMessageIniOSCallback
+
+用于iOS收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
+不推荐使用回调函数
+
+##### 接口定义
+
+	JPushPlugin.prototype.receiveMessageIniOSCallback = function(data)
+
+#####参数说明
+
+- data 	是一个js字符串使用如下代码解析，js具体key根据应用内消息来确定
+	
+		var bToObj = JSON.parse(data);
+		
+#####返回值
+无
+
+#####  代码示例
+
+
+### 页面的统计
+#### API - startLogPageView,stopLogPageView,beginLogPageView
+
+本 API 用于“用户指定页面使用时长”的统计，并上报到服务器，在 Portal 上展示给开发者。页面统计集成正确，才能够获取正确的页面访问路径、访问深度（PV）的数据。
+
+##### 接口定义
+	window.plugins.jPushPlugin.startLogPageView = function(pageName)
+	window.plugins.jPushPlugin.stopLogPageView = function(pageName)
+	window.plugins.jPushPlugin.beginLogPageView = function(pageName,duration)
+#####参数说明
+pageName 需要统计页面自定义名称
+duration 自定义的页面时间
+#####调用说明
+应在所有的需要统计得页面得 viewWillAppear 和 viewWillDisappear 加入 startLogPageView 和 stopLogPageView 来统计当前页面的停留时间。
+
+	或者直接使用 beginLogPageView 来自定义加入页面和时间信息。
+#####返回值说明
+无
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.beginLogPageView("newPage",5);
+		window.plugins.jPushPlugin.startLogPageView("onePage");
+		window.plugins.jPushPlugin.stopLogPageView("onePage");
+	}
+### 设置Badge
+#### API - setBadge,resetBadge
+
+ JPush封装badge功能，允许应用上传badge值至JPush服务器，由JPush后台帮助管理每个用户所对应的推送badge值，简化了设置推送badge的操作。
+（本接口不会直接改变应用本地的角标值. 要修改本地badege值，使用 setApplicationIconBadgeNumber）
+
+实际应用中，开发者可以直接对badge值做增减操作，无需自己维护用户与badge值之间的对应关系。
+##### 接口定义
+
+	window.plugins.jPushPlugin.setBadge(value)
+	window.plugins.jPushPlugin.reSetBadge()
+
+`resetBadge相当于setBadge(0)`
+##### 参数说明
+value 取值范围：[0,99999]
+##### 返回值
+无，控制台会有log打印设置结果
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setBadge(5);
+		window.plugins.jPushPlugin.reSetBadge();
+	}
+
+#### API - setApplicationIconBadgeNumber
+
+本接口直接改变应用本地的角标值.
+设置iOS的角标，当设置badge＝0时为清除角标
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.setApplicationIconBadgeNumber(badge)
+	
+##### 参数说明
+
+- badge 整形,例如0，1，2
+- 当badge为0时，角标被清除
+
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
+	}
+
+
+#### API - getApplicationIconBadgeNumber
+
+获取iOS的角标值
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.getApplicationIconBadgeNumber(callback)
+	
+##### 参数说明
+
+- callback 回调函数
+
+#####代码示例
+```			    	
+
+window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data){
+     console.log(data);               
+ });
+ 
+``` 
+
+### 本地通知
+
+### 日志等级设置
+#### API - setDebugModeFromIos
+API 用于开启Debug模式，显示更多的日志信息
+
+建议调试时开启这个选项，不调试的时候注释这句代码，这个函数setLogOFF是相反的一对
+##### 接口定义
+
+	window.plugins.jPushPlugin.reSetBadge.setDebugModeFromIos()
+	
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setDebugModeFromIos();
+	}
+
+#### API - setLogOFF
+
+API用来关闭日志信息（除了必要的错误信息）
+
+不需要任何调试信息的时候，调用此API （发布时建议调用此API，用来屏蔽日志信息，节省性能消耗)
+
+##### 接口定义 
+
+	window.plugins.jPushPlugin.reSetBadge.setLogOFF ()
+
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setLogOFF();
+	}
+
--- a/document/iOS_handle_install.md
+++ b/document/iOS_handle_install.md
@@ -0,0 +1,62 @@
+### IOS手工安装
+
+下载jpush phonegap插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
+
+
+1. 用xcode打开iOS工程 将`$JPUSH_PLUGIN_DIR`/src/ios/Plugins/拖到project中  
+2. 将`$JPUSH_PLUGIN_DIR`/src/ios/lib/拖到project中  
+
+4. 添加以下框架，打开xocode，点击project，选择(Target -> Build Phases -> Link Binary With Libraries)
+
+		CFNetwork.framework
+		CoreFoundation.framework
+		CoreTelephony.framework
+		SystemConfiguration.framework
+		CoreGraphics.framework
+		Foundation.framework
+		UIKit.framework
+
+
+5. 在你的工程中创建一个新的Property List文件
+
+		并将其命名为PushConfig.plist，填入Portal为你的应用提供的APP_KEY等参数
+
+10. 在AppDelegate.m中包含头文件
+
+		#import "APService.h"
+	    #import "JPushPlugin.h"
+
+6. 调用代码,监听系统事件，相应地调用 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];
+		}
+
+7. 修改phonegap config.xml文件用来包含Plugin/内的插件
+
+
+		<feature name="JPushPlugin">
+		    <param name="ios-package" value="JPushPlugin" />
+		    <param name="onload" value="true" />
+		</feature>
+
+
+8. 复制`$JPUSH_PLUGIN_DIR`/www/PushNotification.js到工程的www目录下面  
+9. 在需要使用插件处加入
+
+		<script type="text/javascript" src="JPushPlugin.js"></script>
--- a/example/index.html
+++ b/example/index.html
@@ -1,151 +1,224 @@
-
 <!DOCTYPE html>
 <html>
-    
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-            <title>Phonegap Sample App</title>
-            <link href="css/jquery.mobile-1.1.1.css" rel="stylesheet" type="text/css"/>
-            <script type="text/javascript" src="js/jquery.js"></script>
-            <script type="text/javascript" src="js/jquery.mobile-1.1.1.js"></script>
-            <script type="text/javascript" src="cordova.js"></script>
-            <script type="text/javascript"> 
-            var onDeviceReady   = function(){
-                console.log("JPushPlugin:Device ready!")
-                initiateUI();
-            }            
-            var onTagsWithAlias = function(event){
-                try{
-                    console.log("onTagsWithAlias");    
-                    var result="result code:"+event.resultCode+" ";
-                    result+="tags:"+event.tags+" ";
-                    result+="alias:"+event.alias+" ";
-                    $("#tagAliasResult").html(result);
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Phonegap Sample App</title>
+    <link href="css/jquery.mobile-1.1.1.css" rel="stylesheet" type="text/css"/>
+    <script type="text/javascript" src="js/jquery.js"></script>
+    <script type="text/javascript" src="js/jquery.mobile-1.1.1.js"></script>
+    <script type="text/javascript" src="cordova.js"></script>
+    <script type="text/javascript">
+        var onDeviceReady = function () {
+            console.log("JPushPlugin:Device ready!");
+            initiateUI();
+        };
+
+        function getRegistrationID() {
+            window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+        }
+
+        var onGetRegistradionID = function (data) {
+            try {
+
+                console.log("JPushPlugin:registrationID is " + data);
+
+                if (data.length == 0) {
+                    var t1 = window.setTimeout(getRegistrationID, 1000);
                }
-                catch(exception){
-                    console.log(exception)
+                $("#registrationid").html(data);
+            }
+            catch (exception) {
+                console.log(exception);
+            }
+        };
+
+        var onTagsWithAlias = function (event) {
+            try {
+                console.log("onTagsWithAlias");
+                var result = "result code:" + event.resultCode + " ";
+                result += "tags:" + event.tags + " ";
+                result += "alias:" + event.alias + " ";
+                $("#tagAliasResult").html(result);
+            }
+            catch (exception) {
+                console.log(exception)
+            }
+        };
+        var onOpenNotification = function (event) {
+            try {
+                var alertContent;
+                if (device.platform == "Android") {
+                    alertContent = window.plugins.jPushPlugin.openNotification.alert;
+                } else {
+                    alertContent = event.aps.alert;
+                }
+                alert("open Notificaiton:" + alertContent);
+
+            }
+            catch (exception) {
+                console.log("JPushPlugin:onOpenNotification" + exception);
+            }
+        };
+        var onReceiveNotification = function (event) {
+            try {
+                var alertContent;
+                if (device.platform == "Android") {
+                    alertContent = window.plugins.jPushPlugin.receiveNotification.alert;
+                } else {
+                    alertContent = event.aps.alert;
+                }
+                $("#notificationResult").html(alertContent);
+
+            }
+            catch (exeption) {
+                console.log(exception)
+            }
+        };
+        var onReceiveMessage = function (event) {
+            try {
+
+                var message;
+                if (device.platform == "Android") {
+                    message = window.plugins.jPushPlugin.receiveMessage.message;
+                } else {
+                    message = event.content;
+                }
+                //var extras = window.plugins.jPushPlugin.extras
+
+                $("#messageResult").html(message);
+
+            }
+            catch (exception) {
+                console.log("JPushPlugin:onReceiveMessage-->" + exception);
+            }
+        };
+
+        var initiateUI = function () {
+
+            try {
+                window.plugins.jPushPlugin.init();
+                getRegistrationID();
+
+                if (device.platform != "Android") {
+                    window.plugins.jPushPlugin.setDebugModeFromIos();
+                    window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
+                } else {
+                    window.plugins.jPushPlugin.setDebugMode(true);
                }
            }
-            var onGetRegistradionID = function(data) {
-                try{
-                    console.log("JPushPlugin:registrationID is "+data)
-                    
-                    $("#registrationid").html(data);
+            catch (exception) {
+                console.log(exception);
+            }
+            $("#setTagWithAliasButton").click(function (ev) {
+
+//                 window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data){
+//                     console.log(data);
+//                 });
+
+                try {
+                    var tag1 = $("#tagText1").attr("value");
+                    var tag2 = $("#tagText2").attr("value");
+                    var tag3 = $("#tagText3").attr("value");
+                    var alias = $("#aliasText").attr("value");
+                    var dd = [];
+
+                    if (tag1 == "" && tag2 == "" && tag3 == "") {
+                    }
+                    else {
+                        if (tag1 != "") {
+                            dd.push(tag1);
+                        }
+                        if (tag2 != "") {
+                            dd.push(tag2);
+                        }
+                        if (tag3 != "") {
+                            dd.push(tag3);
+                        }
+                    }
+                    window.plugins.jPushPlugin.setTagsWithAlias(dd, alias);
+
                }
-                catch(exception){
+                catch (exception) {
                    console.log(exception);
                }
-            }
-            var initiateUI = function(){
-            
-            	try{
-            		window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
-//                	var extras={"name":"json"};
-// 					window.plugins.jPushPlugin.addLocalNotification(1,"hh","ln",1111,1000*60,extras);
-// 					window.plugins.jPushPlugin.removeLocalNotification(1111);
-// 					window.plugins.jPushPlugin.clearLocalNotifications();
-            	}
-            	catch(exception){
-            		console.log(exception);
-            	}
+            })
+        };
+        document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
+        document.addEventListener("jpush.openNotification", onOpenNotification, false);
+        document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+        document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+
+
+        //jpush.receiveMessage
+    </script>
+</head>
+<body>
+<div data-role="page" id="page">
+
+    <div data-role="content">
+        <form>
+            <div class="ui-body ui-body-b">
+
+                <div data-role="fieldcontain">
+                    <center><h3>JPushPlugin Example</h3></center>
+                    <span name="alias" id="alias"></span>
+                    <hr/>
+                    <label>RegistrationID: </label>
+                    <label id="registrationid">null</label>
+                </div>
+                <div data-role="fieldcontain">
+                    <label>Tags: </label>
+                    <table>
+                        <tr>
+                            <td>
+                                <input type="text" id="tagText1"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" id="tagText2"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" id="tagText3">
+                            </td>
+                        </tr>
+                    </table>
+                    <label>Alias: </label>
+                    <table>
+                        <tr>
+                            <td>
+                                <input type="text" id="aliasText">
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <div data-role="fieldcontain">
+                    <input type="button" id="setTagWithAliasButton" value="Add tag and alias"/>
+                </div>
+                <div data-role="fieldcontain">
+                    <label id="tagAliasPrompt">设置tag/alias结果： </label>
+                    <label id="tagAliasResult">null</label>
+                </div>
+                <div data-role="fieldcontain">
+                    <label id="notificationPrompt">接受的通知内容:</label>
+                    <label id="notificationResult">null</label>
+                </div>
+                <div data-role="fieldcontain">
+                    <label id="messagePrompt">接受的自定义消息:</label>
+                    <label id="messageResult">null</label>
+                </div>
+

-                //test android interface
-                //window.plugins.jPushPlugin.stopPush()
-                //window.plugins.jPushPlugin.resumePush();
-                //window.plugins.jPushPlugin.clearAllNoticication();
-                //window.plugins.jPushPlugin.setLatestNotificationNum(5);
-                //window.plugins.jPushPlugin.stopPush();
-                //window.plugins.jPushPlugin.isPushStopped(onIsPushStopped);
-                //window.plugins.jPushPlugin.init();
-                //window.plugins.jPushPlugin.setDebugMode(true);
-                //window.plugins.jPushPlugin.startLogPageView("mianPage");
-                
-               $("#setTagWithAliasButton").click(function(ev) {
-                    try{
-                        var tag1 = $("#tagText1").attr("value");
-                        var tag2 = $("#tagText2").attr("value");
-                        var tag3 = $("#tagText3").attr("value");
-                        var alias = $("#aliasText").attr("value");
-                        var dd = [];
-                            
-                        if(tag1==""&&tag2==""&&tag3==""){                          
-                        }
-                        else{
-                            if(tag1 != ""){
-                                dd.push(tag1);
-                            }
-                            if(tag2 != ""){
-                                dd.push(tag2);
-                            }
-                            if(tag3 != ""){
-                                dd.push(tag3);
-                            }
-                        }
-                        window.plugins.jPushPlugin.setTagsWithAlias(dd,alias);
-                        
-                    }
-                    catch(exception){
-                        console.log(exception);
-                    }
-                })
-            }
-            document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
-            document.addEventListener("deviceready", onDeviceReady, false);            
-        </script>
-    </head>
-    <body>
-        <div data-role="page" id="page">
-            
-            <div data-role="content">
-                <form>
-                    <div class="ui-body ui-body-b">
-                        
-                        <div data-role="fieldcontain">
-                            <center><h3>JPushPlugin Example</h3></center>
-                            <span name="alias" id="alias"></span><hr />
-                            <label>RegistrationID: </label>
-                            <label id="registrationid">null</label>
-                        </div>
-                        <div data-role="fieldcontain">
-                            <label>Tags: </label>
-                            <table>
-                                <tr>
-                                    <td>
-                                        <input type="text"  id="tagText1"/>
-                                    </td>                                    
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <input type="text"  id="tagText2"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <input type="text"  id="tagText3">
-                                    </td>
-                                </tr>
-                            </table>
-                            <label>Alias: </label>
-                            <table>
-                                <tr>
-                                    <td>
-                                        <input type="text"   id="aliasText">
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div data-role="fieldcontain">
-                            <input type="button" id="setTagWithAliasButton" value="Add tag and alias" />
-                        </div>
-                        <div data-role="fieldcontain">
-                            <label id="tagAliasResult" >null</label>
-                        </div>
-                    </div>
-                </form>
            </div>
-            
-        </div>
-    </body>
+        </form>
+    </div>
+
+</div>
+</body>
 </html>


--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
        xmlns:android="http://schemas.android.com/apk/res/android"
        id="cn.jpush.phonegap.JPushPlugin"
-        version="2.0.0">
+        version="2.1.0">

    <name>JPush Plugin</name>
    <description>JPush for cordova plugin</description>
@@ -10,12 +10,14 @@
    <keywords>JPush,push</keywords>
    <license>Apache 2.0 License</license>

+    <preference name="API_KEY" />
+
    <engines>
        <engine name="cordova" version=">=3.0"/>
    </engines>

    <js-module src="www/JPushPlugin.js" name="JPushPlugin">
-            <clobbers target="window.plugins.jPushPlugin"/>
+            <clobbers target="jPushPlugin"/>
    </js-module>

    <platform name="ios">
@@ -28,26 +30,32 @@
            <header-file src="src/ios/Plugins/JPushPlugin.h"/>
            <source-file src="src/ios/Plugins/JPushPlugin.m"/>
           
-            <header-file src="src/ios/lib/APService.h" />
-            <source-file src="src/ios/lib/libPushSDK.a" framework="true" />
-            
+            <header-file src="src/ios/lib/JPUSHService.h" />
+            <source-file src="src/ios/lib/jpush-ios-2.1.0.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" />
            <framework src="SystemConfiguration.framework" weak="true" />
            <framework src="CoreGraphics.framework" weak="true" />
            <framework src="Foundation.framework" weak="true" />
-            <framework src="CoreFoundation.framework" weak="true" />
            <framework src="UIKit.framework" weak="true" />
-            <framework src="CoreTelephony.framework" weak="true" />
            <framework src="Security.framework" weak="true" />
            <framework src="libz.dylib" weak="true" />
-            
+
+            <config-file target="*PushConfig.plist" parent="APP_KEY">
+                <string>$API_KEY</string>
+            </config-file>
        </platform>
        
    <!-- android -->
    <platform name="android">
+        <hook type="after_plugin_add" src="scripts/android-install.js" />
+        <hook type="after_plugin_install" src="scripts/android-install.js" />
+        <hook type="before_plugin_rm" src="scripts/android-install.js" />
+        <hook type="before_plugin_uninstall" src="scripts/android-install.js" />
    
        <config-file target="res/xml/config.xml" parent="/*">
            <feature name="JPushPlugin">
@@ -153,14 +161,16 @@
            <receiver android:name="cn.jpush.android.service.AlarmReceiver"/>
            <!-- Required  . Enable it you can get statistics data with channel -->
            <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
-            <meta-data android:name="JPUSH_APPKEY" android:value="your appkey"/>
+            <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY"/>
        </config-file>
-        <source-file src="src/android/jpush-sdk-release1.7.2.jar" target-dir="libs"/>
-        <source-file src="src/android/armeabi/libjpush172.so" target-dir="libs/armeabi"/>
-        <source-file src="src/android/armeabi-v7a/libjpush172.so" target-dir="libs/armeabi-v7a"/>
-        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>
+        <source-file src="src/android/jpush-android-2.0.6.jar" target-dir="libs"/>
+        <source-file src="src/android/armeabi/libjpush206.so" target-dir="libs/armeabi"/>
+        <source-file src="src/android/armeabi-v7a/libjpush206.so" target-dir="libs/armeabi-v7a"/>
+        <source-file src="src/android/arm64-v8a/libjpush206.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"/>
    	<source-file src="src/android/test_notification_layout.xml" target-dir="res/layout"/>
    	<source-file src="src/android/jpush_notification_icon.png" target-dir="res/drawable"/>
    </platform>
-</plugin>
+</plugin>
--- a/scripts/android-install.js
+++ b/scripts/android-install.js
@@ -0,0 +1,48 @@
+#!/usr/bin/env node
+
+module.exports = function (context) {
+    var path         = context.requireCordovaModule('path'),
+        fs           = context.requireCordovaModule('fs'),
+        shell        = context.requireCordovaModule('shelljs'),
+        projectRoot  = context.opts.projectRoot,
+        ConfigParser = context.requireCordovaModule('cordova-lib/src/configparser/ConfigParser'),
+        config       = new ConfigParser(path.join(context.opts.projectRoot, "config.xml")),
+        packageName = config.android_packageName() || config.packageName();
+
+    console.info("Running android-install.Hook: " + context.hook + ", Package: " + packageName + ", Path: " + projectRoot + ".");
+
+    if (!packageName) {
+        console.error("Package name could not be found!");
+        return ;
+    }
+
+    // android platform available?
+    if (context.opts.cordova.platforms.indexOf("android") === -1) {
+        console.info("Android platform has not been added.");
+        return ;
+    }
+
+    var targetDir  = path.join(projectRoot, "platforms", "android", "src", "cn", "jpush", "phonegap");
+        targetFile = path.join(targetDir, "JPushPlugin.java");
+        console.log(targetDir);
+
+    if (['after_plugin_add', 'after_plugin_install', 'after_platform_add'].indexOf(context.hook) === -1) {
+        // remove it?
+        try {
+            fs.unlinkSync(targetFile);
+        } catch (err) {}
+    } else {
+        // create directory
+        shell.mkdir('-p', targetDir);
+
+        // sync the content
+        fs.readFile(path.join(context.opts.plugin.dir, 'src', 'android', 'JPushPlugin.java'), {encoding: 'utf-8'}, function (err, data) {
+            if (err) {
+                throw err;
+            }
+
+            data = data.replace(/^import __PACKAGE_NAME__.R;/m, 'import ' + packageName + '.R;');
+            fs.writeFileSync(targetFile, data);
+        });
+    }
+};
--- a/src/android/JPushPlugin.java
+++ b/src/android/JPushPlugin.java
@@ -19,13 +19,15 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import java.util.Map.Entry;

-import your.package.name.R;
+import __PACKAGE_NAME__.R;

 import cn.jpush.android.api.BasicPushNotificationBuilder;
 import cn.jpush.android.api.CustomPushNotificationBuilder;
 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 = 
@@ -33,7 +35,7 @@ public class JPushPlugin extends CordovaPlugin {
 					"getRegistrationID",
 					"setTags",
 					"setTagsWithAlias",
-					"setAlias", 
+					"setAlias",
 					"getNotification",
 					"setBasicPushNotificationBuilder",
 					"setCustomPushNotificationBuilder",
@@ -46,15 +48,25 @@ public class JPushPlugin extends CordovaPlugin {
 					"setLatestNotificationNum",
 					"setPushTime",
 					"clearAllNotification",
+					"clearNotificationById",
 					"addLocalNotification",
 					"removeLocalNotification",
-					"clearLocalNotifications");
+					"clearLocalNotifications",
+					"onResume",
+					"onPause",
+					"reportNotificationOpened");
 	
 	private ExecutorService threadPool = Executors.newFixedThreadPool(1);
 	private static JPushPlugin instance;
+    private static String TAG = "JPushPlugin";
+
+	private  static  boolean shouldCacheMsg = false;

 	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;
@@ -63,11 +75,46 @@ public class JPushPlugin extends CordovaPlugin {
 	@Override
 	public void initialize(CordovaInterface cordova, CordovaWebView webView) {
 		super.initialize(cordova, webView);
-		//JPushInterface.setDebugMode(true);
+
+		Log.i(TAG, "---------------- initialize"+"-"+JPushPlugin.openNotificationAlert + "-" + JPushPlugin.notificationAlert);
+
+		shouldCacheMsg = false;
+
+            //如果同时缓存了打开事件openNotificationAlert 和 消息事件notificationAlert，只向UI 发 打开事件。
+            //这样做是为了和iOS 统一
+            if(JPushPlugin.openNotificationAlert != null){
+				JPushPlugin.notificationAlert = null;
+                JPushPlugin.transmitOpen(JPushPlugin.openNotificationAlert, JPushPlugin.openNotificationExtras);
+            }
+            if(JPushPlugin.notificationAlert!=null){
+                JPushPlugin.transmitReceive(JPushPlugin.notificationAlert, JPushPlugin.notificationExtras);
+            }
+
+
 		//JPushInterface.init(cordova.getActivity().getApplicationContext());
 	}


+
+	public void onPause(boolean multitasking) {
+		Log.i(TAG, "----------------  onPause");
+		shouldCacheMsg = true;
+	}
+
+	public void onResume(boolean multitasking) {
+		shouldCacheMsg = false;
+		Log.i(TAG, "---------------- onResume"+"-"+JPushPlugin.openNotificationAlert + "-" + JPushPlugin.notificationAlert);
+
+		if(JPushPlugin.openNotificationAlert != null){
+			JPushPlugin.notificationAlert = null;
+			JPushPlugin.transmitOpen(JPushPlugin.openNotificationAlert, JPushPlugin.openNotificationExtras);
+		}
+		if(JPushPlugin.notificationAlert!=null){
+			JPushPlugin.transmitReceive(JPushPlugin.notificationAlert, JPushPlugin.notificationExtras);
+		}
+	}
+
+
 	private static JSONObject notificationObject(String message,
 			Map<String, Object> extras) {
 		JSONObject data = new JSONObject();
@@ -75,7 +122,12 @@ public class JPushPlugin extends CordovaPlugin {
 			data.put("message", message);
 			JSONObject jExtras = new JSONObject();
 			for(Entry<String,Object> entry:extras.entrySet()){
-				jExtras.put(entry.getKey(),entry.getValue());
+				if(entry.getKey().equals("cn.jpush.android.EXTRA")){
+					JSONObject jo = new JSONObject((String)entry.getValue());
+                    jExtras.put("cn.jpush.android.EXTRA", jo);
+                } else {
+                    jExtras.put(entry.getKey(),entry.getValue());
+                }
 			}
 			if(jExtras.length()>0)
 			{
@@ -94,7 +146,12 @@ public class JPushPlugin extends CordovaPlugin {
 			data.put("alert", alert);
 			JSONObject jExtras = new JSONObject();
 			for(Entry<String,Object> entry:extras.entrySet()){
-				jExtras.put(entry.getKey(),entry.getValue());
+				if(entry.getKey().equals("cn.jpush.android.EXTRA")){
+					JSONObject jo = new JSONObject((String)entry.getValue());
+					jExtras.put("cn.jpush.android.EXTRA", jo);
+				}else{
+					jExtras.put(entry.getKey(),entry.getValue());
+				}
 			}
 			if(jExtras.length()>0)
 			{
@@ -113,8 +170,15 @@ public class JPushPlugin extends CordovaPlugin {
 		String js = String
 				.format("window.plugins.jPushPlugin.receiveMessageInAndroidCallback('%s');",
 						data.toString());
+		
+		
 		try {
 			instance.webView.sendJavascript(js);
+			
+//			String jsEvent=String
+//					.format("cordova.fireDocumentEvent('jpush.receiveMessage',%s)",
+//							data.toString());
+//			instance.webView.sendJavascript(jsEvent);
 		} catch (NullPointerException e) {

 		} catch (Exception e) {
@@ -125,18 +189,59 @@ public class JPushPlugin extends CordovaPlugin {
 		if (instance == null) {
 			return;
 		}
+
+		if(JPushPlugin.shouldCacheMsg){
+			return;
+		}
+
+		Log.i(TAG, "----------------  transmitOpen");
+
 		JSONObject data = openNotificationObject(alert, extras);
 		String js = String
 				.format("window.plugins.jPushPlugin.openNotificationInAndroidCallback('%s');",
 						data.toString());
+
 		try {
 			instance.webView.sendJavascript(js);
+			
+//			String jsEvent=String
+//    					.format("cordova.fireDocumentEvent('jpush.openNotification',%s)",
+//    							data.toString());
+//    		instance.webView.sendJavascript(jsEvent);
 		} catch (NullPointerException e) {

 		} catch (Exception e) {

 		}
+		JPushPlugin.openNotificationAlert = null;
 	}
+	static void transmitReceive(String alert, Map<String, Object> extras) {
+		if (instance == null) {
+			return;
+		}
+
+		if(JPushPlugin.shouldCacheMsg){
+			return;
+		}
+
+		JSONObject data = openNotificationObject(alert, extras);
+		String js = String
+				.format("window.plugins.jPushPlugin.receiveNotificationInAndroidCallback('%s');",
+						data.toString());
+
+		try {
+			
+			instance.webView.sendJavascript(js);
+
+		} catch (NullPointerException e) {
+
+		} catch (Exception e) {
+
+		}
+		JPushPlugin.notificationAlert = null;
+
+	}
+
 	@Override
 	public boolean execute(final String action, final JSONArray data,
 			final CallbackContext callbackContext) throws JSONException {
@@ -151,7 +256,7 @@ public class JPushPlugin extends CordovaPlugin {
 							JSONArray.class, CallbackContext.class);
 					method.invoke(JPushPlugin.this, data, callbackContext);
 				} catch (Exception e) {
-					System.out.println(e.toString());
+                    Log.e(TAG,e.toString());
 				}
 			}
 		});
@@ -247,30 +352,35 @@ public class JPushPlugin extends CordovaPlugin {
 		String regID= JPushInterface.getRegistrationID(this.cordova.getActivity().getApplicationContext());
 		callbackContext.success(regID);

+	}
+	void onResume(JSONArray data, CallbackContext callbackContext) {
+		JPushInterface.onResume(this.cordova.getActivity());
+	}
+	void onPause(JSONArray data, CallbackContext callbackContext) {
+		JPushInterface.onPause(this.cordova.getActivity());
+	}
+	void reportNotificationOpened(JSONArray data, CallbackContext callbackContext) {
+		try {
+			String msgID;
+			msgID = data.getString(0);
+			JPushInterface.reportNotificationOpened(this.cordova.getActivity(),msgID);
+		} catch (JSONException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
 	}
 	void setTags(JSONArray data, CallbackContext callbackContext) {

-		HashSet<String> tags=null;
 		try {
-			String tagStr;
-			if(data==null){
-				//tags=null;
-			}else if(data.length()==0) {
-				tags= new HashSet<String>();
-			}else{
-				tagStr = data.getString(0);
-				String[] tagArray = tagStr.split(",");
-				for (String tag : tagArray) {
-					if(tags==null){
-						tags= new HashSet<String>();
-					}
-					tags.add(tag);
-				}
+			HashSet<String> tags=new HashSet<String>();
+			for(int i=0;i<data.length();i++){
+				tags.add(data.getString(i));
 			}
-			//Set<String> validTags = JPushInterface.filterValidTags(tags);
 			JPushInterface.setTags(this.cordova.getActivity()
 					.getApplicationContext(), tags,mTagWithAliasCallback);
 			callbackContext.success();
+
 		} catch (JSONException e) {
 			e.printStackTrace();
 			callbackContext.error("Error reading tags JSON");
--- a/src/android/MyReceiver.java
+++ b/src/android/MyReceiver.java
@@ -12,17 +12,18 @@ import android.content.Intent;
 import android.util.Log;

 public class MyReceiver extends BroadcastReceiver {
-	private static String TAG = "Client Receiver";
+	private static String TAG = "JPushPlugin";
 	@Override
 	public void onReceive(Context context, Intent intent) {

        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);
        } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
+        	handlingNotificationReceive(context,intent);
        	
        } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
        	handlingNotificationOpen(context,intent);
@@ -37,9 +38,29 @@ public class MyReceiver extends BroadcastReceiver {
 		String msg = intent.getStringExtra(JPushInterface.EXTRA_MESSAGE);
 		Map<String,Object> extras = getNotificationExtras(intent);
 		
+		
 		JPushPlugin.transmitPush(msg, extras);
 	}
 	 private void handlingNotificationOpen(Context context,Intent intent){
+		 Log.i(TAG, "----------------  handlingNotificationOpen");
+
+		 String alert = intent.getStringExtra(JPushInterface.EXTRA_ALERT);
+		 Map<String,Object> extras = getNotificationExtras(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.openNotificationAlert = alert;
+		 JPushPlugin.openNotificationExtras = extras;
+		 
+		 JPushPlugin.transmitOpen(alert, extras);
+
+		 context.startActivity(launch);
+	 }
+	 private void handlingNotificationReceive(Context context,Intent intent){
+
+		 Log.i(TAG, "----------------  handlingNotificationReceive");
+
 		 String alert = intent.getStringExtra(JPushInterface.EXTRA_ALERT);
 		 Map<String,Object> extras = getNotificationExtras(intent);
 		 
@@ -50,9 +71,7 @@ public class MyReceiver extends BroadcastReceiver {
 		 JPushPlugin.notificationAlert = alert;
 		 JPushPlugin.notificationExtras = extras;
 		 
-		 JPushPlugin.transmitOpen(alert, extras);
-
-		 context.startActivity(launch);
+		 JPushPlugin.transmitReceive(alert, extras);
 	 }
 	 private Map<String, Object> getNotificationExtras(Intent intent) {
 		 Map<String, Object> extrasMap = new HashMap<String, Object>();
--- a/src/android/arm64-v8a/libjpush206.so
+++ b/src/android/arm64-v8a/libjpush206.so
--- a/src/android/armeabi-v7a/libjpush172.so
+++ b/src/android/armeabi-v7a/libjpush172.so
--- a/src/android/armeabi-v7a/libjpush206.so
+++ b/src/android/armeabi-v7a/libjpush206.so
--- a/src/android/armeabi/libjpush172.so
+++ b/src/android/armeabi/libjpush172.so
--- a/src/android/armeabi/libjpush206.so
+++ b/src/android/armeabi/libjpush206.so
--- a/src/android/jpush-android-2.0.6.jar
+++ b/src/android/jpush-android-2.0.6.jar
--- a/src/android/jpush-sdk-release1.7.2.jar
+++ b/src/android/jpush-sdk-release1.7.2.jar
--- a/src/ios/Plugins/AppDelegate+JPush.h
+++ b/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
--- a/src/ios/Plugins/AppDelegate+JPush.m
+++ b/src/ios/Plugins/AppDelegate+JPush.m
@@ -0,0 +1,93 @@
+//
+//  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 "JPUSHService.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 {
+    [JPUSHService registerDeviceToken:deviceToken];
+}
+-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
+    
+    [JPUSHService handleRemoteNotification:userInfo];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
+                                                        object:userInfo];
+}
+
+-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+    
+    [JPUSHService handleRemoteNotification:userInfo];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
+                                                        object:userInfo];
+    completionHandler(UIBackgroundFetchResultNewData);
+
+}
+
+- (void)application:(UIApplication *)application
+  didReceiveLocalNotification:(UILocalNotification *)notification {
+  [JPUSHService showLocalNotificationAtFront:notification identifierKey:nil];
+}
+
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+//  [application setApplicationIconBadgeNumber:0];
+//  [application cancelAllLocalNotifications];
+}
+
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+//  [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
+}
+
+
+
+//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
--- a/src/ios/Plugins/JPushPlugin.h
+++ b/src/ios/Plugins/JPushPlugin.h
@@ -8,10 +8,13 @@

 #import <Cordova/CDV.h>

+#define kJPushPluginReceiveNotification @"JPushPluginReceiveNofication"
+
@interface JPushPlugin : CDVPlugin{
  
 }

+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions;
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command;
 -(void)setTags:(CDVInvokedUrlCommand*)command;
 -(void)setAlias:(CDVInvokedUrlCommand*)command;
@@ -19,4 +22,17 @@
 -(void)startLogPageView:(CDVInvokedUrlCommand*)command;
 -(void)stopLogPageView:(CDVInvokedUrlCommand*)command;

+// 设置角标到服务器, 服务器下一次发消息时，会设置成这个值
+//本接口不会改变应用本地的角标值.
+-(void)setBadge:(CDVInvokedUrlCommand*)command;
+//相当于 [setBadge:0]
+-(void)resetBadge:(CDVInvokedUrlCommand*)command;
+
+
+//改变应用本地的角标值.
+-(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command;
+//获取应用本地的角标值.
+-(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command;
+
+
@end
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -7,207 +7,455 @@
 //

 #import "JPushPlugin.h"
-#import "APService.h"
+#import "JPUSHService.h"
+#import <UIKit/UIKit.h>
+
+
+
+static NSString *const JM_APP_KEY = @"APP_KEY";
+static NSString *const JM_APP_CHANNEL = @"CHANNEL";
+static NSString *const JM_APP_ISPRODUCTION = @"IsProduction";
+
+static NSString *const JMessageConfigFileName = @"PushConfig";
+
+
+static NSDictionary *_luanchOptions=nil;

@implementation JPushPlugin

- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
-    if (self=[super initWithWebView:theWebView]) {
-        
-        NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
-        [defaultCenter addObserver:self
-                          selector:@selector(networkDidReceiveMessage:)
-                              name:kJPFNetworkDidReceiveMessageNotification
-                            object:nil];

-    }
-    return self;
+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{
+  _luanchOptions=theLaunchOptions;
+  [JPUSHService setDebugMode];
+  if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+    //可以添加自定义categories
+    [JPUSHService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
+                                                      UIUserNotificationTypeSound |
+                                                      UIUserNotificationTypeAlert)
+                                          categories:nil];
+  } else {
+    //categories 必须为nil
+    [JPUSHService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+                                                      UIRemoteNotificationTypeSound |
+                                                      UIRemoteNotificationTypeAlert)
+                                          categories:nil];
+  }
+  
+  //read appkey and channel from JMessageConfig.plist
+  NSString *plistPath = [[NSBundle mainBundle] pathForResource:JMessageConfigFileName ofType:@"plist"];
+  if (plistPath == nil) {
+    NSLog(@"error: PushConfig.plist not found");
+    assert(0);
+  }
+  
+  NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
+  NSString * appkey = [plistData valueForKey:JM_APP_KEY];
+  NSString * channel = [plistData valueForKey:JM_APP_CHANNEL];
+  NSNumber * isProduction = [plistData valueForKey:JM_APP_ISPRODUCTION];
+
+  if (!appkey || appkey.length == 0) {
+    NSLog(@"error: app key not found in JMessageConfig.plist ");
+    assert(0);
+  }
+  
+  [JPUSHService setupWithOption:_luanchOptions appKey:appkey
+                        channel:channel apsForProduction:[isProduction boolValue] ];
+  
 }

+
+-(void)stopPush:(CDVInvokedUrlCommand*)command{
+  
+  [[UIApplication sharedApplication]unregisterForRemoteNotifications];
+}
+
+
+-(void)resumePush:(CDVInvokedUrlCommand*)command{
+  
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1
+  if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+    //可以添加自定义categories
+    [JPUSHService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
+                                                      UIUserNotificationTypeSound |
+                                                      UIUserNotificationTypeAlert)
+                                          categories:nil];
+  } else {
+    //categories 必须为nil
+    [JPUSHService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+                                                      UIRemoteNotificationTypeSound |
+                                                      UIRemoteNotificationTypeAlert)
+                                          categories:nil];
+  }
+#else
+  //categories 必须为nil
+  [JPUSHService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+                                                    UIRemoteNotificationTypeSound |
+                                                    UIRemoteNotificationTypeAlert)
+                                        categories:nil];
+#endif
+  
+}
+
+
+-(void)isPushStopped:(CDVInvokedUrlCommand*)command{
+  
+  NSNumber *result;
+  if ([[UIApplication sharedApplication] isRegisteredForRemoteNotifications ]) {
+    result=@(0);
+  }else{
+    result=@(1);
+  }
+  CDVPluginResult * pushResult=[self pluginResultForValue:result];
+  if (pushResult) {
+    [self succeedWithPluginResult:pushResult withCallbackID:command.callbackId];
+  } else {
+    [self failWithCallbackID:command.callbackId];
+  }
+}
+
+
+-(void)initial:(CDVInvokedUrlCommand*)command{
+  //do nithng,because Cordova plugin use lazy load mode.
+}
+
+
+
+#ifdef __CORDOVA_4_0_0
+
+- (void)pluginInitialize {
+  NSLog(@"### pluginInitialize ");
+  [self initNotifications];
+}
+
+#else
+
+- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
+  NSLog(@"### initWithWebView ");
+  if (self=[super initWithWebView:theWebView]) {
+    [self initNotifications];
+    
+  }
+  return self;
+}
+
+
+#endif
+
+
+
+-(void)initNotifications {
+  
+  NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
+  [defaultCenter addObserver:self
+                    selector:@selector(networkDidReceiveMessage:)
+                        name:kJPFNetworkDidReceiveMessageNotification
+                      object:nil];
+  
+  [defaultCenter addObserver:self
+                    selector:@selector(networkDidReceiveNotification:)
+                        name:kJPushPluginReceiveNotification
+                      object:nil];
+  
+  if (_luanchOptions) {
+    NSDictionary *userInfo = [_luanchOptions
+                              valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+    if ([userInfo count] >0) {
+      NSError  *error;
+      NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
+      NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+      if (!error) {
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+          [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",jsonString]];
+        });
+        
+      }
+    }
+    
+  }
+}
+
+
+
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
+  NSArray *arguments=command.arguments;
+  if (!arguments||[arguments count]<2) {
    
-    NSArray *arguments=command.arguments;
-    if (!arguments||[arguments count]<2) {
-//        [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.pushCallback('%@')",@""]];
-        return ;
-    }
-    NSString *alias=[arguments objectAtIndex:0];
-    NSArray  *arrayTags=[arguments objectAtIndex:1];
-    NSSet* set=[NSSet setWithArray:arrayTags];
-   [APService setTags:set
-                 alias:alias
-      callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
-                object:self];
+    NSLog(@"#### setTagsWithAlias param is less");
+    return ;
+  }
+  NSString *alias=[arguments objectAtIndex:0];
+  NSArray  *arrayTags=[arguments objectAtIndex:1];
+  
+  NSLog(@"#### setTagsWithAlias alias is %@, tags is %@",alias,arrayTags);
+  
+  NSSet* set=[NSSet setWithArray:arrayTags];
+  [JPUSHService setTags:set
+                  alias:alias
+       callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                 object:self];
 }
-    
-(void)setTags:(CDVInvokedUrlCommand *)command{
-    

-    NSArray *arguments=[command arguments];
-    NSString *tags=[arguments objectAtIndex:0];
-    
-    NSArray  *array=[tags componentsSeparatedByString:@","];
-   [APService setTags:[NSSet setWithArray:array]
-      callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
-                object:self];
-    
+
+
+-(void)setTags:(CDVInvokedUrlCommand *)command{
+  
+  
+  NSArray *arguments=[command arguments];
+  NSString *tags=[arguments objectAtIndex:0];
+  
+  NSLog(@"#### setTags %@",tags);
+
+  NSArray  *array=[tags componentsSeparatedByString:@","];
+  [JPUSHService setTags:[NSSet setWithArray:array]
+       callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                 object:self];
+  
 }
-    
+
+
+
 -(void)setAlias:(CDVInvokedUrlCommand *)command{
-    
-    NSArray *arguments=[command arguments];
-   [APService setAlias:[arguments objectAtIndex:0]
-      callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
-                object:self];
-    
+  
+  NSArray *arguments=[command arguments];
+  NSLog(@"#### setAlias %@",arguments);
+  [JPUSHService setAlias:[arguments objectAtIndex:0]
+        callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                  object:self];
+  
 }

+
+
 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
-    
-    NSString* registrationID = [APService registrationID];
-    CDVPluginResult *result=[self pluginResultForValue:registrationID];
-    if (result) {
-        [self succeedWithPluginResult:result withCallbackID:command.callbackId];
-    } else {
-        [self failWithCallbackID:command.callbackId];
-    }
+  NSString* registrationID = [JPUSHService registrationID];
+  NSLog(@"### getRegistrationID %@",registrationID);
+
+  CDVPluginResult *result=[self pluginResultForValue:registrationID];
+  if (result) {
+    [self succeedWithPluginResult:result withCallbackID:command.callbackId];
+  } else {
+    [self failWithCallbackID:command.callbackId];
+  }
 }

-    
+
+
+
 -(void)tagsWithAliasCallback:(int)resultCode tags:(NSSet *)tags alias:(NSString *)alias{
-    
-    NSDictionary *dict=[NSDictionary dictionaryWithObjectsAndKeys:
-                              [NSNumber numberWithInt:resultCode],@"resultCode",
-                        tags==nil?[NSNull null]:[tags allObjects],@"tags",
-                                   alias==nil?[NSNull null]:alias,@"alias",nil];
-    NSMutableDictionary *data = [NSMutableDictionary dictionary];
-    [data setObject:[NSNumber numberWithInt:resultCode] forKey:@"resultCode"];
-    [data setObject:tags==nil?[NSNull null]:[tags allObjects] forKey:@"tags"];
-    [data setObject:alias==nil?[NSNull null]:alias forKey:@"alias"];
-    NSError  *error;
-
-    NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:dict options:0 error:&error];
-    NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.setTagsWithAlias',%@)",jsonString]];
-//      [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.pushCallback('%@')",jsonString]];
-    });
-    
+  
+  NSDictionary *dict=[NSDictionary dictionaryWithObjectsAndKeys:
+                      [NSNumber numberWithInt:resultCode],@"resultCode",
+                      tags==nil?[NSNull null]:[tags allObjects],@"tags",
+                      alias==nil?[NSNull null]:alias,@"alias",nil];
+  NSMutableDictionary *data = [NSMutableDictionary dictionary];
+  [data setObject:[NSNumber numberWithInt:resultCode] forKey:@"resultCode"];
+  [data setObject:tags==nil?[NSNull null]:[tags allObjects] forKey:@"tags"];
+  [data setObject:alias==nil?[NSNull null]:alias forKey:@"alias"];
+  NSError  *error;
+  
+  NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:dict options:0 error:&error];
+  NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+  
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.setTagsWithAlias',%@)",jsonString]];
+    //      [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.pushCallback('%@')",jsonString]];
+  });
+  
 }

+
 -(void)startLogPageView:(CDVInvokedUrlCommand*)command{
-    NSArray *arguments=command.arguments;
-    if (!arguments||[arguments count]<1) {
-        NSLog(@"startLogPageView argument  error");
-        return ;
-    }
-    NSString * pageName=[arguments objectAtIndex:0];
-    if (pageName) {
-        [APService startLogPageView:pageName];
-    }
+  NSArray *arguments=command.arguments;
+  if (!arguments||[arguments count]<1) {
+    NSLog(@"startLogPageView argument  error");
+    return ;
+  }
+  NSString * pageName=[arguments objectAtIndex:0];
+  if (pageName) {
+    [JPUSHService startLogPageView:pageName];
+  }
 }
+
+
 -(void)stopLogPageView:(CDVInvokedUrlCommand*)command{
-    NSArray *arguments=command.arguments;
-    if (!arguments||[arguments count]<1) {
-        NSLog(@"stopLogPageView argument  error");
-        return ;
-    }
-    NSString * pageName=[arguments objectAtIndex:0];
-    if (pageName) {
-        [APService stopLogPageView:pageName];
-    }
-
+  NSArray *arguments=command.arguments;
+  if (!arguments||[arguments count]<1) {
+    NSLog(@"stopLogPageView argument  error");
+    return ;
+  }
+  NSString * pageName=[arguments objectAtIndex:0];
+  if (pageName) {
+    [JPUSHService stopLogPageView:pageName];
+  }
+  
 }
+
+
+
 -(void)beginLogPageView:(CDVInvokedUrlCommand*)command{
-    NSArray *arguments=command.arguments;
-    if (!arguments||[arguments count]<2) {
-        NSLog(@"beginLogPageView argument  error");
-        return ;
-    }
-    NSString * pageName=[arguments objectAtIndex:0];
-    int duration=[[arguments objectAtIndex:0]intValue];
-    if (pageName) {
-        [APService beginLogPageView:pageName duration:duration];
-    }
-
+  NSArray *arguments=command.arguments;
+  if (!arguments||[arguments count]<2) {
+    NSLog(@"beginLogPageView argument  error");
+    return ;
+  }
+  NSString * pageName=[arguments objectAtIndex:0];
+  int duration=[[arguments objectAtIndex:0]intValue];
+  if (pageName) {
+    [JPUSHService beginLogPageView:pageName duration:duration];
+  }
+  
 }
+
+ 
 -(void)setBadge:(CDVInvokedUrlCommand*)command{
-    NSArray *argument=command.arguments;
-    if ([argument count]<1) {
-        NSLog(@"setBadge argument error!");
-        return;
-    }
-    NSNumber *badge=[argument objectAtIndex:0];
-    [APService setBadge:[badge intValue]];
+  NSArray *argument=command.arguments;
+  if ([argument count]<1) {
+    NSLog(@"setBadge argument error!");
+    return;
+  }
+  NSNumber *badge=[argument objectAtIndex:0];
+  [JPUSHService setBadge:[badge intValue]];
 }
-(void)resetBadge:(CDVInvokedUrlCommand*)command{
-    [APService resetBadge];
-}
-(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command{
-    
-    [APService setDebugMode];
-}
-(void)setLogOFF:(CDVInvokedUrlCommand*)command{
-    
-    [APService setLogOFF];
-}
-(void)stopPush:(CDVInvokedUrlCommand*)command{
-    
-    [[UIApplication sharedApplication]unregisterForRemoteNotifications];

+
+
+-(void)resetBadge:(CDVInvokedUrlCommand*)command{
+  [JPUSHService resetBadge];
 }
+
+
+-(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command{
+  //
+  NSArray *argument=command.arguments;
+  if ([argument count]<1) {
+    NSLog(@"setBadge argument error!");
+    return;
+  }
+  NSNumber *badge=[argument objectAtIndex:0];
+  [UIApplication sharedApplication].applicationIconBadgeNumber=[badge intValue];
+}
+
+
+-(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command {
+  NSInteger num =  [UIApplication sharedApplication].applicationIconBadgeNumber;
+  CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:num];
+  [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+}
+
+
+
+-(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command{
+  
+  [JPUSHService setDebugMode];
+}
+
+
+
+-(void)setLogOFF:(CDVInvokedUrlCommand*)command{
+  
+  [JPUSHService setLogOFF];
+}
+
+
+
 - (void)failWithCallbackID:(NSString *)callbackID {
-    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
-    [self.commandDelegate sendPluginResult:result callbackId:callbackID];
+  CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
+  [self.commandDelegate sendPluginResult:result callbackId:callbackID];
 }
+
+
+
 - (void)succeedWithPluginResult:(CDVPluginResult *)result withCallbackID:(NSString *)callbackID {
-    [self.commandDelegate sendPluginResult:result callbackId:callbackID];
+  [self.commandDelegate sendPluginResult:result callbackId:callbackID];
 }
+
+
+
+
 - (CDVPluginResult *)pluginResultForValue:(id)value {
-    
-    CDVPluginResult *result;
-    if ([value isKindOfClass:[NSString class]]) {
-        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
-                                   messageAsString:[value stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-    } else if ([value isKindOfClass:[NSNumber class]]) {
-        CFNumberType numberType = CFNumberGetType((CFNumberRef)value);
-        //note: underlyingly, BOOL values are typedefed as char
-        if (numberType == kCFNumberIntType || numberType == kCFNumberCharType) {
-            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:[value intValue]];
-        } else  {
-            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDouble:[value doubleValue]];
-        }
-    } else if ([value isKindOfClass:[NSArray class]]) {
-        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:value];
-    } else if ([value isKindOfClass:[NSDictionary class]]) {
-        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:value];
-    } else if ([value isKindOfClass:[NSNull class]]) {
-        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-    } else {
-        NSLog(@"Cordova callback block returned unrecognized type: %@", NSStringFromClass([value class]));
-        return nil;
+  
+  CDVPluginResult *result;
+  if ([value isKindOfClass:[NSString class]]) {
+    result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
+                               messageAsString:[value stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+  } else if ([value isKindOfClass:[NSNumber class]]) {
+    CFNumberType numberType = CFNumberGetType((CFNumberRef)value);
+    //note: underlyingly, BOOL values are typedefed as char
+    if (numberType == kCFNumberIntType || numberType == kCFNumberCharType) {
+      result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:[value intValue]];
+    } else  {
+      result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDouble:[value doubleValue]];
    }
-    return result;
+  } else if ([value isKindOfClass:[NSArray class]]) {
+    result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:value];
+  } else if ([value isKindOfClass:[NSDictionary class]]) {
+    result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:value];
+  } else if ([value isKindOfClass:[NSNull class]]) {
+    result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+  } else {
+    NSLog(@"Cordova callback block returned unrecognized type: %@", NSStringFromClass([value class]));
+    return nil;
+  }
+  return result;
 }

+
+
 - (void)networkDidReceiveMessage:(NSNotification *)notification {
-
-    NSDictionary *userInfo = [notification userInfo];
-    NSLog(@"%@",userInfo);
+  
+  NSDictionary *userInfo = [notification userInfo];
+  //NSLog(@"%@",userInfo);
+  
+  NSError  *error;
+  NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
+  NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+  
+  //NSLog(@"%@",jsonString);
+  
+  dispatch_async(dispatch_get_main_queue(), ^{
    
-    NSError  *error;
-    NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
-    NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
- 
-    NSLog(@"%@",jsonString);
+    [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveMessage',%@)",jsonString]];
    
-    dispatch_async(dispatch_get_main_queue(), ^{
-        
-        [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",jsonString]];
-        
-    });
-
+    [self.commandDelegate evalJs:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",jsonString]];
+    
+    
+  });
+  
 }

+
+
+-(void)networkDidReceiveNotification:(id)notification{
+  
+  NSError  *error;
+  NSDictionary *userInfo = [notification object];
+  
+  NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
+  NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+  switch ([UIApplication sharedApplication].applicationState) {
+    case UIApplicationStateActive:
+    {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveNotification',%@)",jsonString]];
+      });
+    }
+      break;
+    case UIApplicationStateInactive:
+    case UIApplicationStateBackground:
+    {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",jsonString]];
+      });
+      
+    }
+      break;
+    default:
+      //do nothing
+      break;
+  }
+  
+}
+
+
@end
--- a/src/ios/PushConfig.plist
+++ b/src/ios/PushConfig.plist
@@ -3,8 +3,10 @@
 <plist version="1.0">
 <dict>
 	<key>APP_KEY</key>
-	<string>7d431e42dfa6a6d693ac2d04</string>
+	<string></string>
 	<key>CHANNEL</key>
 	<string>Subscription</string>
+	<key>IsProduction</key>
+	<false/>
 </dict>
 </plist>
--- a/src/ios/lib/APService.h
+++ b/src/ios/lib/APService.h
@@ -1,181 +0,0 @@
-//
-//  APService.h
-//  APService
-//
-//  Created by JPush on 12-8-15.
-//  Copyright (c) 2012年 HXHG. All rights reserved.
-//  Version: 1.8.1
-
-@class CLRegion;
-@class UILocalNotification;
-
-extern NSString *const kJPFNetworkDidSetupNotification;     // 建立连接
-extern NSString *const kJPFNetworkDidCloseNotification;     // 关闭连接
-extern NSString *const kJPFNetworkDidRegisterNotification;  // 注册成功
-extern NSString *const kJPFNetworkDidLoginNotification;     // 登录成功
-extern NSString *const
-    kJPFNetworkDidReceiveMessageNotification;         // 收到消息(非APNS)
-extern NSString *const kJPFServiceErrorNotification;  // 错误提示
-
-@class CLLocation;
-@interface APService : NSObject
-
-#pragma - mark 基本功能
-// 以下四个接口是必须调用的
-+ (void)setupWithOption:(NSDictionary *)launchingOption;  // 初始化
-+ (void)registerForRemoteNotificationTypes:(NSUInteger)types
-                                categories:(NSSet *)categories;  // 注册APNS类型
-+ (void)registerDeviceToken:(NSData *)deviceToken;  // 向服务器上报Device Token
-+ (void)handleRemoteNotification:(NSDictionary *)
-    remoteInfo;  // 处理收到的APNS消息，向服务器上报收到APNS消息
-
-// 下面的接口是可选的
-// 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：http://docs.jpush.cn/pages/viewpage.action?pageId=3309913）
-+ (void)setTags:(NSSet *)tags
-               alias:(NSString *)alias
-    callbackSelector:(SEL)cbSelector
-              target:(id)theTarget;
-+ (void)setTags:(NSSet *)tags
-               alias:(NSString *)alias
-    callbackSelector:(SEL)cbSelector
-              object:(id)theTarget;
-+ (void)setTags:(NSSet *)tags
-    callbackSelector:(SEL)cbSelector
-              object:(id)theTarget;
-+ (void)setAlias:(NSString *)alias
-    callbackSelector:(SEL)cbSelector
-              object:(id)theTarget;
-// 用于过滤出正确可用的tags，如果总数量超出最大限制则返回最大数量的靠前的可用tags
-+ (NSSet *)filterValidTags:(NSSet *)tags;
-
-#pragma - mark 上报日志
-/**
- *  记录页面停留时间功能。
- *  startLogPageView和stopLogPageView为自动计算停留时间
- *  beginLogPageView为手动自己输入停留时间
- *
- *  @param pageName 页面名称
- *  @param seconds  页面停留时间
- */
-+ (void)startLogPageView:(NSString *)pageName;
-+ (void)stopLogPageView:(NSString *)pageName;
-+ (void)beginLogPageView:(NSString *)pageName duration:(int)seconds;
-
-/**
- *  开启Crash日志收集, 默认是关闭状态.
-*/
-+ (void)crashLogON;
-
-/**
- *  地理位置设置
- *  为了更精确的统计用户地理位置，可以调用此方法传入经纬度信息
- *  需要链接 CoreLocation.framework 并且 #import <CoreLocation/CoreLocation.h>
- *  @param latitude 纬度.
- *  @param longitude 经度.
- *  @param location 直接传递CLLocation *型的地理信息
- */
-+ (void)setLatitude:(double)latitude longitude:(double)longitude;
-+ (void)setLocation:(CLLocation *)location;
-
-#pragma - mark 本地通知
-/**
-* 本地推送，最多支持64个
-* @param fireDate 本地推送触发的时间
-* @param alertBody 本地推送需要显示的内容
-* @param badge 角标的数字。如果不需要改变角标传-1
-* @param alertAction 弹框的按钮显示的内容（IOS 8默认为"打开",其他默认为"启动"）
-* @param notificationKey 本地推送标示符
-* @param userInfo 自定义参数，可以用来标识推送和增加附加信息
-* @param soundName 自定义通知声音，设置为nil为默认声音
-
-* IOS8新参数
-* @param region 自定义参数
-* @param regionTriggersOnce 自定义参数
-* @param category 自定义参数
-*/
-+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
-                                    alertBody:(NSString *)alertBody
-                                        badge:(int)badge
-                                  alertAction:(NSString *)alertAction
-                                identifierKey:(NSString *)notificationKey
-                                     userInfo:(NSDictionary *)userInfo
-                                    soundName:(NSString *)soundName;
-
-+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
-                                    alertBody:(NSString *)alertBody
-                                        badge:(int)badge
-                                  alertAction:(NSString *)alertAction
-                                identifierKey:(NSString *)notificationKey
-                                     userInfo:(NSDictionary *)userInfo
-                                    soundName:(NSString *)soundName
-                                       region:(CLRegion *)region
-                           regionTriggersOnce:(BOOL)regionTriggersOnce
-                                     category:(NSString *)category
-    NS_AVAILABLE_IOS(8_0);
-
-/**
-* 本地推送在前台推送。默认App在前台运行时不会进行弹窗，在程序接收通知调用此接口可实现指定的推送弹窗。
-* @param notification 本地推送对象
-* @param notificationKey 需要前台显示的本地推送通知的标示符
-*/
-+ (void)showLocalNotificationAtFront:(UILocalNotification *)notification
-                       identifierKey:(NSString *)notificationKey;
-/**
-* 删除本地推送
-* @param notificationKey 本地推送标示符
-* @param myUILocalNotification 本地推送对象
-*/
-+ (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey;
-+ (void)deleteLocalNotification:(UILocalNotification *)localNotification;
-
-/**
-* 获取指定通知
-* @param notificationKey 本地推送标示符
-* @return  本地推送对象数组,[array count]为0时表示没找到
-*/
-+ (NSArray *)findLocalNotificationWithIdentifier:(NSString *)notificationKey;
-
-/**
-* 清除所有本地推送对象
-*/
-+ (void)clearAllLocalNotifications;
-
-#pragma - mark 设置Badge
-/**
- *  set setBadge
- *  @param value 设置JPush服务器的badge的值
- *  本地仍须调用UIApplication:setApplicationIconBadgeNumber函数,来设置脚标
- */
-+ (BOOL)setBadge:(NSInteger)value;
-/**
- *  set setBadge
- *  @param value 清除JPush服务器对badge值的设定.
- *  本地仍须调用UIApplication:setApplicationIconBadgeNumber函数,来设置脚标
- */
-
-+ (void)resetBadge;
-
-#pragma - mark 获取用户标示符
-/**
- *  get the UDID
- */
-+ (NSString *)openUDID DEPRECATED_ATTRIBUTE;  // UDID
-
-/**
- *  get RegistrationID
- */
-+ (NSString *)registrationID;
-
-#pragma - mark 打印日志信息配置
-/**
- *  setDebugMode获取更多的Log信息
- *  开发过程中建议开启DebugMode
- *
- *  setLogOFF关闭除了错误信息外的所有Log
- *  发布时建议开启LogOFF用于节省性能开销
- *
- *  默认为不开启DebugLog,只显示基本的信息
- */
-+ (void)setDebugMode;
-+ (void)setLogOFF;
-@end
--- a/src/ios/lib/JPUSHService.h
+++ b/src/ios/lib/JPUSHService.h
@@ -0,0 +1,337 @@
+/*
+ *	| |    | |  \ \  / /  | |    | |   / _______|
+ *	| |____| |   \ \/ /   | |____| |  / /
+ *	| |____| |    \  /    | |____| |  | |   _____
+ * 	| |    | |    /  \    | |    | |  | |  |____ |
+ *  | |    | |   / /\ \   | |    | |  \ \______| |
+ *  | |    | |  /_/  \_\  | |    | |   \_________|
+ *
+ * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
+ */
+
+#define JPUSH_VERSION_NUMBER 2.1.0
+
+#import <Foundation/Foundation.h>
+
+@class CLRegion;
+@class UILocalNotification;
+
+extern NSString *const kJPFNetworkIsConnectingNotification; // 正在连接中
+extern NSString *const kJPFNetworkDidSetupNotification;     // 建立连接
+extern NSString *const kJPFNetworkDidCloseNotification;     // 关闭连接
+extern NSString *const kJPFNetworkDidRegisterNotification;  // 注册成功
+extern NSString *const kJPFNetworkDidLoginNotification;     // 登录成功
+extern NSString *const kJPFNetworkDidReceiveMessageNotification;         // 收到消息(非APNS)
+extern NSString *const kJPFServiceErrorNotification;  // 错误提示
+
+@class CLLocation;
+
+
+/*!
+ * JPush 核心头文件
+ */
+@interface JPUSHService : NSObject
+
+
+///----------------------------------------------------
+/// @name Setup 启动相关
+///----------------------------------------------------
+
+/*!
+ * @abstract 启动SDK
+ *
+ * @discussion 这是旧版本的启动方法, 依赖于 PushConfig.plist 文件. 建议不要使用, 已经过期.
+ */
+ (void)setupWithOption:(NSDictionary *)launchingOption __attribute__((deprecated("JPush 2.1.0 版本已过期")));
+
+/*!
+ * @abstract 启动SDK
+ *
+ * @param launchingOption 启动参数.
+ * @param appKey 一个JPush 应用必须的,唯一的标识. 请参考 JPush 相关说明文档来获取这个标识.
+ * @param channel 发布渠道. 可选.
+ * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES.
+ *
+ * @discussion 提供SDK启动必须的参数, 来启动 SDK.
+ * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作.
+ */
+ (void)setupWithOption:(NSDictionary *)launchingOption
+                 appKey:(NSString *)appKey
+                channel:(NSString *)channel
+       apsForProduction:(BOOL)isProduction;
+
+
+///----------------------------------------------------
+/// @name APNs about 通知相关
+///----------------------------------------------------
+
+/*!
+ * @abstract 注册要处理的远程通知类型
+ *
+ * @param types 通知类型
+ * @param categories
+ *
+ * @discussion
+ */
+ (void)registerForRemoteNotificationTypes:(NSUInteger)types
+                                categories:(NSSet *)categories;
+
+ (void)registerDeviceToken:(NSData *)deviceToken;
+
+/*!
+ * @abstract 处理收到的 APNs 消息
+ */
+ (void)handleRemoteNotification:(NSDictionary *)remoteInfo;
+
+
+///----------------------------------------------------
+/// @name Tag alias setting 设置别名与标签
+///----------------------------------------------------
+
+/*!
+ * 下面的接口是可选的
+ * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：http://docs.jpush.io/client/ios_api/#api-ios）
+ * setTags:alias:fetchCompletionHandle:是新的设置标签别名的方法，不再需要显示声明回调函数，只需要在block里面处理设置结果即可.
+ * WARN: 使用block时需要注意循环引用问题
+ */
+ (void) setTags:(NSSet *)tags
+           alias:(NSString *)alias
+callbackSelector:(SEL)cbSelector
+          target:(id)theTarget;
+
+ (void) setTags:(NSSet *)tags
+           alias:(NSString *)alias
+callbackSelector:(SEL)cbSelector
+          object:(id)theTarget;
+
+ (void) setTags:(NSSet *)tags
+callbackSelector:(SEL)cbSelector
+          object:(id)theTarget;
+
+ (void)      setTags:(NSSet *)tags
+                alias:(NSString *)alias
+fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler;
+
+ (void)  setTags:(NSSet *)tags
+aliasInbackground:(NSString *)alias;
+
+ (void)setAlias:(NSString *)alias
+callbackSelector:(SEL)cbSelector
+          object:(id)theTarget;
+
+/*!
+ * @abstract 过滤掉无效的 tags
+ *
+ * @discussion 如果 tags 数量超过限制数量, 则返回靠前的有效的 tags.
+ * 建议设置 tags 前用此接口校验. SDK 内部也会基于此接口来做过滤.
+ */
+ (NSSet *)filterValidTags:(NSSet *)tags;
+
+
+///----------------------------------------------------
+/// @name Stats 统计功能
+///----------------------------------------------------
+
+/*!
+ * @abstract 开始记录页面停留
+ *
+ * @param pageName 页面名称
+ */
+ (void)startLogPageView:(NSString *)pageName;
+
+/*!
+ * @abstract 停止记录页面停留
+ *
+ * @param pageName 页面
+ */
+ (void)stopLogPageView:(NSString *)pageName;
+
+/*!
+ * @abstract 直接上报在页面的停留时工
+ *
+ * @param pageName 页面
+ * @param seconds 停留的秒数
+ */
+ (void)beginLogPageView:(NSString *)pageName duration:(int)seconds;
+
+/*!
+ * @abstract 开启Crash日志收集
+ *
+ * @discussion 默认是关闭状态.
+ */
+ (void)crashLogON;
+
+/*!
+ * @abstract 地理位置上报
+ *
+ * @param latitude 纬度.
+ * @param longitude 经度.
+ *
+ */
+ (void)setLatitude:(double)latitude longitude:(double)longitude;
+
+/*!
+ * @abstract 地理位置上报
+ *
+ * @param location 直接传递 CLLocation * 型的地理信息
+ *
+ * @discussion 需要链接 CoreLocation.framework 并且 #import <CoreLocation/CoreLocation.h>
+ */
+ (void)setLocation:(CLLocation *)location;
+
+
+///----------------------------------------------------
+/// @name Local Notification 本地通知
+///----------------------------------------------------
+
+/*!
+ * @abstract 本地推送，最多支持64个
+ *
+ * @param fireDate 本地推送触发的时间
+ * @param alertBody 本地推送需要显示的内容
+ * @param badge 角标的数字。如果不需要改变角标传-1
+ * @param alertAction 弹框的按钮显示的内容（IOS 8默认为"打开", 其他默认为"启动"）
+ * @param notificationKey 本地推送标示符
+ * @param userInfo 自定义参数，可以用来标识推送和增加附加信息
+ * @param soundName 自定义通知声音，设置为nil为默认声音
+ *
+ * @discussion 最多支持 64 个定义
+ */
+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
+                                    alertBody:(NSString *)alertBody
+                                        badge:(int)badge
+                                  alertAction:(NSString *)alertAction
+                                identifierKey:(NSString *)notificationKey
+                                     userInfo:(NSDictionary *)userInfo
+                                    soundName:(NSString *)soundName;
+
+/*!
+ * @abstract 本地推送 (支持 iOS8 新参数)
+ *
+ * IOS8新参数
+ * @param region 自定义参数
+ * @param regionTriggersOnce 自定义参数
+ * @param category 自定义参数
+ */
+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
+                                    alertBody:(NSString *)alertBody
+                                        badge:(int)badge
+                                  alertAction:(NSString *)alertAction
+                                identifierKey:(NSString *)notificationKey
+                                     userInfo:(NSDictionary *)userInfo
+                                    soundName:(NSString *)soundName
+                                       region:(CLRegion *)region
+                           regionTriggersOnce:(BOOL)regionTriggersOnce
+                                     category:(NSString *)category NS_AVAILABLE_IOS(8_0);
+
+/*!
+ * @abstract 前台展示本地推送
+ *
+ * @param notification 本地推送对象
+ * @param notificationKey 需要前台显示的本地推送通知的标示符
+ *
+ * @discussion 默认App在前台运行时不会进行弹窗，在程序接收通知调用此接口可实现指定的推送弹窗。
+ */
+ (void)showLocalNotificationAtFront:(UILocalNotification *)notification
+                       identifierKey:(NSString *)notificationKey;
+/*!
+ * @abstract 删除本地推送定义
+ *
+ * @param notificationKey 本地推送标示符
+ * @param myUILocalNotification 本地推送对象
+ */
+ (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey;
+
+/*!
+ * @abstract 删除本地推送定义
+ */
+ (void)deleteLocalNotification:(UILocalNotification *)localNotification;
+
+/*!
+ * @abstract 获取指定通知
+ *
+ * @param notificationKey 本地推送标示符
+ * @return 本地推送对象数组, [array count]为0时表示没找到
+ */
+ (NSArray *)findLocalNotificationWithIdentifier:(NSString *)notificationKey;
+
+/*!
+ * @abstract 清除所有本地推送对象
+ */
+ (void)clearAllLocalNotifications;
+
+
+///----------------------------------------------------
+/// @name Server badge 服务器端 badge 功能
+///----------------------------------------------------
+
+/*!
+ * @abstract 设置角标(到服务器)
+ *
+ * @param value 新的值. 会覆盖服务器上保存的值(这个用户)
+ *
+ * @discussion 本接口不会改变应用本地的角标值.
+ * 本地仍须调用 UIApplication:setApplicationIconBadgeNumber 函数来设置脚标.
+ *
+ * 本接口用于配合 JPush 提供的服务器端角标功能.
+ * 该功能解决的问题是, 服务器端推送 APNs 时, 并不知道客户端原来已经存在的角标是多少, 指定一个固定的数字不太合理.
+ *
+ * JPush 服务器端脚标功能提供:
+ *
+ * - 通过本 API 把当前客户端(当前这个用户的) 的实际 badge 设置到服务器端保存起来;
+ * - 调用服务器端 API 发 APNs 时(通常这个调用是批量针对大量用户),
+ *   使用 "+1" 的语义, 来表达需要基于目标用户实际的 badge 值(保存的) +1 来下发通知时带上新的 badge 值;
+ */
+ (BOOL)setBadge:(NSInteger)value;
+
+/*!
+ * @abstract 重置脚标(为0)
+ *
+ * @discussion 相当于 [setBadge:0] 的效果.
+ * 参考 [JPUSHService setBadge:] 说明来理解其作用.
+ */
+ (void)resetBadge;
+
+
+///----------------------------------------------------
+/// @name Logs and others 日志与其他
+///----------------------------------------------------
+
+/*!
+ * @abstract JPush标识此设备的 registrationID
+ *
+ * @discussion SDK注册成功后, 调用此接口获取到 registrationID 才能够获取到.
+ *
+ * JPush 支持根据 registrationID 来进行推送.
+ * 如果你需要此功能, 应该通过此接口获取到 registrationID 后, 上报到你自己的服务器端, 并保存下来.
+ *
+ * 更多的理解请参考 JPush 的文档网站.
+ */
+ (NSString *)registrationID;
+
+/*!
+ * @abstract 打开日志级别到 Debug
+ *
+ * @discussion JMessage iOS 的日志系统参考 Android 设计了级别.
+ * 从低到高是: Verbose, Debug, Info, Warning, Error.
+ * 对日志级别的进一步理解, 请参考 Android 相关的说明.
+ *
+ * SDK 默认开启的日志级别为: Info. 只显示必要的信息, 不打印调试日志.
+ *
+ * 调用本接口可打开日志级别为: Debug, 打印调试日志.
+ */
+ (void)setDebugMode;
+
+/*!
+ * @abstract 关闭日志
+ *
+ * @discussion 关于日志级别的说明, 参考 [JPUSHService setDebugMode]
+ *
+ * 虽说是关闭日志, 但还是会打印 Warning, Error 日志. 这二种日志级别, 在程序运行正常时, 不应有打印输出.
+ *
+ * 建议在发布的版本里, 调用此接口, 关闭掉日志打印.
+ */
+ (void)setLogOFF;
+
+
+@end
--- a/src/ios/lib/jpush-ios-2.1.0.a
+++ b/src/ios/lib/jpush-ios-2.1.0.a
--- a/src/ios/lib/libPushSDK.a
+++ b/src/ios/lib/libPushSDK.a
--- a/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -1,8 +1,15 @@

+
 var JPushPlugin = function(){
 };
+
 //private plugin function

+JPushPlugin.prototype.receiveMessage={}
+JPushPlugin.prototype.openNotification={}
+JPushPlugin.prototype.receiveNotification={}
+
+
 JPushPlugin.prototype.isPlatformIOS = function(){
 	return device.platform == "iPhone" || device.platform == "iPad" || device.platform == "iPod touch" || device.platform == "iOS"
 }
@@ -35,6 +42,16 @@ JPushPlugin.prototype.beginLogPageView = function(pageName,duration){
 		this.call_native( "beginLogPageView",[pageName,duration],null);   
 	}
 }
+JPushPlugin.prototype.setApplicationIconBadgeNumber = function(badge){
+    if(this.isPlatformIOS()){
+		this.call_native( "setApplicationIconBadgeNumber",[badge],null);
+	}
+}
+	JPushPlugin.prototype.getApplicationIconBadgeNumber = function(callback){
+		if(this.isPlatformIOS()){
+			this.call_native( "getApplicationIconBadgeNumber",[],callback);
+		}
+	}

 JPushPlugin.prototype.setTagsWithAlias = function(tags,alias){
 	try{
@@ -135,8 +152,10 @@ JPushPlugin.prototype.receiveMessageIniOSCallback = function(data){
 JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data){
 	try{
 		console.log("JPushPlugin:receiveMessageInAndroidCallback");
+		var bToObj  = JSON.parse(data);
+		this.receiveMessage=bToObj
+		cordova.fireDocumentEvent('jpush.receiveMessage',null);
 		//console.log(data);
-		//ecvar bToObj=JSON.parse(data);
 		//var message  = bToObj.message;
 		//var extras  = bToObj.extras;

@@ -149,11 +168,41 @@ JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data){
 		console.log("JPushPlugin:pushCallback "+exception);
 	}
 }
+
 //
 JPushPlugin.prototype.openNotificationInAndroidCallback = function(data){
 	try{
-		console.log("JPushPlugin:openNotificationInAndroidCallback");		
-		console.log(data);
+		console.log("JPushPlugin:openNotificationInAndroidCallback");
+		var bToObj  = JSON.parse(data);
+		this.openNotification=bToObj;	
+		cordova.fireDocumentEvent('jpush.openNotification',null);
+	
+		//console.log(data);
+		//var bToObj  = JSON.parse(data);
+		//var alert   = bToObj.alert;
+		//var extras  = bToObj.extras;
+		//console.log(alert);
+
+		//console.log(extras['cn.jpush.android.MSG_ID']);
+		//console.log(extras['app']);
+		//console.log(extras['cn.jpush.android.NOTIFICATION_CONTENT_TITLE']);
+		//console.log(extras['cn.jpush.android.EXTRA']);
+		//console.log(extras['cn.jpush.android.PUSH_ID']);
+		//console.log(extras['cn.jpush.android.NOTIFICATION_ID']);
+		//console.log("JPushPlugin:openNotificationCallback is ready");
+	}
+	catch(exception){               
+		console.log(exception);
+	}
+}
+JPushPlugin.prototype.receiveNotificationInAndroidCallback = function(data){
+	try{
+		console.log("JPushPlugin:receiveNotificationInAndroidCallback");
+		var bToObj  = JSON.parse(data);
+		this.receiveNotification=bToObj;	
+		cordova.fireDocumentEvent('jpush.receiveNotification',null);
+	
+		//console.log(data);
 		//var bToObj  = JSON.parse(data);
 		//var alert   = bToObj.alert;
 		//var extras  = bToObj.extras;
@@ -193,10 +242,9 @@ JPushPlugin.prototype.stopPush = function(){
 }

 JPushPlugin.prototype.resumePush = function(){
-	if(device.platform == "Android") {
 		data=[]
 		this.call_native("resumePush",data,null);
-	}
+	
 }
 JPushPlugin.prototype.setDebugMode = function(mode){
 	if(device.platform == "Android") {
@@ -211,6 +259,13 @@ JPushPlugin.prototype.clearAllNotification = function(){
 	}
 }

+JPushPlugin.prototype.clearNotificationById = function(notificationId){
+    if(device.platform == "Android") {
+        data=[]
+        this.call_native("clearNotificationById",[notificationId],null);
+    }
+}
+
 JPushPlugin.prototype.setLatestNotificationNum = function(num){
   	if(device.platform == "Android") {
 		this.call_native("setLatestNotificationNum",[num],null);
@@ -218,17 +273,22 @@ JPushPlugin.prototype.setLatestNotificationNum = function(num){
 }

 JPushPlugin.prototype.isPushStopped = function(callback){
-	if(device.platform == "Android") {
+
 	    data=[];
 		this.call_native("isPushStopped",data,callback)
-	}
+	
 }

 JPushPlugin.prototype.init = function(){
-	if(device.platform == "Android") {
-	    data=[];
-		this.call_native("init",data,null);
-	}
+    if(this.isPlatformIOS()){
+       var data=[];
+       this.call_native("initial",data,null);
+    }else{
+       data=[];
+       this.call_native("init",data,null);
+
+    }
+	
 }

 JPushPlugin.prototype.setDebugMode = function(mode){
@@ -254,6 +314,13 @@ JPushPlugin.prototype.clearLocalNotifications = function(){
 	}
 }

+JPushPlugin.prototype.reportNotificationOpened = function(msgID){
+	if(device.platform == "Android") {
+	
+		this.call_native("reportNotificationOpened",[msgID],null);
+	}
+}
+
 //iOS  single


@@ -267,3 +334,5 @@ if(!window.plugins.jPushPlugin){

 module.exports = new JPushPlugin(); 

+
+
Author	SHA1	Message	Date
darkterrorooo	4d0ff548b8	Merge pull request #114 from darkterrorooo/master 升级 android sdk to 2.0.6	2016-01-21 17:28:52 +08:00
darkterrorooo	83e86b64de	升级 android sdk to 2.0.6	2016-01-21 17:20:31 +08:00
darkterrorooo	d5cf71ed1e	Merge pull request #103 from darkterrorooo/master 1，升级 iOS 推送库至 2.1.0 2，兼容 Cordova-ios 4.0 3 ，增加接口 getApplicationIconBadgeNumber 获取iOS应用本地角标值	2016-01-21 15:31:25 +08:00
darkterrorooo	1536d737ad	升级ios 库到 2.1.0	2016-01-21 15:23:53 +08:00
darkterrorooo	3f9454edf3	升级ios 库到 2.1.0	2016-01-21 15:15:48 +08:00
darkterrorooo	3d46fbc9ba	fix version	2015-12-17 18:06:55 +08:00
darkterrorooo	6f826ca9ba	Merge pull request #102 from annilq/patch-1 错别字	2015-12-16 15:04:21 +08:00
annilq	f2eb889584	错别字	2015-12-16 14:46:15 +08:00
darkterrorooo	34c316af7e	Merge pull request #101 from darkterrorooo/master fix #72 #99	2015-12-11 00:52:43 +08:00
darkterrorooo	e7bedc78f7	fix #72 #99	2015-12-11 00:45:49 +08:00
darkterrorooo	23fd3bc0cb	fix #72 #99	2015-12-11 00:38:48 +08:00
darkterrorooo	5e44499ff5	fix #72 #99	2015-12-11 00:34:55 +08:00
darkterrorooo	b13aabe2bc	fix tortuous	2015-12-09 18:51:56 +08:00
darkterrorooo	7cb3e22e14	Merge pull request #100 from darkterrorooo/master fix #99 android jpush.openNotification 事件调用两次	2015-12-09 18:42:35 +08:00
darkterrorooo	a3ad96f786	fix tortuous	2015-12-09 18:27:08 +08:00
darkterrorooo	42d64ca2f0	fix android openNotification twice	2015-12-09 17:55:10 +08:00
darkterrorooo	0af2f60dbb	Merge pull request #98 from darkterrorooo/master fix doc	2015-12-01 16:18:04 +08:00
darkterrorooo	0da9f0ed26	fix doc	2015-12-01 16:15:58 +08:00
darkterrorooo	f3bc83d97b	fix doc	2015-12-01 16:14:52 +08:00
darkterrorooo	8b674bb777	fix doc	2015-12-01 16:13:51 +08:00
darkterrorooo	181ab80dab	Merge pull request #97 from darkterrorooo/master 修正文档，在添加插件时填写 APP KEY	2015-12-01 16:11:45 +08:00
darkterrorooo	de59d7919b	fix doc	2015-12-01 16:06:41 +08:00
darkterrorooo	1102ad3a57	fix doc	2015-12-01 16:05:37 +08:00
darkterrorooo	a8e4060b4d	fix doc	2015-12-01 16:03:08 +08:00
darkterrorooo	3b234f3101	修复抽离了APP KEY后的文档	2015-12-01 15:40:16 +08:00
darkterrorooo	7c580b4eaf	修复抽离了APP KEY后的文档	2015-12-01 15:30:41 +08:00
darkterrorooo	af267eda94	修复抽离了APP KEY后的文档	2015-12-01 15:28:39 +08:00
darkterrorooo	d93b35611b	修复抽离了APP KEY后的文档	2015-12-01 15:27:45 +08:00
darkterrorooo	d94ccfb8d8	修复抽离了APP KEY后的文档	2015-12-01 15:24:31 +08:00
darkterrorooo	b24b7064ba	修复抽离了APP KEY后的文档	2015-12-01 15:18:40 +08:00
darkterrorooo	f12e7a35d0	Merge pull request #65 from wgjtyu/master 抽离API_KEY的配置	2015-12-01 12:15:55 +08:00
darkterrorooo	37c1d308eb	Merge pull request #96 from darkterrorooo/master 升级iOS, Android到最新的SDK	2015-11-26 15:38:08 +08:00
darkterrorooo	c2818fb193	修正iOS 接口 isPushStopped 的返回值，使stop 返回 1，非stop 返回 0	2015-11-26 13:10:58 +08:00
darkterrorooo	32d3ecc917	升级iOS SDK, 升级到 1.8.8 升级 Android SDK, 升级到 2.0.5 modified: plugin.xml modified: src/android/MyReceiver.java	2015-11-26 12:07:38 +08:00
George	138fde1587	Merge remote-tracking branch 'jpush/master' into test	2015-09-10 20:13:45 +08:00
zhangqinghe	f54252dd4f	修复文档中关于iOS appkey的部分	2015-08-18 13:51:26 +08:00
zhangqinghe	96c27448a0	Merge branch 'master' of https://github.com/jpush/jpush-phonegap-plugin	2015-08-10 17:20:26 +08:00
zhangqinghe	2211e68e68	fix #67	2015-08-10 17:19:56 +08:00
zhangqinghe	6a74a1697b	fix #66	2015-08-10 17:00:16 +08:00
George	3196aeff72	Android端清除指定消息	2015-08-06 17:51:03 +08:00
George	ca2e52fe54	抽离API_KEY的配置	2015-08-06 11:08:28 +08:00
zhangqinghe	a2c311730d	fix #62 about document	2015-08-05 14:45:44 +08:00
zhangqinghe	f624670b4f	fix #62	2015-08-03 13:34:36 +08:00
zhangqinghe	5ade8c3300	fix #57	2015-07-21 17:44:29 +08:00
zhangqinghe	c2f957acbe	修复程序彻底退出后，点击通知收不到消息的bug	2015-07-21 12:48:51 +08:00
zhangqinghe	b10bc7dbb4	Merge branch 'dev' of https://github.com/jpush/jpush-phonegap-plugin into dev	2015-07-17 15:25:25 +08:00
zhangqinghe	126e54d5b1	fix #53	2015-07-17 15:21:39 +08:00
zhangqinghe	7984b8acf0	fix fir android sdk 1.7.5 plugin.xml	2015-07-10 17:45:19 +08:00
zhangqinghe	1fbc14b677	change iOS sdk from v1.8.2 to 1.8.3	2015-07-10 17:45:19 +08:00
zhangqinghe	5fdd31b960	change android sdk form 1.7.3 to 1.7.5	2015-07-10 17:45:18 +08:00
zhangqinghe	b3e404ef12	修正JPushPlugin.prototype.receiveMessageInAndroidCallback的bug	2015-07-10 17:45:18 +08:00
zhangqinghe	1082fbd8c4	修改关于jpush.receiveNotification的文档，并删除旧有说明	2015-07-10 17:45:18 +08:00
zhangqinghe	c420ae20e5	add jpush.receiveNotificaiton event in platform android	2015-07-10 17:45:18 +08:00
zhangqinghe	c826b0d94a	fix fir android sdk 1.7.5 plugin.xml	2015-07-10 17:44:03 +08:00
zhangqinghe	79d0b5e037	change iOS sdk from v1.8.2 to 1.8.3	2015-07-10 17:44:03 +08:00
zhangqinghe	5836cac41f	change android sdk form 1.7.3 to 1.7.5	2015-07-10 17:44:02 +08:00
zhangqinghe	8ea95cd5ef	fix #47	2015-07-10 17:44:02 +08:00
zhangqinghe	c90c9b7b01	fix #47	2015-07-03 16:39:25 +08:00
zhangqinghe	ef339a1b96	修正JPushPlugin.prototype.receiveMessageInAndroidCallback的bug	2015-06-10 15:58:37 +08:00
zhangqinghe	0233a10906	修改关于jpush.receiveNotification的文档，并删除旧有说明	2015-06-09 17:31:57 +08:00
zhangqinghe	cb8f8412b4	add jpush.receiveNotificaiton event in platform android	2015-06-09 16:38:46 +08:00
zhangqinghe	4e2b2d6bb6	fix document about ios in content-avalible	2015-04-24 14:49:20 +08:00
zhangqinghe	8b3aa0b90e	fix /strios/example to example	2015-04-16 14:56:06 +08:00
zhangqinghe	2e5cfdaa5a	fix document about example position	2015-04-16 14:15:11 +08:00
zhangqinghe	7fcefce3ce	fix android message and notification event	2015-04-15 16:59:32 +08:00
zhangqinghe	ce8ca9f8f8	fix when app not launch tap notification,and not receice jpush.openNotification	2015-04-14 16:15:25 +08:00
zhangqinghe	93fbc893ca	ducument add event jpush.receiveMessage	2015-04-14 15:11:21 +08:00
zhangqinghe	7545a948bd	demo add openNotification receiveNotification receiveMessage code	2015-04-14 14:47:57 +08:00
zhangqinghe	2510289d95	about lazy load mode explanation	2015-04-14 13:35:29 +08:00
zhangqinghe	41c5c04dc1	move android api position	2015-04-14 13:08:41 +08:00
zhangqinghe	82dd47eefa	move andorid init api to common api document	2015-04-14 11:35:27 +08:00
zhangqinghe	f0c6374409	fix Cordova CLI auto install in document	2015-04-14 11:21:09 +08:00
zhangqinghe	40828ff145	move jpush sdk inital method to JPushPlugin static method	2015-04-14 10:05:14 +08:00
zhangqinghe	cbca41a513	Adjustment documents structure	2015-04-14 09:58:44 +08:00
zhangqinghe	fbd98732c8	fix dicument about open notification event when app is launching	2015-04-10 13:45:15 +08:00
zhangqinghe	ff86dc1230	add open notification evnet when app is launching	2015-04-10 13:42:25 +08:00
zhangqinghe	2dbd0cb248	add 'jpush.openNotificaiton'event in iOS ducoment	2015-04-10 11:11:26 +08:00
zhangqinghe	a049e2e62d	add open notificaiton event when app run background	2015-04-10 11:04:56 +08:00
zhangqinghe	bf003c84c1	add registrationID in document	2015-03-30 11:13:52 +08:00
zhangqinghe	ced9ad3a1e	fix abot api isPushStoped and resumePush in document	2015-03-30 11:02:33 +08:00
zhangqinghe	27378f6ca0	add new iterface 'isPushStopped' and 'resumePush' for platform iOS	2015-03-30 10:28:01 +08:00
zhangqinghe	58b8cd45b2	增加设置本地的badge值的api	2015-03-25 16:11:04 +08:00
qinghe.zhang	6d668101c5	Merge pull request #32 from yaonie084/master fix README.md for use cordovar 4.x	2015-03-19 15:29:27 +08:00
ethan	67ca37d55a	fix README.md for cordovar 4.x	2015-03-19 14:41:19 +08:00
zhangqinghe	e78d5bd544	fix jpush.receiveNotification in document	2015-03-19 13:37:48 +08:00
zhangqinghe	d92723301e	delete OnPuase in Document	2015-03-18 17:07:38 +08:00
zhangqinghe	605fcf4a62	remove deprecated interface writeJavascript	2015-03-18 15:34:16 +08:00
zhangqinghe	e66336f670	update android sdk version to v1.7.3	2015-03-17 14:18:12 +08:00
zhangqinghe	2797bdd0e7	add ducoment about with JPushPlugin.h	2015-03-10 17:38:14 +08:00
zhangqinghe	a197975d03	upadte js event 'jpush.receiveNotification'	2015-03-10 16:58:09 +08:00
zhangqinghe	27c4fe7b26	add event jpush.receiveNotification in object-c file	2015-03-10 16:46:44 +08:00
zhangqinghe	aae9e8314a	add js event jpush.receiveNotification	2015-03-10 16:37:08 +08:00
zhangqinghe	7d489c7f20	Merge branch 'dev' of ssh://github.com/jpush/jpush-phonegap-plugin into dev	2015-02-14 16:26:05 +08:00
zhangqinghe	c3cfa01e60	delete openNotificaiton error simple	2015-02-14 16:24:09 +08:00
zhangqinghe	27ebdd6809	增加了打开通知的event回调	2015-02-14 16:24:09 +08:00
qinghe.zhang	e945bcf53d	Merge pull request #29 from Samurais/master #28 stream cn.jpush.android.EXTRA from JSONObject to String	2015-02-14 16:23:01 +08:00
Samurais	cc858c2464	#28 stream cn.jpush.android.EXTRA from JSONObject to String	2015-02-14 16:07:31 +08:00
zhangqinghe	1b93f5e026	delete openNotificaiton error simple	2015-01-27 18:31:05 +08:00
zhangqinghe	46e0c1879c	增加了打开通知的event回调	2015-01-27 18:19:16 +08:00
zhangqinghe	fe7c52f2c9	add open notificaiton event interface's document	2015-01-27 15:40:46 +08:00
zhangqinghe	f217eda463	添加统计代码	2015-01-26 14:40:44 +08:00
zhangqinghe	95fc690dd3	fix ducoment's error	2015-01-26 14:30:28 +08:00
zhangqinghe	260c298f6b	增加统计接口	2015-01-26 14:23:45 +08:00
zhangqinghe	7c1c29a7ec	add interface init and setDebugMode in example	2015-01-19 17:48:41 +08:00
qinghe.zhang	0aed054039	Merge pull request #22 from Samurais/master #21 fix json parse issue in openNotificationInAndroidCallback	2015-01-19 17:07:01 +08:00
Samurais	95194695fe	#21 fix json parse issue in openNotificationInAndroidCallback	2014-12-15 17:07:55 +08:00