Merge branch 'dev'

fix bug
解决当应用在后台时无法获取通知标题的 bug
2026-01-28 00:00:03 +08:00 · 2016-04-15 17:08:19 +08:00 · 2016-04-15 16:17:33 +08:00 · 2016-04-12 14:50:27 +08:00 · 2016-04-12 14:49:42 +08:00 · 2016-04-12 11:23:44 +08:00
26 changed files with 1848 additions and 1708 deletions
--- a/README.md
+++ b/README.md
@@ -1,15 +1,17 @@
-## JPush PhoneGap Plugin ##
+## JPush PhoneGap/Cordova Plugin ##

-jpush-phonegap-plugin 支持 iOS,Android 的推送插件。
+JPush-PhoneGap-Plugin 支持 iOS, Android 的推送插件。

 **功能特性：**
->+ 发送推送通知
+支持 iOS, Android 的极光推送插件。
+
+### 功能特性
+ 发送推送通知
 + 发送推送自定义消息
 + 设置推送标签和别名
 + 设置角标（iOS）

-*如需要 IM 功能插件，请关注[jmessage-phonegap-plugin](https://github.com/jpush/jmessage-phonegap-plugin)*
-
+*如需要 IM 功能插件，请关注 [jmessage-phonegap-plugin](https://github.com/jpush/jmessage-phonegap-plugin)*

 ## 安装 ##
 ###准备工作
@@ -17,101 +19,113 @@ jpush-phonegap-plugin 支持 iOS,Android 的推送插件。
 1. cordova create 文件夹名字 包名 应用名字

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

-		cd Myproj 
+		cd Myproj
 		cordova platform add android  
 		cordova platform add ios

 		ps:这里请注意iOS平台，必须先执行 `cordova platform add ios`,
-		然后再执行`cordova plugin add xxxxx`命令，不然有一些必须要的链接库需要手动添加
-		
+		然后再执行 `cordova plugin add xxxxx` 命令，不然有一些必须要的链接库需要手动添加

-###Cordova CLI/Phonegap 安装 Android & iOS

-1).  安装JPush PhoneGap Plugin。 有两种方法。
+###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  
+方法一：在线安装
+
+通过 cordova plugins 安装，要求 phonegap/cordova CLI 5.0+ (current stable v2.1.1)
+
+	cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey
+
+直接通过 url 安装（unstable）
+
+    cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable API_KEY=your_jpush_appkey  

 方法二：下载到本地再安装

-使用git命令将jpush phonegap插件下载的本地,将这个目录标记为`$JPUSH_PLUGIN_DIR`
-
+使用 git 命令将 JPush PhoneGap 插件下载的本地,将这个目录标记为 `$JPUSH_PLUGIN_DIR`

    git clone https://github.com/jpush/jpush-phonegap-plugin.git
    cordova plugin add $JPUSH_PLUGIN_DIR  --variable API_KEY=your_jpush_appkey


-
-2).  安装org.apache.cordova.device
+2). 安装 org.apache.cordova.device

     cordova plugin add org.apache.cordova.device


-3). 在js中调用函数,初始化jpush sdk
+3). 在 js 中调用函数,初始化 JPush SDK

-    window.plugins.jPushPlugin.init();	
-    //由于phonegap插件采用了Lazy load的特性，	所以这里建议在js文件能执行的最开始就加
+    //由于 PhoneGap 插件采用了 Lazy load 的特性，所以建议在 js 文件能执行的最开始就添加
+    window.plugins.jPushPlugin.init();


-### Android 手工安装
+### Android 手动安装

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

-### IOS手工安装

-[IOS手工安装文档地址](document/iOS_handle_install.md)
+### iOS 手动安装
+
+[IOS手动安装文档地址](document/iOS_handle_install.md)


 ###示例

-1. "$JPUSH_PLUGIN_DIR/example"文件夹内找到并拷贝以下文件
+"$JPUSH_PLUGIN_DIR/example"文件夹内找到并拷贝以下文件

 		src/example/index.html to www/index.html
 		src/example/css/* to www/css
 		src/example/js/* to www/js

-###关于'phonegap build'云服务
+###关于'PhoneGap build'云服务

-该项目基于cordova实现，目前无法使用'phonegap build'云服务进行打包，建议使用本地环境进行打包
+该项目基于 cordova 实现，目前无法使用 'PhoneGap build' 云服务进行打包，建议使用本地环境进行打包

-### API说明
+### API 说明

-插件的API集中在JPushPlugin.js文件中,这个文件的位置如下
+插件的 API 集中在 JPushPlugin.js 文件中,该文件的具体位置如下：

-*  android:[YOUR__ANDROID_PROJECT]/assets/www/plugins/cn.jpush.phonegap.JPushPlugin/www
-*  iOS:[YOUR_iOS_PROJEcT]/www/plugins/cn.jpush.phonegap.JPushPlugin/www
+Android:

-具体的API请参考这里
+	[Project]/assets/www/plugins/cn.jpush.phonegap.JPushPlugin/www

-#### iOS和adnroid通用API简介
+iOS:
+
+	[Project]/www/plugins/cn.jpush.phonegap.JPushPlugin/www
+
+具体的 API 请参考下面：
+
+#### iOS 和 Android 通用 API 简介
+
+ 停止与恢复推送服务

-+ 停止与恢复推送服务 API
-		
 		window.plugins.jPushPlugin.init()
 		window.plugins.jPushPlugin.stopPush()
 		window.plugins.jPushPlugin.resumePush()
 		window.plugins.jPushPlugin.isPushStopped(callback)

-
-+ 获取 RegistrationID API
+ 获取 RegistrationID

 		window.plugins.jPushPlugin.getRegistrationID(callback)
-		
-+ 别名与标签 API
-	
-		window.plugins.jPushPlugin.setTagsWithAlias(tags,alias)
+
+ 别名与标签
+
+		window.plugins.jPushPlugin.setTagsWithAlias(tags, alias)
 		window.plugins.jPushPlugin.setTags(tags)
 		window.plugins.jPushPlugin.setAlias(alias)
+
+	 	event - jpush.setTagsWithAlias //三个方法都是触发该回调事件
+
 + 获取点击通知内容
-		
+
 		event - jpush.openNotification
+
 + 获取通知内容
-		
+
 		event - jpush.receiveNotification

 + 获取自定义消息推送内容
@@ -119,94 +133,107 @@ jpush-phonegap-plugin 支持 iOS,Android 的推送插件。
 		event - jpush.receiveMessage


-[通用API详细说明](document/Common_detail_api.md)
+	[通用 API 详细说明](document/Common_detail_api.md)

 #### iOS API简介

 + 获取自定义消息推送内容

-		event - jpush.receiveMessage
-		//推荐使用事件的方式传递，但同时保留了receiveMessageIniOSCallback的回调函数，兼容以前的代码
+		//推荐使用事件的方式传递，但同时保留了 receiveMessageIniOSCallback 的回调函数，兼容以前的代码
 		window.plugins.jPushPlugin.receiveMessageIniOSCallback(data)
-		
+
+		event - jpush.receiveMessage
+
 + 页面的统计
-	
-		window.plugins.jPushPlugin.startLogPageView (pageName)
-		window.plugins.jPushPlugin.stopLogPageView (pageName)
-		window.plugins.jPushPlugin.beginLogPageView (pageName,duration)
-+ 设置Badge
+
+		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.getApplicationIconBadgeNumber(callback)
+
 + 本地通知

-	+ 后续版本加入
-		
+		window.plugins.JPushPlugin.addLocalNotificationForIOS(delayTime, content,
+			badge, notificationID, extras)
+		window.plugins.JPushPlugin.deleteLocalNotificationWithIdentifierKeyInIOS()
+		window.plugins.JPushPlugin.clearAllLocalNotifications()
+
 + 日志等级设置
-	
-		window.plugins.jPushPlugin.setDebugModeFromIos ()
+
+		window.plugins.jPushPlugin.setDebugModeFromIos()
 		window.plugins.jPushPlugin.setLogOFF()
-		
-		
-[iOS API详细说明](document/iOS_detail_api.md)
+		window.plugins.JPushPlugin.setCrashLogON()
+
+ 地理位置上报
+
+		window.plugins.JPushPlugin.setLocation(latitude, longitude)
+
+	[iOS API 详细说明](document/iOS_detail_api.md)


-#### adnroid API简介
-		
+#### Android API简介
+
 + 获取集成日志
+
 		window.plugins.jPushPlugin.setDebugMode(mode)

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

-+ 统计分析 API
+ 统计分析

-		onResume / onPause(java api)
-			
-+ 清除通知 API
+		window.plugins.jPushPlugin.setStatisticsOpen(boolean)
+
+	或在 MainActivity 中的 onPause() 和 onResume() 方法中分别调用
+	JPushInterface.onPause(this) 和 JPushInterface.onResume(this) 来启用统计分析功能,
+	如果使用这种方式启用统计分析功能，则 window.plugins.jPushPlugin.setStatisticsOpen(boolean)
+	方法不再有效，建议不要同时使用。
+
+ 清除通知

 		window.plugins.jPushPlugin.clearAllNotification()

-+ 通知栏样式定制 API
+ 通知栏样式定制

 		window.plugins.jPushPlugin.setBasicPushNotificationBuilder = function()
 		window.plugins.jPushPlugin.setCustomPushNotificationBuilder = function()

-+ 设置保留最近通知条数 API
-		
+ 设置保留最近通知条数
+
 		window.plugins.jPushPlugin.setLatestNotificationNum(num)
-		
-+ 本地通知API
-		
-		window.plugins.jPushPlugin.addLocalNotification(builderId,
-												    content,
-												    title,
-												    notificaitonID,
-												    broadcastTime,
-											 	    extras)
+
+ 本地通知
+
+		window.plugins.jPushPlugin.addLocalNotification(builderId, content,
+				title, notificaitonID, broadcastTime, extras)
 		window.plugins.jPushPlugin.removeLocalNotification(notificationID)
 		window.plugins.jPushPlugin.clearLocalNotifications()

-[Android API详细说明](document/Android_detail_api.md)
+	[Android API 详细说明](document/Android_detail_api.md)

 ###常见问题

-####1. androd
+####1. Android

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

-####2. iOS 设置/修改 APP_KEY
-	
-    在PushConfig.plist 中修改。PushConfig.plist 其他值说明： 
-    CHANNEL 渠道标识
-    IsProduction 是否生产环境（暂未启用）
-	
+####2. iOS 设置 / 修改 APP_KEY
+
+    在 PushConfig.plist 中修改。
+	PushConfig.plist 其他值说明：
+    	CHANNEL: 渠道标识
+    	IsProduction: 是否生产环境（暂未启用）


 ###更多
- [JPush官网文档](http://docs.jpush.io/)
+ [JPush 官网文档](http://docs.jpush.io/)
--- a/document/Android_detail_api.md
+++ b/document/Android_detail_api.md
@@ -1,16 +1,40 @@
-## adnroid API简介
+## Android API简介


+### 接收通知时获得通知的信息
+
+- 内容
+    window.plugins.jPushPlugin.receiveNotification.alert;
+- 标题
+    window.plugins.jPushPlugin.receiveNotification.title;
+- 附加字段
+    window.plugins.jPushPlugin.receiveNotification.extras.yourKey;
+
+### 打开通知时获得通知的信息
+
+- 内容
+    window.plugins.jPushPlugin.openNotification.alert;
+- 标题
+    window.plugins.jPushPlugin.openNotification.title;
+- 附加字段
+    window.plugins.jPushPlugin.openNotification.extras.yourKey;
+
+### 收到自定义消息时获得通知的信息
+
+- 内容
+    window.plugins.jPushPlugin.openNotification.message;
+- 附加字段
+    window.plugins.jPushPlugin.openNotification.extras.yourKey;

 ### 获取集成日志

 #### API - setDebugMode

-用于开启调试模式，可以查看集成JPush过程中的log，如果集成失败，可方便定位问题所在
+用于开启调试模式，可以查看集成 JPush 过程中的 Log，如果集成失败，可方便定位问题所在。

 ##### 接口定义

-	window.plugins.jPushPlugin.setDebugMode (mode)
+	window.plugins.jPushPlugin.setDebugMode(mode)

 ##### 参数说明

@@ -23,27 +47,28 @@
 ###  接收消息和点击通知事件
 #### API - receiveMessageInAndroidCallback

-用于android收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
+用于 Android 收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用。

 ##### 接口定义

 	window.plugins.jPushPlugin.receiveMessageInAndroidCallback = function(data)
-	
+
 ##### 参数说明
- data 接收到的js字符串，包含的key:value请进入该函数体查看
+
+- data 接收到的 js 字符串，包含的 key:value 请进入该函数体查看。

 ##### 代码示例

 #### API - openNotificationInAndroidCallback

-当点击android手机的通知栏进入应用程序时,会调用这个函数，这个函数不需要主动调用，是作为回调函数来用的
-
+当点击 Android 手机的通知栏进入应用程序时,会调用这个函数，这个函数不需要主动调用，是作为回调函数来用的。

 ##### 接口定义

 	window.plugins.jPushPlugin.openNotificationInAndroidCallback = function(data)
-	
+
 ##### 参数说明
+
 - data js字符串

 ##### 代码示例
@@ -51,18 +76,20 @@
 ###  统计分析 API

 #### API - onResume / onPause
-这是一个 android local api，不是js的api，请注意
-本 API 用于“用户使用时长”，“活跃用户”，“用户打开次数”的统计，并上报到服务器，在 Portal 上展示给开发者。

+这是一个 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 当前所在的 Activity。
+
 ####调用说明

 应在所有的 Activity 的 onResume / onPause 方法里调用。
@@ -74,25 +101,39 @@
 	    super.onResume();
 	    JPushInterface.onResume(this);
 	}
+
 	@Override
 	protected void onPause() {
 	    super.onPause();
 	    JPushInterface.onPause(this);
 	}

+#### API - setStatisticsOpen(boolean)
+
+用于在 js 中控制是否打开应用的统计分析功能，但如果已经添加了上面的 onResume / onPause 方法，
+就不能再通过这个方法来控制统计分析功能了。
+
+#### 接口定义
+
+	window.plugins.jPushPlugin.setStatisticsOpen(boolean)
+
+#### 参数说明
+
+- boolean
+	- true : 打开统计分析功能
+	- false: 关闭统计分析功能

 #### API - reportNotificationOpened

 用于上报用户的通知栏被打开，或者用于上报用户自定义消息被展示等客户端需要统计的事件。

-
 ##### 接口定义

 	window.plugins.jPushPlugin.reportNotificationOpened(msgID)
-	
+
 ##### 参数说明
 - msgID
-	-收到的通知或者自定义消息的id 	
+	- 收到的通知或者自定义消息的 id 	


 ###  清除通知 API
@@ -101,7 +142,7 @@

 推送通知到客户端时，由 JPush SDK 展现通知到通知栏上。

-此 API 提供清除通知的功能，包括：清除所有 JPush 展现的通知（不包括非 JPush SDK 展现的）
+此 API 提供清除通知的功能，包括：清除所有 JPush 展现的通知（不包括非 JPush SDK 展现的）。


 ##### 接口定义
@@ -112,19 +153,19 @@
 ###  设置通知静默时间 API
 ###  通知栏样式定制 API

-#### API - setBasicPushNotificationBuilder,setCustomPushNotificationBuilder
+#### API - setBasicPushNotificationBuilder, setCustomPushNotificationBuilder

 当用户需要定制默认的通知栏样式时，则可调用此方法。
 极光 Push SDK 提供了 2 个用于定制通知栏样式的构建类：

- setBasicPushNotificationBuilder 
-	- Basic 用于定制 Android Notification 里的 defaults / flags / icon 等基础样式（行为）
+- setBasicPushNotificationBuilder
+	- Basic 用于定制 Android Notification 里的 defaults / flags / icon 等基础样式（行为）。
 - setCustomPushNotificationBuilder
-	- 继承 Basic 进一步让开发者定制 Notification Layout
-	
-如果不调用此方法定制，则极光Push SDK 默认的通知栏样式是：Android标准的通知栏提示。
+	- 继承 Basic 进一步让开发者定制 Notification Layout。

-##### 接口定义 
+如果不调用此方法定制，则极光 Push SDK 默认的通知栏样式是：Android 标准的通知栏提示。
+
+##### 接口定义

 	window.plugins.jPushPlugin.setBasicPushNotificationBuilder = function()
 	window.plugins.jPushPlugin.setCustomPushNotificationBuilder = function()
@@ -143,43 +184,37 @@
 ##### 接口定义

 	window.plugins.jPushPlugin.setLatestNotificationNum(num)
-	
+
 ##### 参数说明

 - num 保存的条数


-###  本地通知API
+###  本地通知 API
 #### API - addLocalNotification,removeLocalNotification,clearLocalNotifications


-本地通知API不依赖于网络，无网条件下依旧可以触发
+本地通知 API 不依赖于网络，无网条件下依旧可以触发。

-本地通知与网络推送的通知是相互独立的，不受保留最近通知条数上限的限制
+本地通知与网络推送的通知是相互独立的，不受保留最近通知条数上限的限制。

-本地通知的定时时间是自发送时算起的，不受中间关机等操作的影响
+本地通知的定时时间是自发送时算起的，不受中间关机等操作的影响。


-三个接口的功能分别为：添加一个本地通知，删除一个本地通知，删除所有的本地通知
+三个接口的功能分别为：添加一个本地通知，删除一个本地通知，删除所有的本地通知。

 #####接口定义

 	window.plugins.jPushPlugin.addLocalNotification = function(builderId,
-											    content,
-												title,
-												notificaitonID,
-												broadcastTime,
-												extras)
+			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字符串
-
-
+- builderId 设置本地通知样式。
+- content 设置本地通知的 content。
+- title 设置本地通知的 title。
+- notificaitonID 设置本地通知的 ID。
+- broadcastTime 设置本地通知触发时间，为距离当前时间的数值，单位是毫秒。
+- extras 设置额外的数据信息 extras 为 json 字符串。
--- a/document/Android_handle_install.md
+++ b/document/Android_handle_install.md
@@ -1,15 +1,23 @@
-#Android 手工安装
+#Android 手动安装

-下载jpush phonegap插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
+下载 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 节点下添加以下权限
+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-release2.0.6.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. 复制：$JPUSH_PLUGIN_DIR/www/JPushPlugin.js 到 assets/www/plugins/cn.jpush.phonegap.JPushPlugin.www/
+   和 platform_www/plugins/cn.jpush.phonegap.JPushPlugin/www/
+   并在 JPushPlugin.js 文件的代码外添加:

-		<!-- Required  一些系统要求的权限，如访问网络等-->
+        cordova.define("cn.jpush.phonegap.JPushPlugin.JPushPlugin", function(require, exports, module) {
+            // 代码
+        });
+
+7. 修改 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"/>
@@ -25,24 +33,27 @@
 		      android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
 		      android:protectionLevel="signature"/>

-7. 修改AndroidManifest.xml 在 manifest/application 节点下添加SDK相关组件声明
+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"/>
+				<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核心功能-->
+
+		<!-- 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"
@@ -53,22 +64,25 @@
 				<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核心功能-->
+
+		<!-- Required SDK 核心功能-->
 		<receiver
-		android:name="cn.jpush.android.service.PushReceiver"
-		android:enabled="true">
+			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"/>
@@ -76,33 +90,46 @@
 				<data android:scheme="package"/>
 			</intent-filter>
 		</receiver>
-		
+
 		<!-- User defined.  For test only  用户自定义的广播接收器 -->
 		<receiver
-		android:name="cn.jpush.phonegap.MyReceiver"
-		android:enabled="true">
+			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>
+
 			<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"/>
+				<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"/>
+		<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
@@ -1,20 +1,20 @@
-#通用API说明
+#通用 API 说明


-## 停止与恢复推送服务 API	
+## 停止与恢复推送服务 API
 ### API - init

-调用此API,用来开启
+调用此 API,用来开启
 JPush SDK 提供的推送服务。

-开发者App可以通过调用停止推送服务API来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
+开发者 App 可以通过调用停止推送服务 API 来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。

 ```
 本功能是一个完全本地的状态操作。也就是说：停止推送服务的状态不会保存到服务器上。

-如果停止推送服务后，开发者App被重新安装，或者被清除数据，
+如果停止推送服务后，开发者 App 被重新安装，或者被清除数据，

-JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数据被清除掉了）。 
+JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数据被清除掉了）。
 本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，

 恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
@@ -25,39 +25,39 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 	window.plugins.jPushPlugin.init()

 ### API - stopPush
-+ 在android平台 
+ 在 Android 平台
+
+	+ 开发者 App 可以通过调用停止推送服务 API 来停止极光推送服务，当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
+

-	+ 开发者App可以通过调用停止推送服务API来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
-	
-	
 	+ 调用了本 API 后，JPush 推送服务完全被停止。具体表现为：
-		
+
 		+ JPush Service 不在后台运行
 		+ 收不到推送消息
-		+ 不能通过 JPushInterface.init 恢复，需要调用resumePush恢复
+		+ 不能通过 JPushInterface.init 恢复，需要调用 resumePush 恢复
 		+ 极光推送所有的其他 API 调用都无效

-+ iOS平台
+ iOS 平台

-	+ 不推荐调用，因为这个API只是让你的DeviceToken失效，在设置－通知 中您的应用程序没有任何变化
-    + 推荐：设置一个UI界面， 提醒用户在在设置－通知关闭推送服务
+	+ 不推荐调用，因为这个 API 只是让你的 DeviceToken 失效，在 设置－通知 中您的应用程序没有任何变化
+    + 推荐：设置一个 UI 界面， 提醒用户在 设置－通知 中关闭推送服务
+
+### 接口定义

-### 接口定义 
-    
    window.plugins.jPushPlugin.stopPush()
-	
+

 #### API - resumePush


 恢复推送服务。调用了此 API 后

-+ 在android平台 
+ 在 Android 平台

 	+ 极光推送完全恢复正常工作，

 + iOS平台
-	
+
 	+ 重新去APNS注册


@@ -68,12 +68,12 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数

 #### API - isPushStopped

-+ 在android平台 
+ 在 Android 平台

 	+ 用来检查 Push Service 是否已经被停止

 + iOS平台
-	
+
 	+ 平台检查推送服务是否注册


@@ -84,17 +84,17 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数

 ##### 参数说明

-+ callback 回调函数，用来通知JPush的推送服务是否开启
+ callback 回调函数，用来通知 JPush 的推送服务是否开启

 ####代码示例
-	    window.plugins.jPushPlugin.resumePush(callback)
-		var onCallback = function(data) {
-		    if(data>0){
-		    	//开启
-		    }else{
-		    	//关闭
-		    }
+	window.plugins.jPushPlugin.resumePush(callback)
+	var onCallback = function(data) {
+		if(data > 0){
+		    // 开启
+		} else {
+		    // 关闭
 		}
+	}


 ##获取 RegistrationID API
@@ -103,7 +103,8 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数

 RegistrationID 定义

-集成了 JPush SDK 的应用程序在第一次成功注册到 JPush 服务器时，JPush 服务器会给客户端返回一个唯一的该设备的标识 - RegistrationID。JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
+集成了 JPush SDK 的应用程序在第一次成功注册到 JPush 服务器时，JPush 服务器会给客户端返回一个唯一的该设备的标识 - RegistrationID。
+JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 应用程序可以把此 RegistrationID 保存以自己的应用服务器上，然后就可以根据 RegistrationID 来向设备推送消息或者通知。

@@ -121,22 +122,22 @@ RegistrationID 定义

 	window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
 	var onGetRegistradionID = function(data) {
-		try{
-			console.log("JPushPlugin:registrationID is "+data)		}
-		catch(exception){
+		try {
+			console.log("JPushPlugin:registrationID is " + data)		
+		} catch(exception) {
 			console.log(exception);
 		}
 	}

 ##别名与标签 API

-### API - setTagsWithAlias,setTags,setAlias
+### API - setTagsWithAlias, setTags, setAlias

 提供几个相关 API 用来设置别名（alias）与标签（tags）。

 这几个 API 可以在 App 里任何地方调用。

-别名 alias
+**别名 Alias**

 为安装了应用程序的用户，取个别名来标识。以后给该用户 Push 消息时，就可以用此别名来指定。

@@ -144,11 +145,11 @@ RegistrationID 定义

 同一个应用程序内，对不同的用户，建议取不同的别名。这样，尽可能根据别名来唯一确定用户。

-系统不限定一个别名只能指定一个用户。如果一个别名被指定到了多个用户，当给指定这个别名发消息时，服务器端API会同时给这多个用户发送消息。
+系统不限定一个别名只能指定一个用户。如果一个别名被指定到了多个用户，当给指定这个别名发消息时，服务器端 API 会同时给这多个用户发送消息。

-举例：在一个用户要登录的游戏中，可能设置别名为 userid。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userid 调用服务器端API发通知到客户端提醒用户。
+举例：在一个用户要登录的游戏中，可能设置别名为 userid。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userid 调用服务器端 API 发通知到客户端提醒用户。

-标签 tag
+**标签 Tag**

 为安装了应用程序的用户，打上标签。其目的主要是方便开发者根据标签，来批量下发 Push 消息。

@@ -160,44 +161,39 @@ RegistrationID 定义

 #### 接口定义

-	JPushPlugin.prototype.setTagsWithAlias = function(tags,alias)
+	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 
+	* 单个设备最多支持设置 100 个 tag，App 全局 tag 数量无限制。
+* alias
 	* 参数类型为字符串
 	* nil 此次调用不设置此值
 	* 空字符串 （""）表示取消之前的设置
 	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
-	* 限制：alias 命名长度限制为 40 字节。（判断长度需采用UTF-8编码）
-	
+	* 限制：alias 命名长度限制为 40 字节。（判断长度需采用 UTF-8 编码）
+
 #### 返回值说明

-函数本身无返回值，但需要注册`jpush.setTagsWithAlias	`事件来监听设置结果
-	
+函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果
+
 	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
-    var onTagsWithAlias = function(event){
-       try{
+    var onTagsWithAlias = function(event) {
+       try {
           console.log("onTagsWithAlias");    
-           var result="result code:"+event.resultCode+" ";
-           result+="tags:"+event.tags+" ";
-           result+="alias:"+event.alias+" ";
+           var result = "result code:"+event.resultCode + " ";
+           result += "tags:" + event.tags + " ";
+           result += "alias:" + event.alias + " ";
           $("#tagAliasResult").html(result);
-       }
-       catch(exception){
+       } catch(exception) {
           console.log(exception)
       }
   }
@@ -207,17 +203,18 @@ android iOS



-|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次|	短时间内操作过于频繁|
+|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次	       |短时间内操作过于频繁|
+

 ### 获取点击通知内容

@@ -227,24 +224,24 @@ android iOS

 #####代码示例

- 在你需要接收通知的的js文件中加入:
-	           
+- 在你需要接收通知的的 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
+
+                    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":{
@@ -255,8 +252,8 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.ope
 			     "cn.jpush.android.PUSH_ID":"1691785879",
 			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
 			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
-		
-+ iOS 
+
+ iOS

 		{
 		"aps":{
@@ -264,6 +261,8 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.ope
 			  "sound":"default",
 			  "alert":"今天去哪儿"
 			  },
+		"key1":"value1",
+		"key2":"value2",
 		"_j_msgid":154604475
 		}

@@ -275,24 +274,24 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.ope

 #####代码示例

- 在你需要接收通知的的js文件中加入:
-	           
+- 在你需要接收通知的的 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);
+- onReceiveNotification 需要这样写：

-ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
-	
-+ android
+
+                    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":{
@@ -303,8 +302,8 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.rec
 			     "cn.jpush.android.PUSH_ID":"1691785879",
 			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
 			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
-		
-+ iOS 
+
+ iOS

 		{
 		"aps":{
@@ -312,6 +311,8 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.rec
 			  "sound":"default",
 			  "alert":"今天去哪儿"
 			  },
+		"key1":"value1",
+		"key2":"value2",
 		"_j_msgid":154604475
 		}

@@ -323,37 +324,37 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.rec

 收到应用内消息时触发这个事件

-`推荐使用事件的方式传递，但同时保留了receiveMessageIniOSCallback的回调函数，兼容以前的代码`
+`推荐使用事件的方式传递，但同时保留了 receiveMessageIniOSCallback 的回调函数，兼容以前的代码`


 #####代码示例

- 在你需要接收通知的的js文件中加入:
-	           
+- 在你需要接收通知的的 js 文件中加入:
+
 		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);

- onReceiveMessage需要这样写：
-		
-		
-            var onReceiveMessage = function(event){
+- onReceiveMessage 需要这样写：
+
+
+            var onReceiveMessage = function(event) {
                try{
                    var message
-                    if(device.platform == "Android"){
+                    if(device.platform == "Android") {
                  		 message = window.plugins.jPushPlugin.receiveMessage.message;
-                    }else{
-                         message   = event.content;
+                    } else {
+                         message = event.content;
                    }          
                     $("#messageResult").html(message);
-                     
+
                }
-                catch(exception){
-                    console.log("JPushPlugin:onReceiveMessage-->"+exception);
+                catch(exception) {
+                    console.log("JPushPlugin:onReceiveMessage-->" + exception);
                }
            }

-ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意

-+ android
+ Android

 		{"message":"今天去哪儿",
 		"extras"{
@@ -371,5 +372,3 @@ ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.rec
 		 		  "key":"不填写没有"
 		 		  }
 		 }
-	
-
--- a/document/iOS_detail_api.md
+++ b/document/iOS_detail_api.md
@@ -5,7 +5,7 @@

 #### API - receiveMessageIniOSCallback

-用于iOS收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
+用于 iOS 收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
 不推荐使用回调函数

 ##### 接口定义
@@ -14,10 +14,10 @@

 #####参数说明

- data 	是一个js字符串使用如下代码解析，js具体key根据应用内消息来确定
-	
-		var bToObj = JSON.parse(data);
-		
+- data 	是一个 js 字符串使用如下代码解析，js 具体 key 根据应用内消息来确定
+
+		var bToObj = JSON.parse(data)
+
 #####返回值
 无

@@ -25,16 +25,17 @@


 ### 页面的统计
-#### API - startLogPageView,stopLogPageView,beginLogPageView
+#### 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)
+	window.plugins.jPushPlugin.prototype.startLogPageView = function(pageName)
+	window.plugins.jPushPlugin.prototype.stopLogPageView = function(pageName)
+	window.plugins.jPushPlugin.prototype.beginLogPageView = function(pageName, duration)
 #####参数说明
 pageName 需要统计页面自定义名称
+
 duration 自定义的页面时间
 #####调用说明
 应在所有的需要统计得页面得 viewWillAppear 和 viewWillDisappear 加入 startLogPageView 和 stopLogPageView 来统计当前页面的停留时间。
@@ -44,64 +45,59 @@ duration 自定义的页面时间
 无
 #####代码示例

-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.beginLogPageView("newPage",5);
-		window.plugins.jPushPlugin.startLogPageView("onePage");
-		window.plugins.jPushPlugin.stopLogPageView("onePage");
-	}
+	window.plugins.jPushPlugin.beginLogPageView("newPage", 5);
+	window.plugins.jPushPlugin.startLogPageView("onePage");
+	window.plugins.jPushPlugin.stopLogPageView("onePage");
+
 ### 设置Badge
-#### API - setBadge,resetBadge
+#### API - setBadge, resetBadge

- JPush封装badge功能，允许应用上传badge值至JPush服务器，由JPush后台帮助管理每个用户所对应的推送badge值，简化了设置推送badge的操作。
-（本接口不会直接改变应用本地的角标值. 要修改本地badege值，使用 setApplicationIconBadgeNumber）
+ JPush 封装 badge 功能，允许应用上传 badge 值至 JPush 服务器，由 JPush 后台帮助管理每个用户所对应的推送 badge 值，简化了设置推送 badge 的操作。
+（本接口不会直接改变应用本地的角标值. 要修改本地 badege 值，使用 setApplicationIconBadgeNumber）

-实际应用中，开发者可以直接对badge值做增减操作，无需自己维护用户与badge值之间的对应关系。
+实际应用中，开发者可以直接对 badge 值做增减操作，无需自己维护用户与 badge 值之间的对应关系。
 ##### 接口定义

-	window.plugins.jPushPlugin.setBadge(value)
-	window.plugins.jPushPlugin.reSetBadge()
+	window.plugins.jPushPlugin.prototype.setBadge(value)
+	window.plugins.jPushPlugin.prototype.reSetBadge()

 `resetBadge相当于setBadge(0)`
 ##### 参数说明
 value 取值范围：[0,99999]
 ##### 返回值
-无，控制台会有log打印设置结果
+无，控制台会有 log 打印设置结果
 #####代码示例

-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.setBadge(5);
-		window.plugins.jPushPlugin.reSetBadge();
-	}
+	window.plugins.jPushPlugin.setBadge(5);
+	window.plugins.jPushPlugin.reSetBadge();

 #### API - setApplicationIconBadgeNumber

 本接口直接改变应用本地的角标值.
-设置iOS的角标，当设置badge＝0时为清除角标
+设置 iOS 的角标，当设置 badge ＝ 0 时为清除角标

 ##### 接口定义

-	window.plugins.jPushPlugin.setApplicationIconBadgeNumber(badge)
-	
+	window.plugins.jPushPlugin.prototype.setApplicationIconBadgeNumber(badge)
+
 ##### 参数说明

 - badge 整形,例如0，1，2
- 当badge为0时，角标被清除
+- 当 badge 为 0 时，角标被清除

 #####代码示例

-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
-	}
+	window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);


 #### API - getApplicationIconBadgeNumber

-获取iOS的角标值
+获取 iOS 的角标值

 ##### 接口定义

-	window.plugins.jPushPlugin.getApplicationIconBadgeNumber(callback)
-	
+	window.plugins.jPushPlugin.prototype.getApplicationIconBadgeNumber(callback)
+
 ##### 参数说明

 - callback 回调函数
@@ -112,39 +108,131 @@ value 取值范围：[0,99999]
 window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data){
     console.log(data);               
 });
- 
-``` 
+
+```

 ### 本地通知
+#### API - addLocalNotificationForIOS
+
+API 用于注册本地通知
+
+最多支持64个
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.prototype.addLocalNotificationForIOS(delayTime, content, badge, notificationID, extras)
+
+##### 参数说明
+
+- delayTime 本地推送延迟多长时间后显示，数值类型或纯数字的字符型均可
+- content 本地推送需要显示的内容
+- badge 角标的数字。如果不需要改变角标传-1。数值类型或纯数字的字符型均可
+- notificationID 本地推送标识符,字符串。
+- extras 自定义参数，可以用来标识推送和增加附加信息。字典类型。
+
+#####代码示例
+
+	window.plugins.jPushPlugin.addLocalNotificationForIOS(6*60*60, "本地推送内容", 1, "notiId", {"key":"value"});
+
+#### API - deleteLocalNotificationWithIdentifierKeyInIOS
+
+API 删除本地推送定义
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS(identifierKey)
+
+##### 参数说明
+
+- identifierKey 本地推送标识符
+
+#####代码示例
+
+        window.plugins.jPushPlugin.deleteLocalNotificationWithIdentifierKeyInIOS("identifier");
+
+#### API - clearAllLocalNotifications
+
+API 清除所有本地推送对象
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.prototype.clearAllLocalNotifications()
+
+#####代码示例
+
+    window.plugins.jPushPlugin.clearAllLocalNotifications();

 ### 日志等级设置
 #### API - setDebugModeFromIos
-API 用于开启Debug模式，显示更多的日志信息
+API 用于开启 Debug 模式，显示更多的日志信息

-建议调试时开启这个选项，不调试的时候注释这句代码，这个函数setLogOFF是相反的一对
+建议调试时开启这个选项，不调试的时候注释这句代码，这个函数 setLogOFF 是相反的一对
 ##### 接口定义

-	window.plugins.jPushPlugin.reSetBadge.setDebugModeFromIos()
-	
+	window.plugins.jPushPlugin.prototype.setDebugModeFromIos()
+
 #####代码示例

-	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.setDebugModeFromIos();
-	}
+	window.plugins.jPushPlugin.setDebugModeFromIos();

 #### API - setLogOFF

-API用来关闭日志信息（除了必要的错误信息）
+API 用来关闭日志信息（除了必要的错误信息）

-不需要任何调试信息的时候，调用此API （发布时建议调用此API，用来屏蔽日志信息，节省性能消耗)
+不需要任何调试信息的时候，调用此 API（发布时建议调用此 API，用来屏蔽日志信息，节省性能消耗)

-##### 接口定义 
+##### 接口定义

-	window.plugins.jPushPlugin.reSetBadge.setLogOFF ()
+	window.plugins.jPushPlugin.prototype.setLogOFF()
+
+#####代码示例
+
+	window.plugins.jPushPlugin.setLogOFF();
+
+#### API - setCrashLogON
+
+API 用于统计用户应用崩溃日志
+
+如果需要统计 Log 信息，调用该接口。当你需要自己收集错误信息时，切记不要调用该接口。
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.prototype.setCrashLogON()
+
+#####代码示例
+
+	window.plugins.jPushPlugin.setCrashLogON();
+
+### 地理位置上报
+#### API - setLocation
+API 用于统计用户地理信息
+
+##### 接口定义
+
+window.plugins.jPushPlugin.prototype.setLocation(latitude,longitude)
+
+##### 参数说明
+
+- latitude 地理位置纬度，数值类型或纯数字的字符型均可
+- longitude 地理位置精度，数值类型或纯数字的字符型均可
+
+#####代码示例
+
+window.plugins.jPushPlugin.setLocation(39.26,115.25);
+
+### 设备平台判断
+#### API - isPlatformIOS
+API 用于区分 iOS, Android 平台，以便不同设置
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.prototype.isPlatformIOS()

 #####代码示例

 	if(window.plugins.jPushPlugin.isPlatformIOS()){
-		window.plugins.jPushPlugin.setLogOFF();
+		// iOS
+	}else{
+		// Android
 	}
-
--- a/document/iOS_handle_install.md
+++ b/document/iOS_handle_install.md
@@ -1,12 +1,12 @@
-### IOS手工安装
+### iOS手动安装

-下载jpush phonegap插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
+下载 JPush PhoneGap 插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`


-1. 用xcode打开iOS工程 将`$JPUSH_PLUGIN_DIR`/src/ios/Plugins/拖到project中  
-2. 将`$JPUSH_PLUGIN_DIR`/src/ios/lib/拖到project中  
+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)
+4. 添加以下框架，打开 xcode，点击 project，选择(Target -> Build Phases -> Link Binary With Libraries)

 		CFNetwork.framework
 		CoreFoundation.framework
@@ -17,11 +17,11 @@
 		UIKit.framework


-5. 在你的工程中创建一个新的Property List文件
+5. 在你的工程中创建一个新的 Property List 文件

-		并将其命名为PushConfig.plist，填入Portal为你的应用提供的APP_KEY等参数
+		并将其命名为 PushConfig.plist，填入 Portal 为你的应用提供的 APP_KEY 等参数

-10. 在AppDelegate.m中包含头文件
+10. 在 AppDelegate.m 中包含头文件

 		#import "APService.h"
 	    #import "JPushPlugin.h"
@@ -30,7 +30,7 @@

 		- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
 		   //原内容保持不变
-		   //Required add 
+		   //Required add
 		   [JPushPlugin setLaunchOptions:launchOptions];
 		    return YES;
 		}
@@ -47,7 +47,7 @@
                                                               object:userInfo];
 		}

-7. 修改phonegap config.xml文件用来包含Plugin/内的插件
+7. 修改 phonegap config.xml 文件用来包含 Plugin/ 内的插件


 		<feature name="JPushPlugin">
@@ -56,7 +56,7 @@
 		</feature>


-8. 复制`$JPUSH_PLUGIN_DIR`/www/PushNotification.js到工程的www目录下面  
+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
@@ -3,49 +3,47 @@

 <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"/>
+    <title>JPush Phonegap Simple Demo</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 () {
+        var onDeviceReady = function() {
            console.log("JPushPlugin:Device ready!");
            initiateUI();
        };

-        function getRegistrationID() {
-            window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
-        }
+        var getRegistrationID = function() {
+            window.plugins.jPushPlugin.getRegistrationID(onGetRegistrationID);
+        };

-        var onGetRegistradionID = function (data) {
+        var onGetRegistrationID = function(data) {
            try {
-
                console.log("JPushPlugin:registrationID is " + data);

                if (data.length == 0) {
                    var t1 = window.setTimeout(getRegistrationID, 1000);
                }
-                $("#registrationid").html(data);
-            }
-            catch (exception) {
+                $("#registrationId").html(data);
+            } catch (exception) {
                console.log(exception);
            }
        };

-        var onTagsWithAlias = function (event) {
+        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) {
+            } catch (exception) {
                console.log(exception)
            }
        };
-        var onOpenNotification = function (event) {
+
+        var onOpenNotification = function(event) {
            try {
                var alertContent;
                if (device.platform == "Android") {
@@ -53,14 +51,13 @@
                } else {
                    alertContent = event.aps.alert;
                }
-                alert("open Notificaiton:" + alertContent);
-
-            }
-            catch (exception) {
+                alert("open Notification:" + alertContent);
+            } catch (exception) {
                console.log("JPushPlugin:onOpenNotification" + exception);
            }
        };
-        var onReceiveNotification = function (event) {
+
+        var onReceiveNotification = function(event) {
            try {
                var alertContent;
                if (device.platform == "Android") {
@@ -69,156 +66,133 @@
                    alertContent = event.aps.alert;
                }
                $("#notificationResult").html(alertContent);
-
-            }
-            catch (exeption) {
+            } catch (exception) {
                console.log(exception)
            }
        };
-        var onReceiveMessage = function (event) {
-            try {

+        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) {
+            } catch (exception) {
                console.log("JPushPlugin:onReceiveMessage-->" + exception);
            }
        };

-        var initiateUI = function () {
-
+        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);
+                    window.plugins.jPushPlugin.setStatisticsOpen(true);
                }
-            }
-            catch (exception) {
+            } catch (exception) {
                console.log(exception);
            }
-            $("#setTagWithAliasButton").click(function (ev) {
-
-//                 window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data){
-//                     console.log(data);
-//                 });
-
+            $("#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 = [];
+                    var tags = [];

-                    if (tag1 == "" && tag2 == "" && tag3 == "") {
+                    if (tag1 != "") {
+                        tags.push(tag1);
                    }
-                    else {
-                        if (tag1 != "") {
-                            dd.push(tag1);
-                        }
-                        if (tag2 != "") {
-                            dd.push(tag2);
-                        }
-                        if (tag3 != "") {
-                            dd.push(tag3);
-                        }
+                    if (tag2 != "") {
+                        tags.push(tag2);
                    }
-                    window.plugins.jPushPlugin.setTagsWithAlias(dd, alias);
-
-                }
-                catch (exception) {
+                    if (tag3 != "") {
+                        tags.push(tag3);
+                    }
+                    window.plugins.jPushPlugin.setTagsWithAlias(tags, alias);
+                } 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 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>
                </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>
-
-
-            </div>
-        </form>
+            </form>
+        </div>
    </div>
-
-</div>
 </body>
+
 </html>
-
-
--- a/package.json
+++ b/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "jpush-phonegap-plugin",
+  "version": "2.1.1",
+  "description": "JPush for cordova plugin",
+  "cordova": {
+    "id": "cn.jpush.phonegap.JPushPlugin",
+    "platforms": [
+      "ios",
+      "android"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jpush/jpush-phonegap-plugin.git"
+  },
+  "keywords": [
+    "JPush",
+    "push",
+    "ecosystem:cordova",
+    "cordova-ios",
+    "cordova-android"
+  ],
+  "engines": [
+    {
+      "name": "cordova",
+      "version": ">=3.0"
+    }
+  ],
+  "author": "jpush",
+  "license": "Apache 2.0 License",
+  "bugs": {
+    "url": "https://github.com/jpush/jpush-phonegap-plugin/issues"
+  },
+  "homepage": "https://github.com/jpush/jpush-phonegap-plugin#readme"
+}
--- a/plugin.xml
+++ b/plugin.xml
@@ -29,7 +29,7 @@

            <header-file src="src/ios/Plugins/JPushPlugin.h"/>
            <source-file src="src/ios/Plugins/JPushPlugin.m"/>
-           
+
            <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"/>
@@ -49,14 +49,14 @@
                <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">
                <param name="android-package" value="cn.jpush.phonegap.JPushPlugin"/>
@@ -163,11 +163,13 @@
            <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
            <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY"/>
        </config-file>
-        <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/jpush-android-2.1.3.jar" target-dir="libs"/>
+        <source-file src="src/android/armeabi/libjpush213.so" target-dir="libs/armeabi"/>
+        <source-file src="src/android/armeabi-v7a/libjpush213.so" target-dir="libs/armeabi-v7a"/>
+        <source-file src="src/android/arm64-v8a/libjpush213.so" target-dir="libs/arm64-v8a"/>
+        <source-file src="src/android/x86/libjpush213.so" target-dir="libs/x86"/>
+        <source-file src="src/android/x86_64/libjpush213.so" target-dir="libs/x86_64"/>
+
        <!--<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"/>
--- a/src/android/JPushPlugin.java
+++ b/src/android/JPushPlugin.java
--- a/src/android/MyReceiver.java
+++ b/src/android/MyReceiver.java
@@ -12,82 +12,88 @@ import android.content.Intent;
 import android.util.Log;

 public class MyReceiver extends BroadcastReceiver {
-	private static String TAG = "JPushPlugin";
-	@Override
-	public void onReceive(Context context, Intent intent) {
+    private static String TAG = "JPushPlugin";
+    private static final List<String> IGNORED_EXTRAS_KEYS =
+            Arrays.asList(
+                    "cn.jpush.android.TITLE",
+                    "cn.jpush.android.MESSAGE",
+                    "cn.jpush.android.APPKEY",
+                    "cn.jpush.android.NOTIFICATION_CONTENT_TITLE"
+            );

-        if (JPushInterface.ACTION_REGISTRATION_ID.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);
-        } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(intent.getAction())) {
-        
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(action)) {
+            handlingMessageReceive(intent);
+        } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(action)) {
+            handlingNotificationReceive(context, intent);
+        } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(action)) {
+            handlingNotificationOpen(context, intent);
        } else {
-        	Log.d(TAG, "Unhandled intent - " + intent.getAction());
+            Log.d(TAG, "Unhandled intent - " + action);
        }
-	
-	}
-	private void handlingReceivedMessage(Intent intent) {
-		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);
+    private void handlingMessageReceive(Intent intent) {
+        String msg = intent.getStringExtra(JPushInterface.EXTRA_MESSAGE);
+        Map<String, Object> extras = getNotificationExtras(intent);
+        JPushPlugin.transmitMessageReceive(msg, extras);
+    }

-		 context.startActivity(launch);
-	 }
-	 private void handlingNotificationReceive(Context context,Intent intent){
+    private void handlingNotificationOpen(Context context, Intent intent) {
+        Log.i(TAG, "----------------  handlingNotificationOpen");

-		 Log.i(TAG, "----------------  handlingNotificationReceive");
+        String title = intent.getStringExtra(JPushInterface.EXTRA_NOTIFICATION_TITLE);
+        JPushPlugin.openNotificationTitle = title;
+
+        String alert = intent.getStringExtra(JPushInterface.EXTRA_ALERT);
+        JPushPlugin.openNotificationAlert = alert;
+
+        Map<String, Object> extras = getNotificationExtras(intent);
+        JPushPlugin.openNotificationExtras = extras;
+
+        JPushPlugin.transmitNotificationOpen(title, alert, extras);
+
+        Intent launch = context.getPackageManager().getLaunchIntentForPackage(
+            context.getPackageName());
+        launch.addCategory(Intent.CATEGORY_LAUNCHER);
+        launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        context.startActivity(launch);
+    }
+
+    private void handlingNotificationReceive(Context context, Intent intent) {
+        Log.i(TAG, "----------------  handlingNotificationReceive");
+
+        Intent launch = context.getPackageManager().getLaunchIntentForPackage(
+                context.getPackageName());
+        launch.addCategory(Intent.CATEGORY_LAUNCHER);
+        launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
+        String title = intent.getStringExtra(JPushInterface.EXTRA_NOTIFICATION_TITLE);
+        JPushPlugin.notificationTitle = title;
+
+        String alert = intent.getStringExtra(JPushInterface.EXTRA_ALERT);
+        JPushPlugin.notificationAlert = alert;
+
+        Map<String, Object> extras = getNotificationExtras(intent);
+        JPushPlugin.notificationExtras = extras;
+
+        JPushPlugin.transmitNotificationReceive(title, alert, extras);
+    }
+
+    private Map<String, Object> getNotificationExtras(Intent intent) {
+        Map<String, Object> extrasMap = new HashMap<String, Object>();
+        for (String key : intent.getExtras().keySet()) {
+            if (!IGNORED_EXTRAS_KEYS.contains(key)) {
+                if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
+                    extrasMap.put(key, intent.getIntExtra(key, 0));
+                } else {
+                    extrasMap.put(key, intent.getStringExtra(key));
+                }
+            }
+        }
+        return extrasMap;
+    }

-		 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.notificationAlert = alert;
-		 JPushPlugin.notificationExtras = extras;
-		 
-		 JPushPlugin.transmitReceive(alert, extras);
-	 }
-	 private Map<String, Object> getNotificationExtras(Intent intent) {
-		 Map<String, Object> extrasMap = new HashMap<String, Object>();
-		 
-		 for (String key : intent.getExtras().keySet()) {
-			 if (!IGNORED_EXTRAS_KEYS.contains(key)) {
-			    Log.e("key","key:"+key);
-		     	if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)){
-		     		extrasMap.put(key, intent.getIntExtra(key,0));
-		     	}else{
-		     		extrasMap.put(key, intent.getStringExtra(key));
-		        }
-			 }
-		 }
-		 return extrasMap;
-	 }
-	 private static final List<String> IGNORED_EXTRAS_KEYS = 
-			 Arrays.asList("cn.jpush.android.TITLE","cn.jpush.android.MESSAGE","cn.jpush.android.APPKEY","cn.jpush.android.NOTIFICATION_CONTENT_TITLE");
 }
--- a/src/android/arm64-v8a/libjpush206.so
+++ b/src/android/arm64-v8a/libjpush206.so
--- a/src/android/arm64-v8a/libjpush213.so
+++ b/src/android/arm64-v8a/libjpush213.so
--- a/src/android/armeabi-v7a/libjpush206.so
+++ b/src/android/armeabi-v7a/libjpush206.so
--- a/src/android/armeabi-v7a/libjpush213.so
+++ b/src/android/armeabi-v7a/libjpush213.so
--- a/src/android/armeabi/libjpush206.so
+++ b/src/android/armeabi/libjpush206.so
--- a/src/android/armeabi/libjpush213.so
+++ b/src/android/armeabi/libjpush213.so
--- a/src/android/jpush-android-2.0.6.jar
+++ b/src/android/jpush-android-2.0.6.jar
--- a/src/android/jpush-android-2.1.3.jar
+++ b/src/android/jpush-android-2.1.3.jar
--- a/src/android/x86/libjpush213.so
+++ b/src/android/x86/libjpush213.so
--- a/src/android/x86_64/libjpush213.so
+++ b/src/android/x86_64/libjpush213.so
--- a/src/ios/Plugins/AppDelegate+JPush.h
+++ b/src/ios/Plugins/AppDelegate+JPush.h
@@ -10,6 +10,4 @@

@interface AppDelegate (JPush)

-//@property(nonatomic,strong)NSDictionary *luanchOption;
-
@end
--- a/src/ios/Plugins/AppDelegate+JPush.m
+++ b/src/ios/Plugins/AppDelegate+JPush.m
@@ -7,87 +7,50 @@
 //

 #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);
+-(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
+    [JPushPlugin setLaunchOptions:launchOptions];
+
+    //cordova didFinishLaunchingWithOptions
+    CGRect screenBounds = [[UIScreen mainScreen] bounds];
+    self.window = [[UIWindow alloc] initWithFrame:screenBounds];
+    self.viewController = [[CDVViewController alloc] init];
+    self.window.rootViewController = self.viewController;
+    self.window.autoresizesSubviews = YES;
+    [self.window makeKeyAndVisible];
+    return YES;
 }

-(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];
+    [[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];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
    completionHandler(UIBackgroundFetchResultNewData);
-
 }

- (void)application:(UIApplication *)application
-  didReceiveLocalNotification:(UILocalNotification *)notification {
-  [JPUSHService showLocalNotificationAtFront:notification identifierKey:nil];
+- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
+    [JPUSHService showLocalNotificationAtFront:notification identifierKey:nil];
 }

-
 - (void)applicationWillEnterForeground:(UIApplication *)application {
-//  [application setApplicationIconBadgeNumber:0];
-//  [application cancelAllLocalNotifications];
+    //  [application setApplicationIconBadgeNumber:0];
+    //  [application cancelAllLocalNotifications];
 }

-
 - (void)applicationDidEnterBackground:(UIApplication *)application {
-//  [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
+    //  [[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
@@ -11,28 +11,59 @@
 #define kJPushPluginReceiveNotification @"JPushPluginReceiveNofication"

@interface JPushPlugin : CDVPlugin{
-  
+
 }

 +(void)setLaunchOptions:(NSDictionary *)theLaunchOptions;
+
+//以下为js中可调用接口
+//设置标签、别名
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command;
 -(void)setTags:(CDVInvokedUrlCommand*)command;
 -(void)setAlias:(CDVInvokedUrlCommand*)command;
+
+//获取 RegistrationID
 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command;
+
+//页面统计
 -(void)startLogPageView:(CDVInvokedUrlCommand*)command;
 -(void)stopLogPageView:(CDVInvokedUrlCommand*)command;
+-(void)beginLogPageView:(CDVInvokedUrlCommand*)command;

-// 设置角标到服务器, 服务器下一次发消息时，会设置成这个值
+//设置角标到服务器,服务器下一次发消息时,会设置成这个值
 //本接口不会改变应用本地的角标值.
 -(void)setBadge:(CDVInvokedUrlCommand*)command;
 //相当于 [setBadge:0]
 -(void)resetBadge:(CDVInvokedUrlCommand*)command;

-
-//改变应用本地的角标值.
+//应用本地的角标值设置/获取
 -(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command;
-//获取应用本地的角标值.
 -(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command;

+//停止与恢复推送
+-(void)stopPush:(CDVInvokedUrlCommand*)command;
+-(void)resumePush:(CDVInvokedUrlCommand*)command;
+-(void)isPushStopped:(CDVInvokedUrlCommand*)command;
+
+//开关日志
+-(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command;
+-(void)setLogOFF:(CDVInvokedUrlCommand*)command;
+-(void)crashLogON:(CDVInvokedUrlCommand*)command;
+
+//本地推送
+-(void)setLocalNotification:(CDVInvokedUrlCommand*)command;
+-(void)deleteLocalNotificationWithIdentifierKey:(CDVInvokedUrlCommand*)command;
+-(void)clearAllLocalNotifications:(CDVInvokedUrlCommand*)command;
+
+//地理位置上报 [latitude,longitude]
+-(void)setLocation:(CDVInvokedUrlCommand*)command;
+
+/*
+ *  以下为js中可监听到的事件
+ *  jpush.openNotification      点击推送消息唤醒或启动app
+ *  jpush.setTagsWithAlias      设置标签、别名完成
+ *  jpush.receiveMessage        收到自定义消息
+ *  jpush.receiveNotification   前台收到推送消息
+ */

@end
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -10,452 +10,375 @@
 #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;
+static NSString *const JPushConfigFileName = @"PushConfig";
+static NSDictionary *_luanchOptions = nil;

@implementation JPushPlugin

-
-+(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] ];
-  
-}
-
-
+#pragma mark- 外部接口
 -(void)stopPush:(CDVInvokedUrlCommand*)command{
-  
-  [[UIApplication sharedApplication]unregisterForRemoteNotifications];
+    [[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
-  
+    [JPushPlugin registerForRemoteNotification];
 }

+(void)registerForRemoteNotification{
+    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];
+    }
+}

 -(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];
-  }
+    NSNumber *result;
+    if ([[UIApplication sharedApplication] isRegisteredForRemoteNotifications]) {
+        result = @(0);
+    }else{
+        result = @(1);
+    }
+    [self hanleResultWithValue:result command:command];
 }

-
 -(void)initial:(CDVInvokedUrlCommand*)command{
-  //do nithng,because Cordova plugin use lazy load mode.
+    //do nithng,because Cordova plugin use lazy load mode.
 }


-
 #ifdef __CORDOVA_4_0_0

 - (void)pluginInitialize {
-  NSLog(@"### pluginInitialize ");
-  [self initNotifications];
+    NSLog(@"### pluginInitialize ");
+    [self initNotifications];
 }

 #else

 - (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
-  NSLog(@"### initWithWebView ");
-  if (self=[super initWithWebView:theWebView]) {
-    [self initNotifications];
-    
-  }
-  return self;
+    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]];
-        });
-        
-      }
+    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) {
-    
-    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];
+    NSArray  *arguments = command.arguments;
+    NSString *alias;
+    NSArray  *tags;
+    if (!arguments || [arguments count] < 2) {
+        NSLog(@"#### setTagsWithAlias param is less");
+        return ;
+    }else{
+        alias = arguments[0];
+        tags  = arguments[1];
+    }
+
+    NSLog(@"#### setTagsWithAlias alias is %@, tags is %@",alias,tags);
+
+    [JPUSHService setTags:[NSSet setWithArray:tags]
+                    alias:alias
+         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];
-  
+    NSArray *tags = command.arguments;
+
+    NSLog(@"#### setTags %@",tags);
+
+    [JPUSHService setTags:[NSSet setWithArray:tags]
+         callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                   object:self];
+
 }

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

-
-
 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
-  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];
-  }
+    NSString* registrationID = [JPUSHService registrationID];
+    NSLog(@"### getRegistrationID %@",registrationID);
+    [self hanleResultWithValue:registrationID command:command];
 }

-
-
-
-(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]];
-  });
-  
-}
-
-
 -(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) {
-    [JPUSHService startLogPageView:pageName];
-  }
+    NSArray *arguments = command.arguments;
+    if (!arguments || [arguments count] < 1) {
+        NSLog(@"startLogPageView argument  error");
+        return ;
+    }
+    NSString * pageName = arguments[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) {
-    [JPUSHService stopLogPageView:pageName];
-  }
-  
+    NSArray *arguments = command.arguments;
+    if (!arguments || [arguments count] < 1) {
+        NSLog(@"stopLogPageView argument  error");
+        return ;
+    }
+    NSString * pageName = arguments[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) {
-    [JPUSHService beginLogPageView:pageName duration:duration];
-  }
-  
+    NSArray *arguments = command.arguments;
+    if (!arguments || [arguments count] < 2) {
+        NSLog(@"beginLogPageView argument  error");
+        return ;
+    }
+    NSString * pageName = arguments[0];
+    int duration = [arguments[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];
-  [JPUSHService setBadge:[badge intValue]];
+    NSArray *argument = command.arguments;
+    if ([argument count] < 1) {
+        NSLog(@"setBadge argument error!");
+        return;
+    }
+    NSNumber *badge = argument[0];
+    [JPUSHService setBadge:[badge intValue]];
 }

-
-
 -(void)resetBadge:(CDVInvokedUrlCommand*)command{
-  [JPUSHService resetBadge];
+    [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];
+    //
+    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];
+    NSInteger num = [UIApplication sharedApplication].applicationIconBadgeNumber;
+    NSNumber *number = [NSNumber numberWithInteger:num];
+    [self hanleResultWithValue:number command:command];
 }

-
-
 -(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command{
-  
-  [JPUSHService setDebugMode];
+    [JPUSHService setDebugMode];
 }

-
-
 -(void)setLogOFF:(CDVInvokedUrlCommand*)command{
-  
-  [JPUSHService setLogOFF];
+    [JPUSHService setLogOFF];
 }

-
-
- (void)failWithCallbackID:(NSString *)callbackID {
-  CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
-  [self.commandDelegate sendPluginResult:result callbackId:callbackID];
+-(void)crashLogON:(CDVInvokedUrlCommand*)command{
+    [JPUSHService crashLogON];
 }

-
-
- (void)succeedWithPluginResult:(CDVPluginResult *)result withCallbackID:(NSString *)callbackID {
-  [self.commandDelegate sendPluginResult:result callbackId:callbackID];
+-(void)setLocalNotification:(CDVInvokedUrlCommand*)command{
+    NSArray      *arguments = command.arguments;
+    NSDate       *date      = arguments[0] == [NSNull null] ? nil : [NSDate dateWithTimeIntervalSinceNow:[((NSString*)arguments[0]) intValue]];
+    NSString     *alertBody = arguments[1] == [NSNull null] ? nil : (NSString*)arguments[1];
+    int           badge     = arguments[2] == [NSNull null] ? 0   : [(NSString*)arguments[2] intValue];
+    NSString     *idKey     = arguments[3] == [NSNull null] ? nil : (NSString*)arguments[3];
+    NSDictionary *dict      = arguments[4] == [NSNull null] ? nil : (NSDictionary*)arguments[4];
+    [JPUSHService setLocalNotification:date alertBody:alertBody badge:badge alertAction:nil identifierKey:idKey userInfo:dict soundName:nil];
 }

+-(void)deleteLocalNotificationWithIdentifierKey:(CDVInvokedUrlCommand*)command{
+    [JPUSHService deleteLocalNotificationWithIdentifierKey:(NSString*)command.arguments[0]];
+}

+-(void)clearAllLocalNotifications:(CDVInvokedUrlCommand*)command{
+    [JPUSHService clearAllLocalNotifications];
+}

+-(void)setLocation:(CDVInvokedUrlCommand*)command{
+    [JPUSHService setLatitude:[((NSString*)command.arguments[0]) doubleValue] longitude:[((NSString*)command.arguments[1]) doubleValue]];
+}

- (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]];
+#pragma mark- 内部方法
+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{
+    _luanchOptions = theLaunchOptions;
+
+    [JPUSHService setDebugMode];
+
+    [JPushPlugin registerForRemoteNotification];
+
+    //read appkey and channel from PushConfig.plist
+    NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfigFileName ofType:@"plist"];
+    if (plistPath == nil) {
+        NSLog(@"error: PushConfig.plist not found");
+        assert(0);
    }
-  } 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;
+
+    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 PushConfig.plist ");
+        assert(0);
+    }
+
+    [JPUSHService setupWithOption:_luanchOptions appKey:appkey
+                          channel:channel apsForProduction:[isProduction boolValue] ];
 }

+#pragma mark 将参数返回给js
+-(void)hanleResultWithValue:(id)value command:(CDVInvokedUrlCommand*)command{
+    CDVPluginResult *result = nil;
+    CDVCommandStatus status = CDVCommandStatus_OK;
+
+    if ([value isKindOfClass:[NSString class]]) {
+        value = [value stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    } else if ([value isKindOfClass:[NSNull class]]) {
+        value = nil;
+    }
+
+    if ([value isKindOfClass:[NSObject class]]) {
+        result = [CDVPluginResult resultWithStatus:status messageAsString:value];//NSObject 类型都可以
+    } else {
+        NSLog(@"Cordova callback block returned unrecognized type: %@", NSStringFromClass([value class]));
+        result = nil;
+    }
+
+    if (!result) {
+        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
+    }
+    [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+}
+
+#pragma mark 设置标签及别名回调
+-(void)tagsWithAliasCallback:(int)resultCode tags:(NSSet *)tags alias:(NSString *)alias{
+
+    NSDictionary *dict = @{@"resultCode":[NSNumber numberWithInt:resultCode],
+                           @"tags"      :tags  == nil ? [NSNull null] : [tags allObjects],
+                           @"alias"     :alias == nil ? [NSNull null] : 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]];
+    });
+
+}


 - (void)networkDidReceiveMessage:(NSNotification *)notification {
-  
-  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(), ^{
-    
-    [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveMessage',%@)",jsonString]];
-    
-    [self.commandDelegate evalJs:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",jsonString]];
-    
-    
-  });
-  
+    if (notification) {
+        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(), ^{
+
+            [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveMessage',%@)",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]];
-      });
+
+    NSError  *error;
+    NSDictionary *userInfo = [notification object];
+
+    NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
+    NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+    NSLog(@"%ld",(long)[UIApplication sharedApplication].applicationState);
+    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;
    }
-      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/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -5,334 +5,351 @@ var JPushPlugin = function(){

 //private plugin function

-JPushPlugin.prototype.receiveMessage={}
-JPushPlugin.prototype.openNotification={}
-JPushPlugin.prototype.receiveNotification={}
+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"
+JPushPlugin.prototype.isPlatformIOS = function() {
+	var isPlatformIOS = device.platform == "iPhone"
+		|| device.platform == "iPad"
+		|| device.platform == "iPod touch"
+		|| device.platform == "iOS";
+	return isPlatformIOS;
 }

-JPushPlugin.prototype.error_callback = function(msg){
-	console.log("Javascript Callback Error: " + msg)
+JPushPlugin.prototype.error_callback = function(msg) {
+	console.log("Javascript Callback Error: " + msg);
 }

-JPushPlugin.prototype.call_native = function(name, args, callback){ 
-
-	ret = cordova.exec(callback,this.error_callback,'JPushPlugin',name,args);
+JPushPlugin.prototype.call_native = function(name, args, callback) {
+	ret = cordova.exec(callback, this.error_callback, 'JPushPlugin', name, args);
 	return ret;
 }
-//public plugin function

-JPushPlugin.prototype.startLogPageView = function(pageName){  
-    if(this.isPlatformIOS()){
-		this.call_native( "startLogPageView",[pageName],null); 
-    }      
-}
-
-JPushPlugin.prototype.stopLogPageView = function(pageName){
-    if(this.isPlatformIOS()){
-		this.call_native( "stopLogPageView",[pageName],null);   
+// public methods
+JPushPlugin.prototype.init = function() {
+	if(this.isPlatformIOS()) {
+		var data = [];
+		this.call_native("initial", data, null);
+	} else {
+		data = [];
+		this.call_native("init", data, null);
 	}
 }

-JPushPlugin.prototype.beginLogPageView = function(pageName,duration){
-    if(this.isPlatformIOS()){
-		this.call_native( "beginLogPageView",[pageName,duration],null);   
+JPushPlugin.prototype.getRegistrationID = function(callback) {
+	try {
+	  	var data = [];
+		this.call_native("getRegistrationID", [data], callback);
+	} catch(exception) {
+		console.log(exception);
 	}
 }
-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{
-    	if(tags==null){
-    		this.setAlias(alias);
-        	return;
-    	}
-    	if(alias==null){
-    		this.setTags(tags);
+JPushPlugin.prototype.stopPush = function() {
+	data = [];
+	this.call_native("stopPush", data, null);
+}
+
+JPushPlugin.prototype.resumePush = function() {
+	data = [];
+	this.call_native("resumePush", data, null);
+}
+
+JPushPlugin.prototype.isPushStopped = function(callback) {
+	data = [];
+	this.call_native("isPushStopped", data, callback);
+}
+
+// iOS methods
+JPushPlugin.prototype.setTagsWithAlias = function(tags, alias) {
+	try {
+  		if(tags == null) {
+  			this.setAlias(alias);
+      		return;
+  		}
+  		if(alias == null) {
+  			this.setTags(tags);
 			return;
 		}
-		var arrayTagWithAlias=[tags];
+		var arrayTagWithAlias = [tags];
 		arrayTagWithAlias.unshift(alias);
-		this.call_native( "setTagsWithAlias", arrayTagWithAlias,null);
-	}
-	catch(exception){
+		this.call_native("setTagsWithAlias", arrayTagWithAlias, null);
+	} catch(exception) {
    	console.log(exception);
 	}
-
 }
-JPushPlugin.prototype.setTags = function(tags){
-        
-	try{
-		this.call_native("setTags",tags,null);
-	}
-	catch(exception){
+
+JPushPlugin.prototype.setTags = function(tags) {
+	try {
+		this.call_native("setTags", tags, null);
+	} catch(exception) {
 		console.log(exception);
 	}
 }

-JPushPlugin.prototype.setAlias = function(alias){
-	try{             
-		this.call_native("setAlias",[alias],null);
-	}
-	catch(exception){             
-		console.log(exception);
-	}
-}
-JPushPlugin.prototype.getRegistrationID = function(callback){
-        
-	try{
-	    var data=[];
-		this.call_native("getRegistrationID",[data],callback);
-	}
-	catch(exception){
+JPushPlugin.prototype.setAlias = function(alias) {
+	try {
+		this.call_native("setAlias", [alias], null);
+	} catch(exception) {
 		console.log(exception);
 	}
 }

-JPushPlugin.prototype.setBadge = function(value){
-               
-   if(this.isPlatformIOS()){     
-       try{
-       this.call_native("setBadge",[value],null);
-       }
-       catch(exception){
-       console.log(exception);
-       }
-
-   }
+JPushPlugin.prototype.setBadge = function(value) {
+	if(this.isPlatformIOS()) {
+		try {
+			this.call_native("setBadge", [value], null);
+		} catch(exception) {
+			console.log(exception);
+		}
+	}
 }
-JPushPlugin.prototype.resetBadge = function(){
-               
-    if(this.isPlatformIOS()){
-       try{
-           var data=[];
-           this.call_native("resetBadge",[data],null);
-       }
-       catch(exception){
-           console.log(exception);
-       }
+
+JPushPlugin.prototype.resetBadge = function() {
+	if(this.isPlatformIOS()) {
+		try {
+			var data = [];
+			this.call_native("resetBadge", [data], null);
+		} catch(exception) {
+			console.log(exception);
+		}
+	}
+}
+
+JPushPlugin.prototype.setDebugModeFromIos = function() {
+	if(this.isPlatformIOS()) {
+		var data = [];
+    	this.call_native("setDebugModeFromIos", [data], null);
+	}
+}
+
+JPushPlugin.prototype.setLogOFF = function() {
+	if(this.isPlatformIOS()) {
+  		var data = [];
+    	this.call_native("setLogOFF", [data], null);
+	}
+}
+
+JPushPlugin.prototype.setCrashLogON = function() {
+    if (this.isPlatformIOS()) {
+        var data = [];
+        this.call_native("crashLogON", [data], null);
    }
 }
-JPushPlugin.prototype.setDebugModeFromIos = function(){
-	if(this.isPlatformIOS()){
-		   var data=[];
-           this.call_native("setDebugModeFromIos",[data],null);
-	}

+JPushPlugin.prototype.addLocalNotificationForIOS = function(delayTime, content,
+	badge, notificationID, extras) {
+    if (this.isPlatformIOS()) {
+        var data = [delayTime, content, badge, notificationID, extras];
+        this.call_native("setLocalNotification", data, null);
+    }
 }
-JPushPlugin.prototype.setLogOFF = function(){
-	if(this.isPlatformIOS()){
-        	var data=[];
-            this.call_native("setLogOFF",[data],null);
-	}
+
+JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function(
+	identifierKey) {
+    if (this.isPlatformIOS()) {
+        var data = [identifierKey];
+        this.call_native("deleteLocalNotificationWithIdentifierKey", data, null);
+    }
 }
-JPushPlugin.prototype.receiveMessageIniOSCallback = function(data){
-	try{
-		console.log("JPushPlugin:receiveMessageIniOSCallback--data:"+data);
+
+JPushPlugin.prototype.clearAllLocalNotifications = function(){
+    if (this.isPlatformIOS()) {
+        var data = [];
+        this.call_native("clearAllLocalNotifications", data, null);
+    }
+}
+
+JPushPlugin.prototype.setLocation = function(latitude, longitude){
+    if (this.isPlatformIOS()) {
+        var data = [latitude, longitude];
+        this.call_native("setLocation", data, null);
+    }
+}
+
+JPushPlugin.prototype.receiveMessageIniOSCallback = function(data) {
+	try {
+		console.log("JPushPlugin:receiveMessageIniOSCallback--data:" + data);
 		var bToObj = JSON.parse(data);
 		var content = bToObj.content;
-        console.log(content);
-	}
-	catch(exception){               
-		console.log("JPushPlugin:receiveMessageIniOSCallback"+exception);
+    	console.log(content);
+	} catch(exception) {
+		console.log("JPushPlugin:receiveMessageIniOSCallback" + exception);
 	}
 }
-JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data){
-	try{
+
+JPushPlugin.prototype.startLogPageView = function(pageName) {
+	if(this.isPlatformIOS()) {
+		this.call_native("startLogPageView", [pageName], null);
+  	}
+}
+
+JPushPlugin.prototype.stopLogPageView = function(pageName) {
+  	if(this.isPlatformIOS()) {
+		this.call_native("stopLogPageView", [pageName], null);
+	}
+}
+
+JPushPlugin.prototype.beginLogPageView = function(pageName, duration) {
+  	if(this.isPlatformIOS()) {
+		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);
+	}
+}
+
+// Android methods
+JPushPlugin.prototype.setDebugMode = function(mode) {
+	if(device.platform == "Android") {
+		this.call_native("setDebugMode", [mode], null);
+	}
+}
+
+JPushPlugin.prototype.setBasicPushNotificationBuilder = function() {
+	if(device.platform == "Android") {
+		data = [];
+		this.call_native("setBasicPushNotificationBuilder", data, null);
+	}
+}
+
+JPushPlugin.prototype.setCustomPushNotificationBuilder = function() {
+	if(device.platform == "Android") {
+		data = [];
+		this.call_native("setCustomPushNotificationBuilder", data, null);
+	}
+}
+
+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);
-		//var message  = bToObj.message;
-		//var extras  = bToObj.extras;
-
-		//console.log(message);
-		//console.log(extras['cn.jpush.android.MSG_ID']);
-		//console.log(extras['cn.jpush.android.CONTENT_TYPE']);
-		//console.log(extras['cn.jpush.android.EXTRA']);
-	}
-	catch(exception){               
-		console.log("JPushPlugin:pushCallback "+exception);
+		data = JSON.stringify(data);
+		var bToObj = JSON.parse(data);
+		this.receiveMessage = bToObj
+		cordova.fireDocumentEvent('jpush.receiveMessage', null);
+	} catch(exception) {
+		console.log("JPushPlugin:pushCallback " + exception);
 	}
 }

-//
-JPushPlugin.prototype.openNotificationInAndroidCallback = function(data){
-	try{
+JPushPlugin.prototype.openNotificationInAndroidCallback = function(data) {
+	try {
 		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){               
+		data = JSON.stringify(data);
+		var bToObj = JSON.parse(data);
+		this.openNotification = bToObj;
+		cordova.fireDocumentEvent('jpush.openNotification', null);
+	} catch(exception) {
 		console.log(exception);
 	}
 }
-JPushPlugin.prototype.receiveNotificationInAndroidCallback = function(data){
+
+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;
-		//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){               
+		data = JSON.stringify(data);
+		var bToObj = JSON.parse(data);
+		this.receiveNotification = bToObj;
+		cordova.fireDocumentEvent('jpush.receiveNotification', null);
+	} catch(exception) {
 		console.log(exception);
 	}
 }
-//android single

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

-JPushPlugin.prototype.setCustomPushNotificationBuilder = function(){
+JPushPlugin.prototype.clearNotificationById = function(notificationId) {
 	if(device.platform == "Android") {
-		data=[];
-		this.call_native("setCustomPushNotificationBuilder",data,null);
+		data = [];
+		this.call_native("clearNotificationById", [notificationId], null);
 	}
 }

-JPushPlugin.prototype.stopPush = function(){
-	data=[];
-	this.call_native("stopPush",data,null);
-}
-
-JPushPlugin.prototype.resumePush = function(){
-		data=[]
-		this.call_native("resumePush",data,null);
-	
-}
-JPushPlugin.prototype.setDebugMode = function(mode){
+JPushPlugin.prototype.setLatestNotificationNum = function(num) {
 	if(device.platform == "Android") {
-		this.call_native("setDebugMode",[mode],null);
+		this.call_native("setLatestNotificationNum", [num], null);
 	}
 }
-//setDebugMode
-JPushPlugin.prototype.clearAllNotification = function(){
+
+JPushPlugin.prototype.setDebugMode = function(mode) {
 	if(device.platform == "Android") {
-		data=[]
-		this.call_native("clearAllNotification",data,null);
+		this.call_native("setDebugMode", [mode], null);
 	}
 }

-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);
+JPushPlugin.prototype.addLocalNotification = function(builderId, content, title,
+	notificationID, broadcastTime, extras) {
+	if(device.platform == "Android") {
+		data = [builderId, content, title, notificationID, broadcastTime, extras];
+		this.call_native("addLocalNotification", data, null);
 	}
 }

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

-	    data=[];
-		this.call_native("isPushStopped",data,callback)
+JPushPlugin.prototype.clearLocalNotifications = function() {
+	if(device.platform == "Android") {
+		data = [];
+		this.call_native("clearLocalNotifications", data, null);
+	}
+}
+
+JPushPlugin.prototype.reportNotificationOpened = function(msgID) {
+	if(device.platform == "Android") {
+		this.call_native("reportNotificationOpened", [msgID], null);
+	}
+}
+
+/**
+ *是否开启统计分析功能，用于“用户使用时长”，“活跃用户”，“用户打开次数”的统计，并上报到服务器上，
+ *在 Portal 上展示给开发者。
+ */
+JPushPlugin.prototype.setStatisticsOpen = function(mode) {
+	if(device.platform == "Android") {
+		this.call_native("setStatisticsOpen", [mode], null);
+	}
+}
+
+/**
+* 用于在 Android 6.0 及以上系统，申请一些权限
+* 具体可看：http://docs.jpush.io/client/android_api/#android-60
+*/
+JPushPlugin.prototype.requestPermission = function() {
+	if(device.platform == "Android") {
+		this.call_native("requestPermission", [], null);
+	}
+}
+
+JPushPlugin.prototype.setSilenceTime = function() {
 	
 }

-JPushPlugin.prototype.init = function(){
-    if(this.isPlatformIOS()){
-       var data=[];
-       this.call_native("initial",data,null);
-    }else{
-       data=[];
-       this.call_native("init",data,null);
-
-    }
-	
-}
-
-JPushPlugin.prototype.setDebugMode = function(mode){
-	if(device.platform == "Android") {
-		this.call_native("setDebugMode",[mode],null);
-	}
-}
-JPushPlugin.prototype.addLocalNotification = function(builderId,content,title,notificaitonID,broadcastTime,extras){
-	if(device.platform == "Android") {
-		data=[builderId,content,title,notificaitonID,broadcastTime,extras];
-		this.call_native("addLocalNotification",data,null);
-	}
-}
-JPushPlugin.prototype.removeLocalNotification = function(notificationID){
-	if(device.platform == "Android") {
-		this.call_native("removeLocalNotification",[notificationID],null);
-	}
-}
-JPushPlugin.prototype.clearLocalNotifications = function(){
-	if(device.platform == "Android") {
-		data=[]
-		this.call_native("clearLocalNotifications",data,null);
-	}
-}
-
-JPushPlugin.prototype.reportNotificationOpened = function(msgID){
-	if(device.platform == "Android") {
-	
-		this.call_native("reportNotificationOpened",[msgID],null);
-	}
-}
-
-//iOS  single
-
-
-if(!window.plugins){
+if(!window.plugins) {
 	window.plugins = {};
 }

-if(!window.plugins.jPushPlugin){
+if(!window.plugins.jPushPlugin) {
 	window.plugins.jPushPlugin = new JPushPlugin();
-}  
-
-module.exports = new JPushPlugin(); 
-
-
+}

+module.exports = new JPushPlugin();
Author	SHA1	Message	Date
Hevin	c2bf4db67a	Merge branch 'dev'	2016-04-15 17:08:19 +08:00
Hevin	2783be37af	fix bug 解决当应用在后台时无法获取通知标题的 bug	2016-04-15 16:17:33 +08:00
Hevin	ffe2fee88d	Merge branch 'master' into dev	2016-04-12 14:50:27 +08:00
Hevin	5a1aa16e40	fix bug fix bug about add local notification.	2016-04-12 14:49:42 +08:00
Hevin	f75430fcc4	optimize code rename method	2016-04-12 11:23:44 +08:00
Hevin	b515caf1e4	optimize code & update doc rename some functions name. format doc & make some instructions more clearer.	2016-04-11 15:21:59 +08:00
Hevin	46b2a5ab1a	optimize code fix spelling mistake.	2016-04-11 10:01:55 +08:00
Hevin	3bccb896e2	Merge branch 'master' into dev	2016-04-09 18:06:46 +08:00
Hevin	dfb883e24c	update doc & add some new features 支持安卓直接获得通知标题；优化安卓获取附加字段的方法。	2016-04-09 18:06:11 +08:00
Hevin	1ff72e4df4	update android sdk to 2.1.3	2016-04-08 18:01:27 +08:00
Hevin	01a89fd293	Merge branch 'dev'	2016-04-08 10:32:30 +08:00
Hevin	a1cef0866c	update README.md support add plugin via cordova plugins	2016-04-08 10:18:34 +08:00
Hevin	24dea0821f	version 2.1.1 add package.json, upload plugin to cordova plugins	2016-04-08 09:43:00 +08:00
Hevin	20f1eb6e27	Merge branch 'master' into dev	2016-03-30 23:20:00 +08:00
Hevin	1bafafffc5	resolve conflict # Conflicts: # README.md	2016-03-30 23:08:38 +08:00
Hevin	cc31bc6b84	format .md	2016-03-30 22:12:49 +08:00
Javen Fang	76153bb524	Update README.md	2016-03-30 16:24:09 +08:00
Javen Fang	dc33bee0e5	Update README.md	2016-03-30 16:23:18 +08:00
Hevin	661b216359	Merge pull request #139 from jpush/dev	2016-03-30 10:52:17 +08:00
Hevin	e117f77a38	设置统计分析功能默认为关闭	2016-03-29 18:02:26 +08:00
Pikachu	8dba1a4c5e	Update JPushPlugin.m 1.修复 iOS8 以下不能注册推送的bug	2016-03-25 19:43:10 +08:00
Hevin	b9b77840ab	fix #80	2016-03-22 23:39:42 +08:00
Pikachu	7791f088b9	Update README.md 1.更新iOS api	2016-03-22 11:09:43 +08:00
E.B	c2babc3a39	iOS-优化代码 1.AppDelegate+JPush.m中不再使用runtime	2016-03-21 15:30:16 +08:00
E.B	a9f5fc45bd	Merge remote-tracking branch 'origin/dev' into dev	2016-03-21 15:28:23 +08:00
E.B	02a2d04441	Merge branch 'master' into dev	2016-03-21 15:28:11 +08:00
Hevin	d7fc0d2248	update arm64-v8a file update arm64-v8a/libjpush210.so	2016-03-16 11:59:04 +08:00
Pikachuode	9f921ea7b5	Update Common_detail_api.md 整理文档	2016-03-15 18:06:13 +08:00
Hevin	66729b7337	support android 6.0	2016-03-15 15:09:40 +08:00
Hevin	a3082d0475	fix #75	2016-03-15 11:06:14 +08:00
E.B	3868e0be35	iOS - 修复因cordova版本不同导致的bug 1.因低版本cordova中AppDelegate继承自NSObject导致找不到 super didFinishLaunchingWithOptions的问题。	2016-03-14 17:26:53 +08:00
Hevin	40c98f4f04	优化代码	2016-03-12 22:46:59 +08:00
Hevin	032b6f5d0c	添加之前缺少的导入代码	2016-03-12 16:50:51 +08:00
Hevin	b4c02a96d5	修复应用在后台不能触发事件监听函数的 Bug	2016-03-11 20:28:08 +08:00
E.B	381395acaf	Merge branch 'dev'	2016-03-11 13:21:32 +08:00
E.B	cf39b64bfc	iOS - update 1.更新api说明 2.代码处理null	2016-03-11 13:16:47 +08:00
Hevin	c74b8372c0	修改 android 的具体 api 文档	2016-03-11 11:19:42 +08:00
Pikachuode	41bb3f871e	Update iOS_detail_api.md 1.修正原先的小错误 2.添加新的接口：本地推送等。	2016-03-11 10:59:03 +08:00
Hevin	ff090d63f6	替换已废弃的方法	2016-03-10 13:44:24 +08:00
Hevin	c5c6b3da06	优化代码	2016-03-10 13:42:09 +08:00
E.B	6cee953edd	iOS-添加功能 1.add crash日志接口 2.add 本地通知相关接口 3.add 地理位置上报接口	2016-03-09 13:18:09 +08:00
E.B	afe2230ed9	iOS优化代码 1.优化、简化了 AppDelegate+JPush.m 和 JPushPlugin.m 中的代码。 2.整理了JPushPlugin.h中的方法与注释。	2016-03-08 16:46:12 +08:00
Hevin	5c5d7c7848	修改 Android 手动安装文档	2016-03-04 15:57:12 +08:00
Hevin	416e41cb00	修改导入包	2016-03-04 15:36:07 +08:00
Hevin	7d4b6acacd	添加控制统计分析功能的API 添加控制统计分析的api，并修改了相关文档和示例代码，开发者可通过 js 代码直接控制是否启用统计分析功能。	2016-03-04 15:20:45 +08:00
Hevin	dde913b922	Merge branch 'master' into dev	2016-03-04 13:49:13 +08:00