Merge branch 'dev'

update package.json
iOS - add API
2026-01-28 00:00:03 +08:00 · 2016-12-15 16:02:27 +08:00 · 2016-12-15 16:01:51 +08:00 · 2016-12-15 14:51:15 +08:00 · 2016-12-12 10:45:48 +08:00 · 2016-12-12 10:41:38 +08:00
54 changed files with 1954 additions and 1363 deletions
--- a/README.md
+++ b/README.md
@@ -2,93 +2,92 @@

 [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin)
 [![QQ Group](https://img.shields.io/badge/QQ%20Group-413602425-red.svg)]()
-[![release](https://img.shields.io/badge/release-2.2.1-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-3.0.1-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
 [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jpush-phonegap-plugin)
 [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)

 支持 iOS, Android 的 Cordova 推送插件。
 > 如需要 IM 功能的插件，可关注 [JMessage PhoneGap Plugin](https://github.com/jpush/jmessage-phonegap-plugin)。

-> QQ 交流群：413602425
+> 如需要短信验证码功能的插件，可关注 [JSMS Cordova Plugin](https://github.com/jpush/cordova-plugin-jsms)。

-## 集成步骤
-集成 JPush PhoneGap Plugin 有两种方法：
+> QQ 交流群：413602425。

-### 在线安装
- 通过 Cordova Plugins 安装，要求 PhoneGap/Cordova CLI 5.0+：
+## Install

-    	cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey
+- 通过 Cordova Plugins 安装，要求 Cordova CLI 5.0+：

- 直接通过 url 安装：
+  	    cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey
+
+- 或直接通过 url 安装：

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

-### 本地安装
-使用 git 命令将 JPush PhoneGap 插件下载的本地，目录标记为 $JPUSH_PLUGIN_DIR：
+- 或下载到本地安装：

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

-    cordova plugin add $JPUSH_PLUGIN_DIR  --variable API_KEY=your_jpush_appkey

- [Android 手动安装文档地址](/doc/Android_handle_install.md)。
+## Usage
+### API
+- [Common](/doc/Common_detail_api.md)
+- [iOS](/doc/iOS_API.md)
+- [Android](/doc/Android_detail_api.md)

- [iOS 手动安装文档地址](/doc/iOS_install.md)。
+### Demo
+插件项目中包含一个简单的 Demo。若想参考，可以在 */example* 文件夹内找到并拷贝以下文件:

-## Demo
-插件项目中包含一个简单的 Demo。若想参考，可以在 /example 文件夹内找到并拷贝以下文件:
-
-	src/example/index.html -> www/index.html
-	src/example/css/* -> www/css
-	src/example/js/* -> www/js
-
-## 关于 PhoneGap build 云服务
+	example/index.html -> www/index.html
+	example/css/* -> www/css
+	example/js/* -> www/js

+### 关于 PhoneGap build 云服务
 该项目基于 Cordova 实现，目前无法使用 PhoneGap build 云服务进行打包，建议使用本地环境进行打包。

-## API 说明
+## FAQ
+> 如果遇到了疑问，请优先参考 Demo 和 API 文档。若还无法解决，可访问[极光社区](http://community.jiguang.cn/)或 [Issues](https://github.com/jpush/jpush-phonegap-plugin/issues) 提问。

-插件的 API 在 JPushPlugin.js 文件中，该文件的具体位置如下：
 ### Android
-	[Project]/assets/www/plugins/cn.jpush.phonegap.JPushPlugin/www
+#### 在 Eclipse 中 import 工程之后出现：*Type CallbackContext cannot be resolved to a type*
+右键单击工程名 -> Build Path -> Config Build Path -> Projects -> 选中工程名称 -> CordovaLib -> 点击 add。
+
+#### 关闭 App 后收不到通知
+Android 的推送通过长连接的方式实现，只有在连接保持的情况下才能收到通知。而有的第三方 ROM 会限制一般应用服务的自启动，也就是
+在退出应用后，应用的所有服务均被杀死，且无法自启动，所以就会收不到通知。
+
+目前 JPush 是做了应用互相拉起机制的，也就是当用户打开其他集成了 JPush 的应用时，你的应用也能同时收到推送消息。
+
+如果你的应用希望随时都能收到推送，官方推荐是通过文案的方式引导用户在设置中允许你的应用能够自启动，常见机型的设置方法可以参考[这里](https://docs.jiguang.cn/jpush/client/Android/android_faq/#_2)。
+
+或者自己实现应用保活，网上有很多相关文章（不推荐）。
+
+> 为什么 QQ、微信之类的应用退出后还能够收到通知？因为这些大厂应用，手机厂商默认都会加入自启动白名单中，也不会在应用退出后杀死它们的相关服务。
+如果你多加留意，就会发现非大厂的应用如果你一段时间不用都是收不到推送的。

 ### iOS
-	[Project]/www/plugins/cn.jpush.phonegap.JPushPlugin/www
+#### PushConfig.plist 文件中的字段都是什么意思？
+- Appkey：应用标识。
+- Channel：渠道标识。
+- IsProduction：是否生产环境。
+- IsIDFA：是否使用 IDFA 启动 SDK。

-### 具体的 API 请参考：
+#### 刚集成完插件收不到推送怎么办？
+请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](https://docs.jiguang.cn/jpush/client/iOS/ios_cer_guide/)。

- [公共 API](/doc/Common_detail_api.md)。
+#### iOS 集成插件白屏、或无法启动插件、或打包报错无法找到需要引入的文件怎么办?
+按照以下步骤逐个尝试：

- [iOS API](/doc/iOS_API.md)。
+- 升级至 Xcode 8
+- 先删除插件、再重装插件
+- 先使用 `cordova platform add ios`，后使用 `cordova plugin add`

- [Android API](/doc/Android_detail_api.md)。
+## Support
+- QQ 群：413602425
+- [JPush 官网文档](https://docs.jiguang.cn/jpush/guideline/intro/)
+- [极光社区](http://community.jiguang.cn/)

+## Contribute
+Please contribute! [Look at the issues](https://github.com/jpush/jpush-phonegap-plugin/issues).

-## 常见问题
-
-若要使用 CLI 来编译项目，注意应使用 cordova compile 而不是 cordova build 命令，因为如果修改了插件安装时默认写入到 AndroidManifest.xml
-中的代码，cordova build 可能会导致对 AndroidManifest.xml 的修改。
-Cordova CLI 的具体用法可参考 [Cordova CLI 官方文档](https://cordova.apache.org/docs/en/latest/reference/cordova-cli/index.html)。
-
-### 1. Android
-
-Eclipse 中 import PhoneGap 工程之后出现：*Type CallbackContext cannot be resolved to a type*。
-
-解决方案：Eclipse 中右键单击工程名，Build Path -> Config Build Path -> Projects -> 选中工程名称 -> CordovaLib -> 点击 add。
-
-### 2. iOS
-
- 收不到推送：
-	请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)。
-
- 设置 PushConfig.plist：
-	- APP_KEY：应用标识。
-	- CHANNEL：渠道标识。
-	- IsProduction：是否生产环境。
-	- IsIDFA：是否使用 IDFA 启动 SDK。
-
-
-
-## 更多
- QQ 群：413602425。
- [JPush 官网文档](http://docs.jpush.io/)。
- 如有问题可访问[极光社区](http://community.jpush.cn/)。
+## License
+MIT © [JiGuang](/license)
--- a/doc/Android_detail_api.md
+++ b/doc/Android_detail_api.md
@@ -157,6 +157,19 @@

 	window.plugins.jPushPlugin.clearAllNotification()

+### API - clearNotificationById
+根据通知 Id 清除通知（包括本地通知）。
+
+#### 接口定义
+
+    window.plugins.jPushPlugin.clearNotificationById(notificationId)
+
+#### 参数说明
+- notificationId：int，通知的 id。
+
+#### 代码示例
+
+    window.plugins.jPushPlugin.clearNotificationById(1)

 ## 设置允许推送时间

@@ -201,7 +214,7 @@
 当用户需要定制默认的通知栏样式时，则可调用此方法。
 需要用户去自定义 ../JPushPlugin.java 中的同名方法代码，然后再在 js 端 调用该方法。

-具体用法可参考[官方文档](http://docs.jpush.io/client/android_tutorials/#_11)。
+具体用法可参考[官方文档](http://docs.jiguang.cn/jpush/client/Android/android_api/#api_6)。

 JPush SDK 提供了 2 个用于定制通知栏样式的构建类：

--- a/doc/Common_detail_api.md
+++ b/doc/Common_detail_api.md
@@ -17,11 +17,9 @@

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

-如果停止推送服务后，开发者 App 被重新安装，或者被清除数据，
-JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数据被清除掉了）。
+如果停止推送服务后，开发者 App 被重新安装，或者被清除数据，JPush SDK 会恢复正常的默认行为（因为保存在本地的状态数据被清除掉了）。

-本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，
-恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
+本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。

 #### 接口定义

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

 + iOS 平台:

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

 #### 接口定义

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

 + iOS 平台:

-	+ 重新去APNS注册。
+	+ 重新去 APNS 注册。

 #### 接口定义

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

 #### 接口定义

-	    window.plugins.jPushPlugin.isPushStopped(callback)
+    window.plugins.jPushPlugin.isPushStopped(callback)

 #### 参数说明

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

 #### 代码示例

-	window.plugins.jPushPlugin.resumePush(callback)
-	var onCallback = function(data) {
-		if(data > 0) {
+	window.plugins.jPushPlugin.isPushStopped(function (result) {
+	   if (result == 0) {
 		    // 开启
-		} else {
+		 } else {
 		    // 关闭
-		}
-	}
+		 }
+    })


 ## 获取 RegistrationID
@@ -117,14 +113,9 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 #### 代码示例

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

 ## 设置别名与标签

@@ -144,7 +135,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

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

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

 **标签 Tag**:

@@ -182,18 +173,13 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果:

-	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
-    var onTagsWithAlias = function(event) {
-    	try {
-        	console.log("onTagsWithAlias");    
-           	var result = "result code:" + event.resultCode + " ";
-           	result += "tags:" + event.tags + " ";
-           	result += "alias:" + event.alias + " ";
-           	$("#tagAliasResult").html(result);
-       	} catch(exception) {
-           console.log(exception);
-       	}
-   	}
+	document.addEventListener("jpush.setTagsWithAlias", function(event) {
+      console.log("onTagsWithAlias")
+      var result = "result code:" + event.resultCode + " "
+      result += "tags:" + event.tags + " "
+      result += "alias:" + event.alias + " "
+      $("#tagAliasResult").html(result)
+    }, false)

 #### 错误码定义

@@ -220,19 +206,16 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 - 在你需要接收通知的的 js 文件中加入:

-		document.addEventListener("jpush.openNotification", onOpenNotification, false);
+        document.addEventListener("jpush.openNotification", function (event) {
+	      var alertContent
+          if(device.platform == "Android") {
+            alertContent = event.alert
+          } else {
+            lertContent = event.aps.alert
+          }
+	    }, 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，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。

 + Android:

@@ -274,19 +257,18 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.o

 - 在你需要接收通知的的 js 文件中加入:

-		document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+		  document.addEventListener("jpush.receiveNotification", function (event) {
+		    var alertContent
+	        if(device.platform == "Android") {
+	          alertContent = event.alert
+	        } else {
+	          alertContent = event.aps.alert
+	        }
+	        alert("open Notificaiton:" + alertContent)
+		  }, false)
+	    

- onReceiveNotification 需要这样写：
-
-	    var alertContent;
-	    if(device.platform == "Android") {
-	        alertContent = window.plugins.jPushPlugin.receiveNotification.alert;
-	    } else {
-	        alertContent = event.aps.alert;
-	    }
-	    alert("open Notificaiton:" + alertContent);
-
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。

 + Android:

@@ -331,26 +313,16 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r

 - 在你需要接收通知的的 js 文件中加入:

-		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+	    document.addEventListener("jpush.receiveMessage", function (event) {
+	      var message
+          if(device.platform == "Android") {
+            message = event.message;
+          } else {
+            message = event.content;
+          }      
+	    }, false)

- onReceiveMessage 需要这样写：
-
-        var onReceiveMessage = function(event) {
-            try{
-                var message
-                if(device.platform == "Android") {
-              		 message = window.plugins.jPushPlugin.receiveMessage.message;
-                } else {
-                     message = event.content;
-                }          
-                 $("#messageResult").html(message);
-            } catch(exception) {
-                console.log("JPushPlugin:onReceiveMessage-->" + exception);
-            }
-        }
-
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveMessage，
-直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。

 + Android:

@@ -371,7 +343,6 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 			 "extras":{"key":"不填写没有"}
 		}

-
 ## 判断系统设置中是否允许当前应用推送
 ### API - getUserNotificationSettings
 判断系统设置中是否允许当前应用推送。
@@ -393,5 +364,4 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 			// 系统设置中已关闭应用推送。
 		} else if(result > 0) {
 			// 系统设置中打开了应用推送。
-		}
-	});
+		})
--- a/doc/iOS_API.md
+++ b/doc/iOS_API.md
@@ -1,25 +1,56 @@
 # iOS API

+- [延迟注册和启动推送通知服务](#延迟注册和启动推送通知服务)
 - [开始与停止推送服务](#开始与停止推送服务)
 - [获取 RegistrationID](#获取-registrationid)
 - [别名与标签](#别名与标签)
 - [获取 APNS 推送内容](#获取-apns-推送内容)
-	- [点击推送通知](#点击推送通知)
-	- [前台收到推送](#前台收到推送)
-	- [后台收到推送](#后台收到推送)
+  - [点击推送通知](#点击推送通知)
+  - [前台收到推送](#前台收到推送)
+  - [后台收到推送](#后台收到推送)
 - [获取自定义消息内容](#获取自定义消息内容)
 - [设置Badge](#设置badge)
 - [本地通知](#本地通知)
+- [获取本地通知内容](#获取本地通知内容)
 - [页面的统计](#页面的统计)
 - [日志等级设置](#日志等级设置)
 - [地理位置上报](#地理位置上报)
 - [设备平台判断](#设备平台判断)
+- [iOS 10 进阶推送特性](#ios-10-进阶推送特性)
+- [获取用户推送设置](#获取用户推送设置)
+- [监听事件统一说明](#监听事件统一说明)
+
+
+
+## 延迟注册和启动推送通知服务
+
+本插件默认在 App 启动完成之后，立即「注册苹果通知服务」+「启动 JPush SDK」，其中：
+
+- 「注册苹果通知服务」会弹出提示窗口向用户请求权限。
+- 「启动 JPush SDK」是使用 JPush 各项 API 的必要条件。
+
+开发者可以根据自己的需求，延迟注册和启动，需做以下操作：
+
+1. 查找并配置 `PushConfig.plist` 文件中的 `Delay` 字段为 `YES`，表明会延迟使用，此时插件不再自动注册、启动通知。
+2. 在需要注册并启动通知的地方调用 API - startJPushSDK。
+
+### API - startJPushSDK
+
+注册苹果通知服务，并启动 JPush SDK。
+
+#### 接口定义
+
+```
+window.plugins.jPushPlugin.startJPushSDK()
+```
+
+

 ## 开始与停止推送服务

 ### API - init

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

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

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

 #### 接口定义

-	window.plugins.jPushPlugin.init()
-
+```
+window.plugins.jPushPlugin.init()
+```

 ### API - stopPush

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

 #### 接口定义

-    window.plugins.jPushPlugin.stopPush()
-
+  window.plugins.jPushPlugin.stopPush()

 ### API - resumePush

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

 #### 接口定义

-	window.plugins.jPushPlugin.resumePush()
+```
+window.plugins.jPushPlugin.resumePush()
+```
+


 ### API - isPushStopped
@@ -61,23 +95,25 @@ iOS平台，检查推送服务是否停止。

 #### 接口定义

-	window.plugins.jPushPlugin.isPushStopped(callback)
-
+```
+window.plugins.jPushPlugin.isPushStopped(callback)
+```

 #### 参数说明

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

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

+```js
+window.plugins.jPushPlugin.isPushStopped(function(data) {
+	  if(data > 0) {
+	    // 已关闭
+	  } else {
+	    // 已开启
+	  }
+  })
+```

 ## 获取 RegistrationID

@@ -92,7 +128,9 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 #### 接口定义

-	JPushPlugin.prototype.getRegistrationID(callback)
+```js
+JPushPlugin.prototype.getRegistrationID(callback)
+```

 #### 返回值

@@ -100,14 +138,13 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 #### 调用示例

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

 ## 别名与标签

@@ -141,57 +178,57 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 #### 接口定义

-	JPushPlugin.prototype.setTagsWithAlias(tags, alias)
-	JPushPlugin.prototype.setTags(tags)
-	JPushPlugin.prototype.setAlias(alias)
+```
+JPushPlugin.prototype.setTagsWithAlias(tags, alias)
+JPushPlugin.prototype.setTags(tags)
+JPushPlugin.prototype.setAlias(alias)
+```

 #### 参数说明
-* tags:
-	* 参数类型为数组。
-	* nil 此次调用不设置此值。
-	* 空集合表示取消之前的设置。
-	* 每次调用至少设置一个 tag，覆盖之前的设置，不是新增。
-	* 有效的标签组成：字母（区分大小写）、数字、下划线、汉字。
-	* 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节（判断长度需采用UTF-8编码）。
-	* 单个设备最多支持设置 100 个 tag，App 全局 tag 数量无限制。
-* alias:
-	* 参数类型为字符串。
-	* nil 此次调用不设置此值。
-	* 空字符串 （""）表示取消之前的设置。
-	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
-	* 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。
+
+- tags:
+  - 参数类型为数组。
+  - nil 此次调用不设置此值。
+  - 空集合表示取消之前的设置。
+  - 每次调用至少设置一个 tag，覆盖之前的设置，不是新增。
+  - 有效的标签组成：字母（区分大小写）、数字、下划线、汉字。
+  - 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节（判断长度需采用UTF-8编码）。
+  - 单个设备最多支持设置 100 个 tag，App 全局 tag 数量无限制。
+- alias:
+  - 参数类型为字符串。
+  - nil 此次调用不设置此值。
+  - 空字符串 （""）表示取消之前的设置。
+  - 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
+  - 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。

 #### 返回值说明

 函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果。

-	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
-    var onTagsWithAlias = function(event) {
-        try {
-           console.log("onTagsWithAlias");    
-           var result = "result code:"+event.resultCode + " ";
-           result += "tags:" + event.tags + " ";
-           result += "alias:" + event.alias + " ";
-           $("#tagAliasResult").html(result);
-        } catch(exception) {
-           console.log(exception)
-        }
-   	}
+```js
+var onTagsWithAlias = function(event) {
+    console.log("onTagsWithAlias")
+    var result = "result code:"+event.resultCode + " "
+    result += "tags:" + event.tags + " "
+    result += "alias:" + event.alias + " "
+    $("#tagAliasResult").html(result)
+}
+document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false)
+```

 #### 错误码定义

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

 ## 获取 APNS 推送内容

@@ -205,28 +242,34 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 - 在你需要接收通知的的 js 文件中加入:

-		document.addEventListener("jpush.openNotification", onOpenNotification, false);
+  ```js
+  document.addEventListener("jpush.openNotification", onOpenNotification, false)
+  ```

 - onOpenNotification 需要这样写：

-		var onOpenNotification = function(event) {
-			var alertContent;
-			alertContent = event.aps.alert;
-			alert("open Notificaiton:" + alertContent);
-		}
+  ```js
+  var onOpenNotification = function(event) {
+  	var alertContent
+  	alertContent = event.aps.alert
+  	alert("open Notificaiton:" + alertContent)
+  }
+  ```

 - event 举例:

-		{
-			"aps":{
-				  "badge":1,
-				  "sound":"default",
-				  "alert":"今天去哪儿"
-			},
-			"key1":"value1",
-			"key2":"value2",
-			"_j_msgid":154604475
-		}
+  ```json
+  {
+  	"aps":{
+  		  "badge":1,
+  		  "sound":"default",
+  		  "alert":"今天去哪儿"
+  	},
+  	"key1":"value1",
+  	"key2":"value2",
+  	"_j_msgid":154604475
+  }
+  ```

 ### 前台收到推送

@@ -238,140 +281,150 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 - 在你需要接收通知的的 js 文件中加入:

-		document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+  ```js
+  document.addEventListener("jpush.receiveNotification", onReceiveNotification, false)
+  ```

 - onReceiveNotification 需要这样写：

-		var onReceiveNotification = function(event) {
-			var alertContent;
-			alertContent = event.aps.alert;
-			alert("open Notificaiton:" + alertContent);
-		}
+  ```js
+  var onReceiveNotification = function(event) {
+  	var alertContent
+  	alertContent = event.aps.alert
+  	alert("open Notificaiton:" + alertContent)
+  }
+  ```

 - event 举例

-		{
-			"aps":{
-				  "badge":1,
-				  "sound":"default",
-				  "alert":"今天去哪儿"
-			},
-			"key1":"value1",
-			"key2":"value2",
-			"_j_msgid":154604475
-		}
+  ```json
+  {
+  	"aps":{
+  		  "badge":1,
+  		  "sound":"default",
+  		  "alert":"今天去哪儿"
+  	},
+  	"key1":"value1",
+  	"key2":"value2",
+  	"_j_msgid":154604475
+  }
+  ```

 ### 后台收到推送

 #### event - jpush.backgroundNotification

-应用程序处于后台时收到推送会触发该事件，可以在后台执行一段代码。具体配置参考 [iOS 7 Background Remote Notification](http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification)
+应用程序处于后台时收到推送会触发该事件，可以在后台执行一段代码。具体配置参考 [iOS 7 Background Remote Notification](https://docs.jiguang.cn/jpush/client/iOS/ios_new_fetures/#ios-7-background-remote-notification)

 #### 代码示例

 - 在你需要接收通知的的 js 文件中加入:

-		document.addEventListener("jpush.backgroundNotification", onBackgroundNotification, false);
+  ```js
+  document.addEventListener("jpush.backgroundNotification", onBackgroundNotification, false)
+  ```

 - onBackgroundNotification 需要这样写：

-		var onBackgroundNotification = function(event) {
-			var alertContent;
-			alertContent = event.aps.alert;
-			alert("open Notificaiton:" + alertContent);
-		}
+  ```js
+  var onBackgroundNotification = function(event) {
+  	var alertContent
+  	alertContent = event.aps.alert
+  	alert("open Notificaiton:" + alertContent)
+  }
+  ```

-+ event 举例

-		{
-			"aps":{
-				  "badge":1,
-				  "sound":"default",
-				  "alert":"今天去哪儿"
-			},
-			"key1":"value1",
-			"key2":"value2",
-			"_j_msgid":154604475
-		}
+- event 举例

-#### API - receiveMessageIniOSCallback
+  ```json
+  {
+  	"aps":{
+  		  "badge":1,
+  		  "sound":"default",
+  		  "alert":"今天去哪儿"
+  	},
+  	"key1":"value1",
+  	"key2":"value2",
+  	"_j_msgid":154604475
+  }
+  ```

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

-##### 接口定义

-	JPushPlugin.prototype.receiveMessageIniOSCallback(data)
-
-##### 参数说明
-
- data: 是一个 js 字符串使用如下代码解析，js 具体 key 根据应用内消息来确定:
-
-	var bToObj = JSON.parse(data);


 ## 获取自定义消息内容

-
 ### event - jpush.receiveMessage

 收到应用内消息时触发这个事件, 推荐使用事件的方式传递，但同时保留了 receiveMessageIniOSCallback 的回调函数，兼容以前的代码。

-
 #### 代码示例

 - 在你需要接收通知的的 js 文件中加入:

-		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+  ```js
+  document.addEventListener("jpush.receiveMessage", onReceiveMessage, false)
+  ```

 - onReceiveMessage 需要这样写：

-		var onReceiveMessage = function(event) {
-			try{
-				var message;
-				message = event.content;      
-				$("#messageResult").html(message);
-			}catch(exception) {
-				console.log("JPushPlugin:onReceiveMessage-->" + exception);
-			}
-		}
-
+  ```js
+  var onReceiveMessage = function(event) {
+  	try {
+  		var message = event.content
+  		$("#messageResult").html(message)
+  	} catch(exception) {
+  		console.log("JPushPlugin:onReceiveMessage-->" + exception);
+  	}
+  }
+  ```

 - event 举例:

-		{
-			"content":"今天去哪儿",
-			"extras":
-			{
-				"key":"不填写没有"
-			}
-		}
+  ```json
+  {
+  	"content":"今天去哪儿",
+  	"extras":
+  	{
+  		"key":"不填写没有"
+  	}
+  }
+  ```

 ## 设置Badge
+
 ### API - setBadge, resetBadge

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

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

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

-resetBadge相当于setBadge(0)。
+resetBadge 相当于 setBadge(0)。

 #### 参数说明
+
 value 取值范围：[0,99999]。

 #### 返回值
+
 无，控制台会有 log 打印设置结果。

 #### 代码示例

-	window.plugins.jPushPlugin.setBadge(5);
-	window.plugins.jPushPlugin.reSetBadge();
+```js
+window.plugins.jPushPlugin.setBadge(5)
+window.plugins.jPushPlugin.reSetBadge()
+```

 ### API - setApplicationIconBadgeNumber

@@ -379,7 +432,9 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.setApplicationIconBadgeNumber(badge)
+```js
+window.plugins.jPushPlugin.prototype.setApplicationIconBadgeNumber(badge)
+```

 #### 参数说明

@@ -387,7 +442,9 @@ value 取值范围：[0,99999]。

 #### 代码示例

-	window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
+```
+window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0)
+```

 ### API - getApplicationIconBadgeNumber

@@ -395,7 +452,9 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.getApplicationIconBadgeNumber(callback)
+```
+window.plugins.jPushPlugin.prototype.getApplicationIconBadgeNumber(callback)
+```

 #### 参数说明

@@ -403,10 +462,11 @@ value 取值范围：[0,99999]。

 #### 代码示例

-	window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data) {
-	     console.log(data);               
-	});
-
+```js
+window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data) {
+  console.log(data)
+})
+```

 ## 本地通知

@@ -416,7 +476,9 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.addLocalNotificationForIOS(delayTime, content, badge, notificationID, extras)
+```js
+window.plugins.jPushPlugin.prototype.addLocalNotificationForIOS(delayTime, content, badge, notificationID, extras)
+```

 #### 参数说明

@@ -428,7 +490,9 @@ value 取值范围：[0,99999]。

 #### 代码示例

-	window.plugins.jPushPlugin.addLocalNotificationForIOS(6*60*60, "本地推送内容", 1, "notiId", {"key":"value"});
+```js
+window.plugins.jPushPlugin.addLocalNotificationForIOS(24*60*60, "本地推送内容", 1, "notiId", {"key":"value"});
+```

 ### API - deleteLocalNotificationWithIdentifierKeyInIOS

@@ -436,7 +500,9 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS(identifierKey)
+```js
+window.plugins.jPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS(identifierKey)
+```

 #### 参数说明

@@ -444,7 +510,9 @@ value 取值范围：[0,99999]。

 #### 代码示例

-        window.plugins.jPushPlugin.deleteLocalNotificationWithIdentifierKeyInIOS("identifier");
+```
+window.plugins.jPushPlugin.deleteLocalNotificationWithIdentifierKeyInIOS("identifier")
+```

 ### API - clearAllLocalNotifications

@@ -452,11 +520,36 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.clearAllLocalNotifications()
+```
+window.plugins.jPushPlugin.prototype.clearAllLocalNotifications()
+```

 #### 代码示例

-    window.plugins.jPushPlugin.clearAllLocalNotifications();
+```
+window.plugins.jPushPlugin.clearAllLocalNotifications()
+```
+
+
+
+## 获取本地通知内容
+
+### iOS 10 before 收到本地通知
+
+监听 `jpush.receiveLocalNotification` 事件获取，「App 在后台时点击通知横幅」或「App 在前台时收到」均会触发该事件。
+
+
+
+### iOS 10 收到本地通知
+
+监听 [jpush.receiveNotification](#前台收到推送)、[jpush.openNotification](点击推送通知)，获取推送内容后，通过获取到的 `__JPUSHNotificationKey` 字段（[本地通知](#本地通知) 设置的 `notificationID`）来判断是本地通知，并处理。
+
+
+
+### 点击本地通知横幅启动 App
+
+监听 `jpush.startLocalNotification` 事件。
+


 ## 页面的统计
@@ -468,9 +561,11 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.startLogPageView(pageName)
-	window.plugins.jPushPlugin.prototype.stopLogPageView(pageName)
-	window.plugins.jPushPlugin.prototype.beginLogPageView(pageName, duration)
+```
+window.plugins.jPushPlugin.prototype.startLogPageView(pageName)
+window.plugins.jPushPlugin.prototype.stopLogPageView(pageName)
+window.plugins.jPushPlugin.prototype.beginLogPageView(pageName, duration)
+```

 #### 参数说明

@@ -478,16 +573,18 @@ value 取值范围：[0,99999]。
 - duration: 自定义的页面时间

 #### 调用说明
+
 应在所有的需要统计得页面得 viewWillAppear 和 viewWillDisappear 加入 startLogPageView 和 stopLogPageView 来统计当前页面的停留时间。

 或者直接使用 beginLogPageView 来自定义加入页面和时间信息。

 #### 代码示例

-	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");
+```

 ## 日志等级设置

@@ -499,11 +596,15 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.setDebugModeFromIos()
+```
+window.plugins.jPushPlugin.prototype.setDebugModeFromIos()
+```

 #### 代码示例

-	window.plugins.jPushPlugin.setDebugModeFromIos();
+```
+window.plugins.jPushPlugin.setDebugModeFromIos();
+```

 ### API - setLogOFF

@@ -513,11 +614,15 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.setLogOFF()
+```
+window.plugins.jPushPlugin.prototype.setLogOFF()
+```

 #### 代码示例

-	window.plugins.jPushPlugin.setLogOFF();
+```
+window.plugins.jPushPlugin.setLogOFF();
+```

 ### API - setCrashLogON

@@ -527,11 +632,15 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.setCrashLogON()
+```
+window.plugins.jPushPlugin.prototype.setCrashLogON()
+```

 #### 代码示例

-	window.plugins.jPushPlugin.setCrashLogON();
+```
+window.plugins.jPushPlugin.setCrashLogON();
+```

 ## 地理位置上报

@@ -541,7 +650,9 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.setLocation(latitude, longitude)
+```
+window.plugins.jPushPlugin.prototype.setLocation(latitude, longitude)
+```

 #### 参数说明

@@ -550,7 +661,9 @@ value 取值范围：[0,99999]。

 #### 代码示例

-	window.plugins.jPushPlugin.setLocation(39.26,115.25);
+```
+window.plugins.jPushPlugin.setLocation(39.26,115.25);
+```

 ## 设备平台判断

@@ -560,12 +673,213 @@ value 取值范围：[0,99999]。

 #### 接口定义

-	window.plugins.jPushPlugin.prototype.isPlatformIOS()
+```
+window.plugins.jPushPlugin.prototype.isPlatformIOS()
+```

 #### 代码示例

-	if(window.plugins.jPushPlugin.isPlatformIOS()) {
-		// iOS
-	} else {
-		// Android
-	}
+```js
+if(window.plugins.jPushPlugin.isPlatformIOS()) {
+	// iOS
+} else {
+	// Android
+}
+```
+
+
+
+## iOS 10 进阶推送特性
+
+### API - addDismissActions
+
+添加通知操作，是展示在锁屏推送侧滑界面、通知中心推送侧滑界面、推送横幅下拉界面（iPhone 6s before）的按钮操作。
+
+一条推送最多只能展示 2 个操作（在锁屏推送侧滑界面、通知中心推送侧滑界面会额外自动展示一个「清除」操作），超出的操作不会被展示。
+
+建议在 App 初次启动时立刻调用本 API。
+
+效果如下图所示：
+
+ ![DismissActions_00](res/DismissActions_00.PNG)
+
+#### 接口定义
+
+```
+window.plugins.jPushPlugin.prototype.addDismissActions(actions, categoryId);
+```
+
+#### 参数说明
+
+- actions：包含最多 2 个字典的数组，多余的字典无效，所有字段均为字符串，字段如下：
+  - title：必填，标题。
+  - identifier：必填，标识，获取 APNS 推送内容的时候可以通过该字段判断点击的是推送条目还是某项操作。
+  - option：必填，取值如下：
+    - UNNotificationActionOptionNone = 0
+    - UNNotificationActionOptionAuthenticationRequired = (1 << 0), Whether this action should require unlocking before being performed.
+    - UNNotificationActionOptionDestructive = (1 << 1), Whether this action should be indicated as destructive.
+    - UNNotificationActionOptionForeground = (1 << 2), Whether this action should cause the application to launch in the foreground.
+  - type：可选，值为 "textInput" 时，会创建一个可快速回复的操作。
+  - textInputButtonTitle：可选，快捷回复的回复按键标题。
+  - textInputPlaceholder：可选，快捷回复输入框占位符。
+- categoryId：category id，用于标记这一组操作，推送时的 `payload` 添加 `category` 字段（在极光控制台 - 发送通知 - 可选设置 - category ），即可展示相应的这一组操作。例：id1 对应 [操作A，操作B]，id2 对应 [操作A, 操作C]。
+
+#### 代码示例
+
+```js
+window.plugins.jPushPlugin.addDismissActions([{"title":"t1", "identifier":"id1", "option":"0"}, {"title":"t2", "identifier":"id2", "option":"3", "type":"textInput", "textInputButtonTitle":"回复", "textInputPlaceholder":"点此输入回复内容"}], "categoryId_t1_t2");
+```
+
+### API - addNotificationActions
+
+轻触推送横幅，展示的更多操作。
+
+iPhone 6s 及以后设备且 iOS 9 以后系统支持 3d-touch。
+
+建议在 App 初次启动时立刻调用本 API。
+
+效果如下图所示：
+
+ ![NotificationActions_00](res/NotificationActions_00.png)
+
+#### 接口定义
+
+```
+window.plugins.jPushPlugin.prototype.addNotificationActions(actions, categoryId)
+```
+
+#### 参数说明
+
+参数同 API - addDismissActions
+
+#### 代码示例
+
+代码示例同 API - addDismissActions
+
+### Media Attachments
+
+（iOS 10）在手机锁屏界面和通知中心界面的推送条目、应用菜单界面的推送横幅上，展示图片、gif、audio、video 等富媒体。效果如下图所示：
+
+ ![MediaAttachments_00](res/MediaAttachments_00.gif)
+
+#### 配置方法
+
+1. 首先配置好 iOS 项目的证书。如下图所示没有任何异常警告：
+
+   ![](res/MediaAttachments_01.png)
+
+2. 打开 iOS Xcode Project - File - New - Target - iOS - Notification Service Extension - Next - Product Name 填写 `jpushNotificationService` - Finish，如下图所示： ![](res/MediaAttachments_02.png)
+
+   ![MediaAttachments_03](res/MediaAttachments_03.png)
+
+   ![MediaAttachments_04](res/MediaAttachments_04.png)
+
+3. 在 Xcode 工程目录左侧系统自动创建了 jpushNotificationService 文件夹及三个文件，下载本插件目录 `jpush-phonegap-plugin/src/ios/notificationService/` 下的 `NotificationService.h`、`NotificationService.m` 文件，全部复制替换对应文件内代码。
+
+4. 在 Xcode 中拖拽图片、gif、audio、video 等资源文件至 `jpushNotificationService` 文件夹目录下，弹出菜单选择如下： ![MediaAttachments_06](res/MediaAttachments_06.png)
+
+5. 在极光控制台 - 发送通知 - 可选设置 - mutable-content 打勾。
+
+6. 添加附加字段， key 为 `JPushPluginAttachment` ，value 为资源名称如 `aPic.png`，该资源必须在第 4 步中已经添加至工程，且文件名和拓展名完全对应。5、6 如下图所示：
+
+    ![MediaAttachments_05](res/MediaAttachments_05.png)
+
+   另，5、6 亦可通过服务端自定义的 payload 实现，如下所示：
+
+   ```json
+   {
+   	aps:{
+   		alert:{...},
+   		mutable-content:1 //必须
+   	}
+   	JPushPluginAttachment:aPic.png //必须
+   }
+   ```
+
+7. 立即发送。
+
+## 获取用户推送设置
+
+### API - getUserNotificationSettings
+
+获取用户对本 App 的推送设置情况。
+
+#### 接口定义
+
+```
+window.plugins.jPushPlugin.prototype.getUserNotificationSettings(callback)
+```
+
+#### 返回值
+
+- iOS 10 before
+  - UIRemoteNotificationTypeNone    = 0
+  - UIRemoteNotificationTypeBadge   = 1 << 0
+  - UIRemoteNotificationTypeSound   = 1 << 1
+  - UIRemoteNotificationTypeAlert   = 1 << 2
+  - UIRemoteNotificationTypeNewsstandContentAvailability = 1 << 3
+- iOS 10 after
+  - 字段 authorizationStatus，取值如下：
+    - UNAuthorizationStatusNotDetermined = 0, The user has not yet made a choice regarding whether the application may post user notifications.
+    - UNAuthorizationStatusDenied = 1, The application is not authorized to post user notifications.
+    - UNAuthorizationStatusAuthorized = 2, The application is authorized to post user notifications.
+  - 字段 soundSetting、badgeSetting、alertSetting、notificationCenterSetting、lockScreenSetting、carPlaySetting，取值如下：
+    - UNNotificationSettingNotSupported = 0, The application does not support this notification type.
+    - UNNotificationSettingDisabled = 1, The notification setting is turned off.
+    - UNNotificationSettingEnabled = 2, The notification setting is turned on.
+  - 字段 alertStyle，取值如下：
+    - UNAlertStyleNone = 0
+    - UNAlertStyleBanner = 1
+    - UNAlertStyleAlert = 2
+      
+
+
+
+## 监听事件统一说明
+
+可在 js 监听全部事件如下：
+
+##### jpush.receiveNotification
+
+> [前台收到远程通知](#前台收到推送)
+>
+> [iOS 10 前台收到本地通知](#ios-10-收到本地通知)
+
+
+
+##### jpush.openNotification
+
+> [点击远程通知横幅使 App「进入前台」或「启动」](#点击推送通知)
+>
+> [iOS 10 点击本地通知横幅使 App「进入前台」或「启动」](#ios-10-收到本地通知)
+
+
+
+##### jpush.backgroundNotification
+
+> [iOS 7 以后后台收到远程通知](#后台收到推送)
+
+
+
+##### jpush.setTagsWithAlias
+
+> [设置标签别名回调](#返回值说明)
+
+
+
+##### jpush.receiveMessage
+
+> [获取自定义消息内容](#获取自定义消息内容)
+
+
+
+##### jpush.startLocalNotification
+
+> [点击本地通知横幅启动 App](#点击本地通知横幅启动-app)
+
+
+
+##### jpush.receiveLocalNotification
+
+> [iOS 10 before 收到本地通知](#ios-10-before-收到本地通知)
+
--- a/doc/iOS_install.md
+++ b/doc/iOS_install.md
@@ -1,35 +1,41 @@
 ## iOS 手动安装

- 下载 JPush PhoneGap Plugin 插件，并解压
+> **不建议使用手动安装，请参照 README.md 进行自动安装。**

- 将 [/src/ios](/src/ios) 文件夹及内容在 xcode 中拖到你的工程里，并配置 [/src/ios/PushConfig.plist](/src/ios/PushConfig.plist) 中相应参数：

-		APP_KEY：     应用标识 
-		CHANNEL：     渠道标识
-		IsProduction：是否生产环境
-		IsIDFA：      是否使用 IDFA 启动 sdk

- 打开 xcode，点击工程目录中顶部的 工程，选择(Target -> Build Phases -> Link Binary With Libraries)，添加以下框架：
+1. 下载 JPush PhoneGap Plugin 插件，并解压
+2. 将 [/src/ios](/src/ios) 文件夹及内容在 xcode 中拖到你的工程里，并配置 [/src/ios/PushConfig.plist](/src/ios/PushConfig.plist) 中相应参数：

-		CFNetwork.framework
-		CoreFoundation.framework
-		CoreTelephony.framework
-		SystemConfiguration.framework
-		CoreGraphics.framework
-		Foundation.framework
-		UIKit.framework
-		AdSupport.framework
-		libz.tbd(若存在 libz.dylib 则替换为 libz.tbd)
+   Appkey：      应用标识 
+   Channel：     渠道标识
+   IsProduction：是否生产环境
+   IsIDFA：      是否使用 IDFA 启动 sdk
+3. 打开 xcode，点击工程目录中顶部的 工程，选择(Target -> Build Phases -> Link Binary With Libraries)，添加以下框架：

- 修改 phonegap config.xml 文件以添加 JPushPlugin 插件
+   CFNetwork.framework
+   CoreFoundation.framework
+   CoreTelephony.framework
+   SystemConfiguration.framework
+   CoreGraphics.framework
+   Foundation.framework
+   UIKit.framework
+   AdSupport.framework
+   libz.tbd(若存在 libz.dylib 则替换为 libz.tbd)
+   UserNotifications.framework
+   libresolv.tbd
+4. 修改 phonegap config.xml 文件以添加 JPushPlugin 插件

-		<feature name="JPushPlugin">
-		    <param name="ios-package" value="JPushPlugin" />
-		    <param name="onload" value="true" />
-		</feature>
+```xml
+<feature name="JPushPlugin">
+    <param name="ios-package" value="JPushPlugin" />
+    <param name="onload" value="true" />
+</feature>
+```
+5. 将 [/www/JPushPlugin.js](/www/JPushPlugin.js) 在 xcode 中拖到工程的 www 目录下面  
+6. 在需要使用插件处加入以下代码，并根据 [iOS API](/doc/iOS_API.md) 文档说明调用相应接口

- 将 [/www/JPushPlugin.js](/www/JPushPlugin.js) 在 xcode 中拖到工程的 www 目录下面  
+```xml
+<script type="text/javascript" src="JPushPlugin.js"></script>
+```

- 在需要使用插件处加入以下代码，并根据 [iOS API](/doc/iOS_API.md) 文档说明调用相应接口
-
-		<script type="text/javascript" src="JPushPlugin.js"></script>
--- a/doc/res/DismissActions_00.PNG
+++ b/doc/res/DismissActions_00.PNG
--- a/doc/res/MediaAttachments_00.gif
+++ b/doc/res/MediaAttachments_00.gif
--- a/doc/res/MediaAttachments_01.png
+++ b/doc/res/MediaAttachments_01.png
--- a/doc/res/MediaAttachments_02.png
+++ b/doc/res/MediaAttachments_02.png
--- a/doc/res/MediaAttachments_03.png
+++ b/doc/res/MediaAttachments_03.png
--- a/doc/res/MediaAttachments_04.png
+++ b/doc/res/MediaAttachments_04.png
--- a/doc/res/MediaAttachments_05.png
+++ b/doc/res/MediaAttachments_05.png
--- a/doc/res/MediaAttachments_06.png
+++ b/doc/res/MediaAttachments_06.png
--- a/doc/res/NotificationActions_00.png
+++ b/doc/res/NotificationActions_00.png
--- a/example/index.html
+++ b/example/index.html
@@ -47,7 +47,7 @@
            try {
                var alertContent;
                if (device.platform == "Android") {
-                    alertContent = window.plugins.jPushPlugin.openNotification.alert;
+                    alertContent = event.alert;
                } else {
                    alertContent = event.aps.alert;
                }
@@ -61,7 +61,7 @@
            try {
                var alertContent;
                if (device.platform == "Android") {
-                    alertContent = window.plugins.jPushPlugin.receiveNotification.alert;
+                    alertContent = event.alert;
                } else {
                    alertContent = event.aps.alert;
                }
@@ -75,7 +75,7 @@
            try {
                var message;
                if (device.platform == "Android") {
-                    message = window.plugins.jPushPlugin.receiveMessage.message;
+                    message = event.message;
                } else {
                    message = event.content;
                }
@@ -88,7 +88,7 @@
        var initiateUI = function() {
            try {
                window.plugins.jPushPlugin.init();
-                getRegistrationID();
+                window.setTimeout(getRegistrationID, 1000);
                if (device.platform != "Android") {
                    window.plugins.jPushPlugin.setDebugModeFromIos();
                    window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
--- a/21
+++ b/21
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) JiGuang <support@jpush.cn> (jiguang.cn)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
  "name": "jpush-phonegap-plugin",
-  "version": "2.2.2",
+  "version": "3.0.2",
  "description": "JPush for cordova plugin",
  "cordova": {
-    "id": "cordova-plugin-JPush",
+    "id": "jpush-phonegap-plugin",
    "platforms": [
      "ios",
      "android"
@@ -30,8 +30,8 @@
  "peerDependencies": {
    "cordova-plugin-device": ">=1.0.0"
  },
-  "author": "jpush",
-  "license": "Apache 2.0 License",
+  "author": "JiGuang",
+  "license": "MIT",
  "bugs": {
    "url": "https://github.com/jpush/jpush-phonegap-plugin/issues"
  },
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,207 +1,202 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        id="cordova-plugin-JPush"
-        version="2.2.2">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  id="jpush-phonegap-plugin"
+  version="3.0.1">

    <name>JPush Plugin</name>
    <description>JPush for cordova plugin</description>
    <author>JPush</author>
    <keywords>JPush,push</keywords>
-    <license>Apache 2.0 License</license>
+    <license>MIT License</license>

    <preference name="API_KEY" />

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

-    <dependency id="org.apache.cordova.device" url="https://github.com/apache/cordova-plugin-device.git"/>
+    <!-- dependencies -->
+    <dependency id="cordova-plugin-device" />

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

    <platform name="ios">
-            <config-file target="config.xml" parent="/*">
-                <feature name="JPushPlugin">
-                    <param name="ios-package" value="JPushPlugin"/>
-                </feature>
-            </config-file>
+        <config-file target="config.xml" parent="/*">
+            <feature name="JPushPlugin">
+                <param name="ios-package" value="JPushPlugin" />
+            </feature>
+        </config-file>

-            <header-file src="src/ios/Plugins/JPushPlugin.h"/>
-            <source-file src="src/ios/Plugins/JPushPlugin.m"/>
+        <header-file src="src/ios/Plugins/JPushDefine.h" />
+        <header-file src="src/ios/Plugins/JPushPlugin.h" />
+        <source-file src="src/ios/Plugins/JPushPlugin.m" />
+        <header-file src="src/ios/Plugins/AppDelegate+JPush.h" />
+        <source-file src="src/ios/Plugins/AppDelegate+JPush.m" />

-            <header-file src="src/ios/lib/JPUSHService.h" />
-            <source-file src="src/ios/lib/jpush-ios-2.1.8.a" framework="true" />
-            <header-file src="src/ios/Plugins/AppDelegate+JPush.h"/>
-            <source-file src="src/ios/Plugins/AppDelegate+JPush.m"/>
-            <resource-file src="src/ios/PushConfig.plist" />
-            <framework src="CFNetwork.framework" weak="true" />
-            <framework src="CoreFoundation.framework" weak="true" />
-            <framework src="CoreTelephony.framework" weak="true" />
-            <framework src="SystemConfiguration.framework" weak="true" />
-            <framework src="CoreGraphics.framework" weak="true" />
-            <framework src="Foundation.framework" weak="true" />
-            <framework src="UIKit.framework" weak="true" />
-            <framework src="Security.framework" weak="true" />
-            <framework src="libz.tbd" weak="true" />
-            <framework src="AdSupport.framework" weak="true" />
+        <header-file src="src/ios/lib/JPUSHService.h" />
+        <source-file src="src/ios/lib/jpush-ios-3.0.0.a" framework="true" />
+        <source-file src="src/ios/lib/jcore-ios-1.0.0.a" framework="true" />
+        <resource-file src="src/ios/PushConfig.plist" />

-            <config-file target="*PushConfig.plist" parent="APP_KEY">
-                <string>$API_KEY</string>
-            </config-file>
-        </platform>
+        <framework src="CFNetwork.framework" weak="true" />
+        <framework src="CoreFoundation.framework" weak="true" />
+        <framework src="CoreTelephony.framework" weak="true" />
+        <framework src="SystemConfiguration.framework" weak="true" />
+        <framework src="CoreGraphics.framework" weak="true" />
+        <framework src="Foundation.framework" weak="true" />
+        <framework src="UIKit.framework" weak="true" />
+        <framework src="Security.framework" weak="true" />
+        <framework src="libz.tbd" weak="true" />
+        <framework src="AdSupport.framework" weak="true" />
+        <framework src="UserNotifications.framework" weak="true" />
+        <framework src="libresolv.tbd" weak="true" />
+
+
+        <config-file target="*PushConfig.plist" parent="Appkey">
+            <string>$API_KEY</string>
+        </config-file>
+    </platform>

    <platform name="android">
        <config-file target="res/xml/config.xml" parent="/*">
            <feature name="JPushPlugin">
-                <param name="android-package" value="cn.jpush.phonegap.JPushPlugin"/>
+                <param name="android-package" value="cn.jpush.phonegap.JPushPlugin" />
            </feature>
        </config-file>

-        <framework src="com.android.support:support-v4:24.0.0" />
-
        <config-file target="AndroidManifest.xml" parent="/manifest">
            <!-- Required  一些系统要求的权限，如访问网络等-->
-            <uses-permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"/>
-            <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
-            <uses-permission android:name="android.permission.INTERNET"/>
-            <uses-permission android:name="android.permission.WAKE_LOCK"/>
-            <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-            <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-            <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-            <uses-permission android:name="android.permission.VIBRATE"/>
-            <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-            <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-            <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-			<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-            <permission
-                    android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
-                    android:protectionLevel="signature"/>
+            <uses-permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE" />
+            <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+            <uses-permission android:name="android.permission.INTERNET" />
+            <uses-permission android:name="android.permission.WAKE_LOCK" />
+            <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+            <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+            <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+            <uses-permission android:name="android.permission.VIBRATE" />
+            <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+            <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+            <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+            <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+            <permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
        </config-file>
        <config-file target="AndroidManifest.xml" parent="/manifest/application">
            <!-- Required SDK核心功能-->
-            <activity
-                    android:name="cn.jpush.android.ui.PushActivity"
-                    android:theme="@android:style/Theme.Translucent.NoTitleBar"
-                    android:configChanges="orientation|keyboardHidden">
+            <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>

            <!-- Rich push 核心功能 since 2.0.6-->
-            <activity
-                android:name="cn.jpush.android.ui.PopWinActivity"
+            <activity android:name="cn.jpush.android.ui.PopWinActivity"
                android:theme="@style/MyDialogStyle"
                android:exported="false">
            </activity>

            <!-- Required  SDK核心功能-->
-            <service
-                    android:name="cn.jpush.android.service.DownloadService"
-                    android:enabled="true"
-                    android:exported="false">
+            <service android:name="cn.jpush.android.service.DownloadService"
+               android:enabled="true"
+               android:exported="false">
            </service>

            <!-- Required SDK 核心功能-->
-            <service
-                    android:name="cn.jpush.android.service.PushService"
-                    android:enabled="true"
-                    android:exported="false">
+            <service android:name="cn.jpush.android.service.PushService"
+              android:enabled="true"
+              android:exported="false">
                <intent-filter>
-                    <action android:name="cn.jpush.android.intent.REGISTER"/>
-                    <action android:name="cn.jpush.android.intent.REPORT"/>
-                    <action android:name="cn.jpush.android.intent.PushService"/>
-                    <action android:name="cn.jpush.android.intent.PUSH_TIME"/>
+                    <action android:name="cn.jpush.android.intent.REGISTER" />
+                    <action android:name="cn.jpush.android.intent.REPORT" />
+                    <action android:name="cn.jpush.android.intent.PushService" />
+                    <action android:name="cn.jpush.android.intent.PUSH_TIME" />
                </intent-filter>
            </service>

            <!-- Required SDK核心功能-->
-            <receiver
-                    android:name="cn.jpush.android.service.PushReceiver"
-                    android:enabled="true">
+            <receiver android:name="cn.jpush.android.service.PushReceiver"
+              android:enabled="true">
                <intent-filter android:priority="1000">
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                    <!--Required  显示通知栏 -->
-                    <category android:name="$PACKAGE_NAME"/>
+                    <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"/>
+                    <action android:name="android.intent.action.USER_PRESENT" />
+                    <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
                </intent-filter>
                <!-- Optional -->
                <intent-filter>
-                    <action android:name="android.intent.action.PACKAGE_ADDED"/>
-                    <action android:name="android.intent.action.PACKAGE_REMOVED"/>
+                    <action android:name="android.intent.action.PACKAGE_ADDED" />
+                    <action android:name="android.intent.action.PACKAGE_REMOVED" />
                </intent-filter>
            </receiver>

            <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
            <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
-            <service
-                android:name="cn.jpush.android.service.DaemonService"
-                android:enabled="true"
-                android:exported="true">
-                <intent-filter >
+            <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true">
+                <intent-filter>
                    <action android:name="cn.jpush.android.intent.DaemonService" />
-                    <category android:name="$PACKAGE_NAME"/>
+                    <category android:name="$PACKAGE_NAME" />
                </intent-filter>
            </service>

            <!-- User defined.  For test only  用户自定义的广播接收器 -->
-            <receiver
-                    android:name="cn.jpush.phonegap.MyReceiver"
-                    android:enabled="true">
+            <receiver android:name="cn.jpush.phonegap.MyReceiver" android:enabled="true">
                <intent-filter android:priority="1000">
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                    <!-- Required  显示通知栏 -->
-                    <category android:name="$PACKAGE_NAME"/>
+                    <category android:name="$PACKAGE_NAME" />
                </intent-filter>
                <intent-filter>
-                    <action android:name="cn.jpush.android.intent.REGISTRATION"/>
+                    <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"/>
+                    <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"/>
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
                    <!-- Required  用户接收SDK通知栏信息的intent -->
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/>
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
                    <!-- Required  用户打开自定义通知栏的intent -->
-                    <action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK"/>
+                    <action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK" />
                    <!-- Optional 用户接受Rich Push Javascript 回调函数的intent -->
-                    <category android:name="$PACKAGE_NAME"/>
+                    <category android:name="$PACKAGE_NAME" />
                </intent-filter>
            </receiver>
            <!-- Required SDK核心功能-->
-            <receiver android:name="cn.jpush.android.service.AlarmReceiver"/>
+            <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="$API_KEY"/>
+            <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.1.7.jar" target-dir="libs"/>
-        <source-file src="src/android/armeabi/libjpush217.so" target-dir="libs/armeabi"/>
-        <source-file src="src/android/armeabi-v7a/libjpush217.so" target-dir="libs/armeabi-v7a"/>
-        <source-file src="src/android/arm64-v8a/libjpush217.so" target-dir="libs/arm64-v8a"/>
-        <source-file src="src/android/x86/libjpush217.so" target-dir="libs/x86"/>
-        <source-file src="src/android/x86_64/libjpush217.so" target-dir="libs/x86_64"/>
+        <source-file src="src/android/libs/jpush-android_v3.0.0.jar" target-dir="libs" />
+        <source-file src="src/android/libs/jcore-android_v1.0.0.jar" target-dir="libs" />
+        <source-file src="src/android/libs/armeabi/libjcore100.so" target-dir="libs/armeabi" />
+        <source-file src="src/android/libs/armeabi-v7a/libjcore100.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="src/android/libs/arm64-v8a/libjcore100.so" target-dir="libs/arm64-v8a" />
+        <source-file src="src/android/libs/x86/libjcore100.so" target-dir="libs/x86" />
+        <source-file src="src/android/libs/x86_64/libjcore100.so" target-dir="libs/x86_64" />

-        <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap"/>
-        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>
-    	<source-file src="src/android/test_notification_layout.xml" target-dir="res/layout"/>
-    	<source-file src="src/android/jpush_notification_icon.png" target-dir="res/drawable"/>
+        <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap" />
+        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap" />

-        <!-- Rich Push resources  -->
-        <source-file src="src/android/ic_richpush_actionbar_back.png" target-dir="res/drawable" />
-        <source-file src="src/android/ic_richpush_actionbar_divider.png" target-dir="res/drawable" />
-        <source-file src="src/android/richpush_btn_selector.xml" target-dir="res/drawable" />
-        <source-file src="src/android/jpush_popwin_layout.xml" target-dir="res/layout" />
-        <source-file src="src/android/jpush_webview_layout.xml" target-dir="res/layout" />
-        <source-file src="src/android/jpush_style.xml" target-dir="res/values" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml" target-dir="res/drawable" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml" target-dir="res/drawable" />

+        <source-file src="src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png" target-dir="res/drawable-hdpi" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png" target-dir="res/drawable-hdpi" />
+
+        <source-file src="src/android/res/layout/jpush_popwin_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/res/layout/jpush_webview_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/res/layout/test_notification_layout.xml" target-dir="res/layout" />
+
+        <source-file src="src/android/res/values/jpush_style.xml" target-dir="res/values" />
    </platform>
 </plugin>
--- a/src/android/JPushPlugin.java
+++ b/src/android/JPushPlugin.java
@@ -1,8 +1,11 @@
 package cn.jpush.phonegap;

+import android.annotation.TargetApi;
 import android.app.Activity;
+import android.app.AppOpsManager;
 import android.content.Context;
-import android.support.v4.app.NotificationManagerCompat;
+import android.content.pm.ApplicationInfo;
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;

@@ -14,6 +17,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -84,10 +89,10 @@ public class JPushPlugin extends CordovaPlugin {

    @Override
    public void initialize(CordovaInterface cordova, CordovaWebView webView) {
-        super.initialize(cordova, webView);
+        Log.i(TAG, "JPush initialize.");

-        Log.i(TAG, "---------------- initialize" + "-" + openNotificationAlert
-                + "-" + notificationAlert);
+        super.initialize(cordova, webView);
+        JPushInterface.init(cordova.getActivity().getApplicationContext());

        cordovaActivity = cordova.getActivity();

@@ -138,7 +143,7 @@ public class JPushPlugin extends CordovaPlugin {
    }

    private static JSONObject getMessageObject(String message,
-            Map<String, Object> extras) {
+                                               Map<String, Object> extras) {
        JSONObject data = new JSONObject();
        try {
            data.put("message", message);
@@ -172,7 +177,7 @@ public class JPushPlugin extends CordovaPlugin {
    }

    private static JSONObject getNotificationObject(String title,
-            String alert, Map<String, Object> extras) {
+                                                    String alert, Map<String, Object> extras) {
        JSONObject data = new JSONObject();
        try {
            data.put("title", title);
@@ -180,7 +185,7 @@ public class JPushPlugin extends CordovaPlugin {
            JSONObject jExtras = new JSONObject();
            for (Entry<String, Object> entry : extras.entrySet()) {
                if (entry.getKey().equals("cn.jpush.android.EXTRA")) {
-                    JSONObject jo = null;
+                    JSONObject jo;
                    if (TextUtils.isEmpty((String) entry.getValue())) {
                        jo = new JSONObject();
                    } else {
@@ -222,7 +227,7 @@ public class JPushPlugin extends CordovaPlugin {
    }

    static void transmitNotificationOpen(String title, String alert,
-            Map<String, Object> extras) {
+                                         Map<String, Object> extras) {
        if (instance == null) {
            return;
        }
@@ -240,7 +245,7 @@ public class JPushPlugin extends CordovaPlugin {
    }

    static void transmitNotificationReceive(String title, String alert,
-            Map<String, Object> extras) {
+                                            Map<String, Object> extras) {
        if (instance == null) {
            return;
        }
@@ -259,7 +264,7 @@ public class JPushPlugin extends CordovaPlugin {

    @Override
    public boolean execute(final String action, final JSONArray data,
-            final CallbackContext callbackContext) throws JSONException {
+                           final CallbackContext callbackContext) throws JSONException {
        if (!methodList.contains(action)) {
            return false;
        }
@@ -314,13 +319,11 @@ public class JPushPlugin extends CordovaPlugin {
    }

    void areNotificationEnabled(JSONArray data, final CallbackContext callback) {
-        NotificationManagerCompat nmc = NotificationManagerCompat.from(
-                cordova.getActivity().getApplicationContext());
        int isEnabled;
-        if (nmc.areNotificationsEnabled()) {
+        if (hasPermission("OP_POST_NOTIFICATION")) {
            isEnabled = 1;
        } else {
-           isEnabled = 0;
+            isEnabled = 0;
        }
        callback.success(isEnabled);
    }
@@ -435,8 +438,11 @@ public class JPushPlugin extends CordovaPlugin {
        }
    }

+    /**
+     *   自定义通知行为，声音、震动、呼吸灯等。
+     */
    void setBasicPushNotificationBuilder(JSONArray data,
-            CallbackContext callbackContext) {
+                                         CallbackContext callbackContext) {
        BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(
                this.cordova.getActivity());
        builder.developerArg0 = "Basic builder 1";
@@ -450,22 +456,16 @@ public class JPushPlugin extends CordovaPlugin {
    }

    /**
-    *  自定义推送通知栏样式，需要自己实现具体代码。
-    *  http://docs.jiguang.cn/client/android_tutorials/#_11
-    */
+     * 自定义推送通知栏样式，需要自己实现具体代码。
+     * http://docs.jiguang.cn/client/android_tutorials/#_11
+     */
    void setCustomPushNotificationBuilder(JSONArray data,
-            CallbackContext callbackContext) {
+                                          CallbackContext callbackContext) {
        // CustomPushNotificationBuilder builder = new CustomPushNotificationBuilder(
        //         this.cordova.getActivity(), R.layout.test_notification_layout,
        //         R.id.icon, R.id.title, R.id.text);
-        // builder.developerArg0 = "Custom Builder 1";
        // JPushInterface.setPushNotificationBuilder(2, builder);
-        // JSONObject obj = new JSONObject();
-        // try {
-        //     obj.put("id", 2);
-        // } catch (JSONException e) {
-        //     e.printStackTrace();
-        // }
+        // JPushInterface.setDefaultPushNotificationBuilder(builder);
    }

    void clearAllNotification(JSONArray data, CallbackContext callbackContext) {
@@ -600,4 +600,37 @@ public class JPushPlugin extends CordovaPlugin {
        }
    };

+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private boolean hasPermission(String appOpsServiceId) {
+        Context context = cordova.getActivity().getApplicationContext();
+        AppOpsManager mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        ApplicationInfo appInfo = context.getApplicationInfo();
+
+        String pkg = context.getPackageName();
+        int uid = appInfo.uid;
+        Class appOpsClazz = null;
+
+        try {
+            appOpsClazz = Class.forName(AppOpsManager.class.getName());
+            Method checkOpNoThrowMethod = appOpsClazz.getMethod("checkOpNoThrow",
+                    Integer.TYPE, Integer.TYPE, String.class);
+            Field opValue = appOpsClazz.getDeclaredField(appOpsServiceId);
+            int value = opValue.getInt(Integer.class);
+            Object result = checkOpNoThrowMethod.invoke(mAppOps, value, uid, pkg);
+
+            return Integer.parseInt(result.toString()) == AppOpsManager.MODE_ALLOWED;
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
 }
--- a/src/android/arm64-v8a/libjpush217.so
+++ b/src/android/arm64-v8a/libjpush217.so
--- a/src/android/armeabi-v7a/libjpush217.so
+++ b/src/android/armeabi-v7a/libjpush217.so
--- a/src/android/armeabi/libjpush217.so
+++ b/src/android/armeabi/libjpush217.so
--- a/src/android/jpush-android-2.1.7.jar
+++ b/src/android/jpush-android-2.1.7.jar
--- a/src/android/jpush_notification_icon.png
+++ b/src/android/jpush_notification_icon.png
--- a/src/android/libs/arm64-v8a/libjcore100.so
+++ b/src/android/libs/arm64-v8a/libjcore100.so
--- a/src/android/libs/armeabi-v7a/libjcore100.so
+++ b/src/android/libs/armeabi-v7a/libjcore100.so
--- a/src/android/libs/armeabi/libjcore100.so
+++ b/src/android/libs/armeabi/libjcore100.so
--- a/src/android/libs/jcore-android_v1.0.0.jar
+++ b/src/android/libs/jcore-android_v1.0.0.jar
--- a/src/android/libs/jpush-android_v3.0.0.jar
+++ b/src/android/libs/jpush-android_v3.0.0.jar
--- a/src/android/libs/x86/libjcore100.so
+++ b/src/android/libs/x86/libjcore100.so
--- a/src/android/libs/x86_64/libjcore100.so
+++ b/src/android/libs/x86_64/libjcore100.so
--- a/src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png
+++ b/src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png
--- a/src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png
+++ b/src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png
--- a/src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml
+++ b/src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml
@@ -5,7 +5,7 @@
        android:state_focused="true" 
        android:state_enabled="true" 
        android:state_pressed="false" 
-        android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+        android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
     <!-- 按下时的背景图片 --> 
    <item 
        android:state_enabled="true" 
@@ -17,5 +17,5 @@
        android:state_checked="true" 
        android:drawable="@android:color/darker_gray" /> 
    <!-- 默认时的背景图片 --> 
-    <item android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+    <item android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
 </selector> 
--- a/src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml
+++ b/src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- 背景  gradient是渐变,corners定义的是圆角 -->
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#ffffff" />
+        </shape>
+    </item>
+    
+    <!-- 进度条 -->
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="#4393ea" />
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>
--- a/src/android/res/layout/jpush_popwin_layout.xml
+++ b/src/android/res/layout/jpush_popwin_layout.xml
--- a/src/android/res/layout/jpush_webview_layout.xml
+++ b/src/android/res/layout/jpush_webview_layout.xml
@@ -18,7 +18,7 @@
            android:layout_centerVertical="true"
            android:layout_marginLeft="9dp"
            android:layout_marginRight="10dp"
-            android:background="@drawable/richpush_btn_selector" />
+            android:background="@drawable/jpush_richpush_btn_selector" />

        <ImageView
            android:id="@+id/imgView"
@@ -27,7 +27,7 @@
            android:layout_centerVertical="true"
            android:layout_toRightOf="@id/imgRichpushBtnBack"
            android:clickable="false"
-            android:src="@drawable/ic_richpush_actionbar_divider" />
+            android:src="@drawable/jpush_ic_richpush_actionbar_divider" />

        <TextView
            android:id="@+id/tvRichpushTitle"
@@ -35,6 +35,7 @@
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_marginLeft="7dp"
+            android:layout_marginRight="5dp"
            android:layout_toRightOf="@id/imgView"
            android:clickable="false"
            android:text=" "
@@ -42,6 +43,13 @@
            android:textColor="#ffffff" />
    </RelativeLayout>

+    <ProgressBar
+        android:id="@+id/pushPrograssBar"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:progress="0"
+        android:progressDrawable="@drawable/jpush_richpush_progressbar"
+        style="?android:attr/progressBarStyleHorizontal" />
    <WebView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/src/android/res/layout/test_notification_layout.xml
+++ b/src/android/res/layout/test_notification_layout.xml
--- a/src/android/res/values/jpush_style.xml
+++ b/src/android/res/values/jpush_style.xml
--- a/src/android/x86/libjpush217.so
+++ b/src/android/x86/libjpush217.so
--- a/src/android/x86_64/libjpush217.so
+++ b/src/android/x86_64/libjpush217.so
--- a/src/ios/Plugins/AppDelegate+JPush.h
+++ b/src/ios/Plugins/AppDelegate+JPush.h
@@ -1,13 +1,16 @@
-//
-//  AppDelegate+JPush.h
-//  delegateExtention
-//
-//  Created by 张庆贺 on 15/8/3.
-//  Copyright (c) 2015年 JPush. All rights reserved.
-//
-
-#import "AppDelegate.h"
-
-@interface AppDelegate (JPush)
-
-@end
+//
+//  AppDelegate+JPush.h
+//  delegateExtention
+//
+//  Created by 张庆贺 on 15/8/3.
+//  Copyright (c) 2015年 JPush. All rights reserved.
+//
+
+#import "AppDelegate.h"
+#import <UserNotifications/UserNotifications.h>
+#import "JPUSHService.h"
+
+@interface AppDelegate (JPush) <JPUSHRegisterDelegate>
+-(void)registerForRemoteNotification;
+-(void)startJPushSDK;
+@end
--- a/src/ios/Plugins/AppDelegate+JPush.m
+++ b/src/ios/Plugins/AppDelegate+JPush.m
@@ -1,65 +1,153 @@
-//
-//  AppDelegate+JPush.m
-//  delegateExtention
-//
-//  Created by 张庆贺 on 15/8/3.
-//  Copyright (c) 2015年 JPush. All rights reserved.
-//
-
-#import "AppDelegate+JPush.h"
-#import "JPushPlugin.h"
-#import "JPUSHService.h"
-#import <objc/runtime.h>
-
-@implementation AppDelegate (JPush)
-
-+(void)load{
-
-    Method origin;
-    Method swizzle;
-
-    origin=class_getInstanceMethod([self class],@selector(init));
-    swizzle=class_getInstanceMethod([self class], @selector(init_plus));
-    method_exchangeImplementations(origin, swizzle);
-}
-
-(instancetype)init_plus{
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidLaunch:) name:@"UIApplicationDidFinishLaunchingNotification" object:nil];
-    return [self init_plus];
-}
-
-(void)applicationDidLaunch:(NSNotification *)notification{
-    if (notification) {
-        [JPushPlugin setLaunchOptions:notification.userInfo];
-    }
-}
-
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    [JPUSHService registerDeviceToken:deviceToken];
-}
-
-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
-    [JPUSHService handleRemoteNotification:userInfo];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
-}
-
-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
-    [JPUSHService handleRemoteNotification:userInfo];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
-    completionHandler(UIBackgroundFetchResultNewData);
-}
-
- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
-    [JPUSHService showLocalNotificationAtFront:notification identifierKey:nil];
-}
-
- (void)applicationWillEnterForeground:(UIApplication *)application {
-    //  [application setApplicationIconBadgeNumber:0];
-    //  [application cancelAllLocalNotifications];
-}
-
- (void)applicationDidEnterBackground:(UIApplication *)application {
-    //  [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
-}
-
-@end
+//
+//  AppDelegate+JPush.m
+//  delegateExtention
+//
+//  Created by 张庆贺 on 15/8/3.
+//  Copyright (c) 2015年 JPush. All rights reserved.
+//
+
+#import "AppDelegate+JPush.h"
+#import "JPushPlugin.h"
+#import <objc/runtime.h>
+#import <AdSupport/AdSupport.h>
+#import <UserNotifications/UserNotifications.h>
+#import "JPushDefine.h"
+
+@implementation AppDelegate (JPush)
+
+(void)load{
+    Method origin1;
+    Method swizzle1;
+    origin1  = class_getInstanceMethod([self class],@selector(init));
+    swizzle1 = class_getInstanceMethod([self class], @selector(init_plus));
+    method_exchangeImplementations(origin1, swizzle1);
+}
+
+-(instancetype)init_plus{
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidLaunch:) name:UIApplicationDidFinishLaunchingNotification object:nil];
+    return [self init_plus];
+}
+
+NSDictionary *_launchOptions;
+
+-(void)applicationDidLaunch:(NSNotification *)notification{
+    if (notification) {
+        if (notification.userInfo) {
+            NSDictionary *userInfo1 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+            if (userInfo1.count > 0) {
+                [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo1 toJsonString]];
+            }
+            NSDictionary *userInfo2 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey];
+            if (userInfo2.count > 0) {
+                [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_StartLocalNotification jsString:[userInfo1 toJsonString]];
+            }
+        }
+        [JPUSHService setDebugMode];
+
+        NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfig_FileName ofType:@"plist"];
+        NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
+        NSNumber *delay       = [plistData valueForKey:JPushConfig_Delay];
+
+        _launchOptions = notification.userInfo;
+
+        if (![delay boolValue]) {
+            [self startJPushSDK];
+        }
+
+    }
+}
+
+-(void)startJPushSDK{
+    [self registerForRemoteNotification];
+    [JPushPlugin setupJPushSDK:_launchOptions];
+}
+
+-(void)registerForRemoteNotification{
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) {
+#ifdef NSFoundationVersionNumber_iOS_9_x_Max
+        JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init];
+        entity.types = UNAuthorizationOptionAlert|UNAuthorizationOptionBadge|UNAuthorizationOptionSound;
+        [JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
+#endif
+    }else if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+        //可以添加自定义categories
+        [JPUSHService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
+                                                          UIUserNotificationTypeSound |
+                                                          UIUserNotificationTypeAlert)
+                                              categories:nil];
+    } else if([[UIDevice currentDevice].systemVersion floatValue] < 8.0){
+        //categories 必须为nil
+        [JPUSHService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+                                                          UIRemoteNotificationTypeSound |
+                                                          UIRemoteNotificationTypeAlert)
+                                              categories:nil];
+    }
+}
+
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+    [JPUSHService registerDeviceToken:deviceToken];
+}
+
+-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
+    [JPUSHService handleRemoteNotification:userInfo];
+
+    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
+}
+
+-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+    [JPUSHService handleRemoteNotification:userInfo];
+    NSString *eventName;
+    switch ([UIApplication sharedApplication].applicationState) {
+        case UIApplicationStateInactive:
+            eventName = JPushDocumentEvent_OpenNotification;
+            break;
+        case UIApplicationStateActive:
+            eventName = JPushDocumentEvent_ReceiveNotification;
+            break;
+        case UIApplicationStateBackground:
+            eventName = JPushDocumentEvent_BackgroundNotification;
+            break;
+        default:
+            break;
+    }
+    [SharedJPushPlugin jpushFireDocumentEvent:eventName jsString:[userInfo toJsonString]];
+    completionHandler(UIBackgroundFetchResultNewData);
+}
+
+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:notification.request.content.userInfo];
+
+    if ([SharedJPushPlugin respondsToSelector:@selector(jpushFireDocumentEvent:jsString:)]) {
+        
+    }
+    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
+    completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert);
+}
+
+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{
+    if ([SharedJPushPlugin respondsToSelector:@selector(jpushFireDocumentEvent:jsString:)]) {
+
+    }
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:response.notification.request.content.userInfo];
+    @try {
+        [userInfo setValue:[response valueForKey:@"userText"] forKey:@"userText"];
+    } @catch (NSException *exception) { }
+    [userInfo setValue:response.actionIdentifier forKey:@"actionIdentifier"];
+    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo toJsonString]];
+    completionHandler();
+}
+
+- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
+    [[NSNotificationCenter defaultCenter] postNotificationName:JPushDocumentEvent_ReceiveLocalNotification object:notification.userInfo];
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+    //  [application setApplicationIconBadgeNumber:0];
+    //  [application cancelAllLocalNotifications];
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+    //  [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
+}
+
+@end
--- a/src/ios/Plugins/JPushDefine.h
+++ b/src/ios/Plugins/JPushDefine.h
@@ -0,0 +1,33 @@
+//
+//  ConstantDef.h
+//  jmessage
+//
+//  Created by ljg on 16/1/19.
+//
+//
+
+#ifndef ConstantDef_h
+#define ConstantDef_h
+
+
+
+#endif /* ConstantDef_h */
+
+#define WEAK_SELF(weakSelf)  __weak __typeof(&*self)weakSelf = self;
+
+static NSString *const JPushConfig_FileName     = @"PushConfig";
+static NSString *const JPushConfig_Appkey       = @"Appkey";
+static NSString *const JPushConfig_Channel      = @"Channel";
+static NSString *const JPushConfig_IsProduction = @"IsProduction";
+static NSString *const JPushConfig_IsIDFA       = @"IsIDFA";
+static NSString *const JPushConfig_Delay        = @"Delay";
+
+static NSString *const JPushDocumentEvent_ReceiveNotification       = @"receiveNotification";
+static NSString *const JPushDocumentEvent_OpenNotification          = @"openNotification";
+static NSString *const JPushDocumentEvent_BackgroundNotification    = @"backgroundNotification";
+static NSString *const JPushDocumentEvent_SetTagsWithAlias          = @"setTagsWithAlias";
+static NSString *const JPushDocumentEvent_ReceiveMessage            = @"receiveMessage";
+static NSString *const JPushDocumentEvent_StartLocalNotification    = @"startLocalNotification";
+static NSString *const JPushDocumentEvent_ReceiveLocalNotification  = @"receiveLocalNotification";
+
+
--- a/src/ios/Plugins/JPushPlugin.h
+++ b/src/ios/Plugins/JPushPlugin.h
@@ -1,73 +1,94 @@
-//
-//  PushTalkPlugin.h
-//  PushTalk
-//
-//  Created by zhangqinghe on 13-12-13.
-//
-//
-
-#import <Cordova/CDV.h>
-
-#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;
-
-//检查用户的推送设置情况
-(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command;
-
-/*
- *  以下为js中可监听到的事件
- *  jpush.openNotification      点击推送消息启动或唤醒app
- *  jpush.setTagsWithAlias      设置标签、别名完成
- *  jpush.receiveMessage        收到自定义消息
- *  jpush.receiveNotification   前台收到推送
- *  jpush.backgoundNotification 后台收到推送
- */
-
-@end
+//
+//  PushTalkPlugin.h
+//  PushTalk
+//
+//  Created by zhangqinghe on 13-12-13.
+//
+//
+
+#import <Cordova/CDV.h>
+
+@interface JPushPlugin : CDVPlugin{
+
+}
+
+//注册通知服务并启动 SDK
+-(void)startJPushSDK:(CDVInvokedUrlCommand*)command;
+
+//以下为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;
+
+//检查用户的推送设置情况
+-(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command;
+
+//ios 10 APIs
+-(void)addDismissActions:(CDVInvokedUrlCommand*)command;
+-(void)addNotificationActions:(CDVInvokedUrlCommand*)command;
+
+/*
+ *  以下为js中可监听到的事件
+ *  jpush.openNotification      点击推送消息启动或唤醒app
+ *  jpush.setTagsWithAlias      设置标签、别名完成
+ *  jpush.receiveMessage        收到自定义消息
+ *  jpush.receiveNotification   前台收到推送
+ *  jpush.backgroundNotification 后台收到推送
+ */
+
+# pragma mark - private
+
+-(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString;
+
+(void)setupJPushSDK:(NSDictionary*)userInfo;
+
+@end
+
+JPushPlugin *SharedJPushPlugin;
+
+@interface NSDictionary (JPush)
+-(NSString*)toJsonString;
+@end
+
+@interface NSString (JPush)
+-(NSDictionary*)toDictionary;
+@end
+
+
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -1,413 +1,334 @@
-//
-//  PushTalkPlugin.m
-//  PushTalk
-//
-//  Created by zhangqinghe on 13-12-13.
-//
-//
-
-#import "JPushPlugin.h"
-#import "JPUSHService.h"
-#import <UIKit/UIKit.h>
-#import <AdSupport/AdSupport.h>
-
-static NSString *const JP_APP_KEY = @"APP_KEY";
-static NSString *const JP_APP_CHANNEL = @"CHANNEL";
-static NSString *const JP_APP_ISPRODUCTION = @"IsProduction";
-static NSString *const JP_APP_ISIDFA = @"IsIDFA";
-static NSString *const JPushConfigFileName = @"PushConfig";
-static NSDictionary *_launchOptions = nil;
-
-@implementation JPushPlugin
-
-#pragma mark- 外部接口
-(void)stopPush:(CDVInvokedUrlCommand*)command{
-    [[UIApplication sharedApplication]unregisterForRemoteNotifications];
-}
-
-(void)resumePush:(CDVInvokedUrlCommand*)command{
-    [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);
-    }
-    [self handleResultWithValue:result command:command];
-}
-
-(void)initial:(CDVInvokedUrlCommand*)command{
-    //do nithng,because Cordova plugin use lazy load mode.
-}
-
-
-#ifdef __CORDOVA_4_0_0
-
- (void)pluginInitialize {
-    NSLog(@"### pluginInitialize ");
-    [self initNotifications];
-}
-
-#else
-
- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
-    NSLog(@"### initWithWebView ");
-    if (self=[super initWithWebView:theWebView]) {
-        [self initNotifications];
-    }
-    return self;
-}
-
-
-#endif
-
-(void)initNotifications {
-    NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
-    [defaultCenter addObserver:self
-                      selector:@selector(networkDidReceiveMessage:)
-                          name:kJPFNetworkDidReceiveMessageNotification
-                        object:nil];
-
-    [defaultCenter addObserver:self
-                      selector:@selector(networkDidReceiveNotification:)
-                          name:kJPushPluginReceiveNotification
-                        object:nil];
-
-    if (_launchOptions) {
-        NSDictionary *userInfo = [_launchOptions
-                                  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;
-    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 *tags = command.arguments;
-
-    NSLog(@"#### setTags %@",tags);
-
-    [JPUSHService setTags:[NSSet setWithArray:tags]
-         callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
-                   object:self];
-
-}
-
-(void)setAlias:(CDVInvokedUrlCommand *)command{
-
-    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);
-    [self handleResultWithValue:registrationID command:command];
-}
-
-(void)startLogPageView:(CDVInvokedUrlCommand*)command{
-    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[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[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[0];
-    [JPUSHService setBadge:[badge intValue]];
-}
-
-(void)resetBadge:(CDVInvokedUrlCommand*)command{
-    [JPUSHService resetBadge];
-}
-
-(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command{
-    //
-    NSArray *argument = command.arguments;
-    if ([argument count] < 1) {
-        NSLog(@"setBadge argument error!");
-        return;
-    }
-    NSNumber *badge = [argument objectAtIndex:0];
-    [UIApplication sharedApplication].applicationIconBadgeNumber = [badge intValue];
-}
-
-(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command {
-    NSInteger num = [UIApplication sharedApplication].applicationIconBadgeNumber;
-    NSNumber *number = [NSNumber numberWithInteger:num];
-    [self handleResultWithValue:number command:command];
-}
-
-(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command{
-    [JPUSHService setDebugMode];
-}
-
-(void)setLogOFF:(CDVInvokedUrlCommand*)command{
-    [JPUSHService setLogOFF];
-}
-
-(void)crashLogON:(CDVInvokedUrlCommand*)command{
-    [JPUSHService crashLogON];
-}
-
-(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]];
-}
-
-(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command{
-    if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
-        UIUserNotificationSettings *settings = [[UIApplication sharedApplication] currentUserNotificationSettings];
-        UIUserNotificationType type = settings.types;
-        NSNumber *number = [NSNumber numberWithInteger:type];
-        [self handleResultWithValue:number command:command];
-    }else{
-        UIRemoteNotificationType type = [[UIApplication sharedApplication] enabledRemoteNotificationTypes];
-        NSNumber *number = [NSNumber numberWithInteger:type];
-        [self handleResultWithValue:number command:command];
-    }
-
-}
-
-#pragma mark- 内部方法
-+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{
-    _launchOptions = 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);
-    }
-
-    NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
-    NSString * appkey       = [plistData valueForKey:JP_APP_KEY];
-    NSString * channel      = [plistData valueForKey:JP_APP_CHANNEL];
-    NSNumber * isProduction = [plistData valueForKey:JP_APP_ISPRODUCTION];
-    NSNumber *isIDFA        = [plistData valueForKey:JP_APP_ISIDFA];
-
-    if (!appkey || appkey.length == 0) {
-        NSLog(@"error: app key not found in PushConfig.plist ");
-        assert(0);
-    }
-
-    NSString *advertisingId = nil;
-    if(isIDFA){
-        advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
-    }
-    [JPUSHService setupWithOption:_launchOptions
-                           appKey:appkey
-                          channel:channel
-                 apsForProduction:[isProduction boolValue]
-            advertisingIdentifier:advertisingId];
-
-}
-
-#pragma mark 将参数返回给js
-(void)handleResultWithValue:(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 {
-    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]];
-            });
-            break;
-        }
-        case UIApplicationStateInactive:{
-            //后台点击
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",jsonString]];
-            });
-            break;
-        }
-        case UIApplicationStateBackground:{
-            //后台收到
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.backgoundNotification',%@)",jsonString]];
-            });
-            break;
-        }
-        default:
-        //do nothing
-        break;
-    }
-
-}
-
-@end
+
+//
+//  PushTalkPlugin.m
+//  PushTalk
+//
+//  Created by zhangqinghe on 13-12-13.
+//
+//
+
+#import "JPushPlugin.h"
+#import "JPUSHService.h"
+#import <UIKit/UIKit.h>
+#import <AdSupport/AdSupport.h>
+#import <UserNotifications/UserNotifications.h>
+#import "AppDelegate+JPush.h"
+#import "JPushDefine.h"
+
+@implementation NSDictionary (JPush)
+-(NSString*)toJsonString{
+    NSError  *error;
+    NSData   *data       = [NSJSONSerialization dataWithJSONObject:self options:0 error:&error];
+    NSString *jsonString = [[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding];
+    return jsonString;
+}
+@end
+
+@implementation NSString (JPush)
+-(NSDictionary*)toDictionary{
+    NSError      *error;
+    NSData       *jsonData = [self dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *dict     = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
+    return dict;
+}
+@end
+
+@interface JPushPlugin()
+
+@end
+
+@implementation JPushPlugin
+
+-(void)startJPushSDK:(CDVInvokedUrlCommand*)command{
+    [(AppDelegate*)[UIApplication sharedApplication].delegate startJPushSDK];
+}
+
+#pragma mark- 外部接口
+-(void)stopPush:(CDVInvokedUrlCommand*)command{
+    [[UIApplication sharedApplication]unregisterForRemoteNotifications];
+}
+
+-(void)resumePush:(CDVInvokedUrlCommand*)command{
+    [(AppDelegate*)[UIApplication sharedApplication].delegate registerForRemoteNotification];
+}
+
+-(void)isPushStopped:(CDVInvokedUrlCommand*)command{
+    NSNumber *result = [[UIApplication sharedApplication] isRegisteredForRemoteNotifications] ? @(0) : @(1);
+    [self handleResultWithValue:result command:command];
+}
+
+-(void)initial:(CDVInvokedUrlCommand*)command{
+    //do nithng,because Cordova plugin use lazy load mode.
+}
+
+#ifdef __CORDOVA_4_0_0
+
+- (void)pluginInitialize {
+    NSLog(@"### pluginInitialize ");
+    [self initPlugin];
+}
+
+#else
+
+- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
+    NSLog(@"### initWithWebView ");
+    if (self=[super initWithWebView:theWebView]) {
+    }
+    [self initPlugin];
+    return self;
+}
+
+#endif
+
+-(void)initPlugin{
+    if (!SharedJPushPlugin) {
+        SharedJPushPlugin = self;
+    }
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(networkDidReceiveMessage:)
+                                                 name:kJPFNetworkDidReceiveMessageNotification
+                                               object:nil];
+}
+
+-(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
+    });
+}
+
+-(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
+    NSString *alias = [command argumentAtIndex:0];
+    NSArray  *tags  = [command argumentAtIndex:1];
+    [JPUSHService setTags:[NSSet setWithArray:tags]
+                    alias:alias
+         callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                   object:self];
+}
+
+-(void)setTags:(CDVInvokedUrlCommand *)command{
+    NSArray *tags = command.arguments;
+    [JPUSHService setTags:[NSSet setWithArray:tags]
+         callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                   object:self];
+}
+
+-(void)setAlias:(CDVInvokedUrlCommand *)command{
+    NSString *alias = [command argumentAtIndex:0];
+    [JPUSHService setAlias:alias
+          callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                    object:self];
+}
+
+-(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
+    NSString* registrationID = [JPUSHService registrationID];
+    [self handleResultWithValue:registrationID command:command];
+}
+
+-(void)startLogPageView:(CDVInvokedUrlCommand*)command{
+    NSString * pageName = [command argumentAtIndex:0];
+    [JPUSHService startLogPageView:pageName];
+}
+
+-(void)stopLogPageView:(CDVInvokedUrlCommand*)command{
+    NSString * pageName = [command argumentAtIndex:0];
+    [JPUSHService stopLogPageView:pageName];
+}
+
+-(void)beginLogPageView:(CDVInvokedUrlCommand*)command{
+    NSString *pageName = [command argumentAtIndex:0];
+    NSNumber *duration = [command argumentAtIndex:1];
+    [JPUSHService beginLogPageView:pageName duration:duration.intValue];
+}
+
+-(void)setBadge:(CDVInvokedUrlCommand*)command{
+    NSNumber *badge = [command argumentAtIndex:0];
+    [JPUSHService setBadge:badge.intValue];
+}
+
+-(void)resetBadge:(CDVInvokedUrlCommand*)command{
+    [JPUSHService resetBadge];
+}
+
+-(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command{
+    NSNumber *badge = [command argumentAtIndex:0];
+    [UIApplication sharedApplication].applicationIconBadgeNumber = badge.intValue;
+}
+
+-(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command {
+    NSInteger num = [UIApplication sharedApplication].applicationIconBadgeNumber;
+    NSNumber *number = [NSNumber numberWithInteger:num];
+    [self handleResultWithValue:number command:command];
+}
+
+-(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command{
+    [JPUSHService setDebugMode];
+}
+
+-(void)setLogOFF:(CDVInvokedUrlCommand*)command{
+    [JPUSHService setLogOFF];
+}
+
+-(void)crashLogON:(CDVInvokedUrlCommand*)command{
+    [JPUSHService crashLogON];
+}
+
+-(void)setLocalNotification:(CDVInvokedUrlCommand*)command{
+    NSLog(@"ios 10 after please use UNNotificationRequest to set local notification, see apple doc to learn more");
+
+    NSDate       *date  = [NSDate dateWithTimeIntervalSinceNow:[[command argumentAtIndex:0] intValue]];
+    NSString     *alert = [command argumentAtIndex:1];
+    NSNumber     *badge = [command argumentAtIndex:2];
+    NSString     *idKey = [command argumentAtIndex:3];
+    NSDictionary *dict  = [command argumentAtIndex:4];
+    [JPUSHService setLocalNotification:date alertBody:alert badge:badge.intValue alertAction:nil identifierKey:idKey userInfo:dict soundName:nil];
+}
+
+-(void)deleteLocalNotificationWithIdentifierKey:(CDVInvokedUrlCommand*)command{
+    NSString *identifier = [command argumentAtIndex:0];
+    JPushNotificationIdentifier *jpid = [JPushNotificationIdentifier new];
+    jpid.identifiers = @[identifier];
+    [JPUSHService removeNotification:jpid];
+}
+
+-(void)clearAllLocalNotifications:(CDVInvokedUrlCommand*)command{
+    [JPUSHService removeNotification:nil];
+}
+
+-(void)setLocation:(CDVInvokedUrlCommand*)command{
+    NSNumber *latitude  = [command argumentAtIndex:0];
+    NSNumber *longitude = [command argumentAtIndex:1];
+    [JPUSHService setLatitude:latitude.doubleValue longitude:longitude.doubleValue];
+}
+
+-(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command{
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) {
+        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+        WEAK_SELF(weakSelf);
+        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+            NSMutableDictionary *dict = [NSMutableDictionary dictionary];
+            dict[@"authorizationStatus"]       = @(settings.authorizationStatus);
+            dict[@"soundSetting"]              = @(settings.soundSetting);
+            dict[@"badgeSetting"]              = @(settings.badgeSetting);
+            dict[@"alertSetting"]              = @(settings.alertSetting);
+            dict[@"notificationCenterSetting"] = @(settings.notificationCenterSetting);
+            dict[@"lockScreenSetting"]         = @(settings.lockScreenSetting);
+            dict[@"carPlaySetting"]            = @(settings.carPlaySetting);
+            dict[@"alertStyle"]                = @(settings.alertStyle);
+            [weakSelf handleResultWithValue:dict command:command];
+        }];
+    }else if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+        UIUserNotificationSettings *settings = [[UIApplication sharedApplication] currentUserNotificationSettings];
+        UIUserNotificationType type = settings.types;
+        NSNumber *number = [NSNumber numberWithInteger:type];
+        [self handleResultWithValue:number command:command];
+    }else{
+        UIRemoteNotificationType type = [[UIApplication sharedApplication] enabledRemoteNotificationTypes];
+        NSNumber *number = [NSNumber numberWithInteger:type];
+        [self handleResultWithValue:number command:command];
+    }
+}
+
+#pragma mark - ios 10 APIs
+
+-(void)addDismissActions:(CDVInvokedUrlCommand*)command{
+    [self addActions:command dismiss:YES];
+}
+
+-(void)addNotificationActions:(CDVInvokedUrlCommand*)command{
+    [self addActions:command dismiss:NO];
+}
+
+-(void)addActions:(CDVInvokedUrlCommand*)command dismiss:(BOOL)dimiss{
+    NSArray *actionsData     = [command argumentAtIndex:0];
+    NSString *categoryId     = [command argumentAtIndex:1];
+    NSMutableArray *actions  = [NSMutableArray array];
+    for (NSDictionary *dict in actionsData) {
+        NSString *title      = dict[@"title"];
+        NSString *identifier = dict[@"identifier"];
+        NSString *option     = dict[@"option"];
+        NSString *type       = dict[@"type"];
+        if ([type isEqualToString:@"textInput"]) {
+            NSString *textInputButtonTitle = dict[@"textInputButtonTitle"];
+            NSString *textInputPlaceholder = dict[@"textInputPlaceholder"];
+            UNTextInputNotificationAction *inputAction = [UNTextInputNotificationAction actionWithIdentifier:identifier title:title options:option.integerValue textInputButtonTitle:textInputButtonTitle textInputPlaceholder:textInputPlaceholder];
+            [actions addObject:inputAction];
+        }else{
+            UNNotificationAction *action = [UNNotificationAction actionWithIdentifier:title title:title options:option.integerValue];
+            [actions addObject:action];
+        }
+    }
+    UNNotificationCategory *category;
+    if (dimiss) {
+        category = [UNNotificationCategory categoryWithIdentifier:categoryId actions:actions intentIdentifiers:@[] options:UNNotificationCategoryOptionCustomDismissAction];
+    }else{
+        category = [UNNotificationCategory categoryWithIdentifier:categoryId actions:actions intentIdentifiers:@[] options:UNNotificationCategoryOptionNone];
+    }
+    [[UNUserNotificationCenter currentNotificationCenter] setNotificationCategories:[NSSet setWithObject:category]];
+}
+
+#pragma mark - 内部方法
+
+(void)setupJPushSDK:(NSDictionary*)userInfo{
+    NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfig_FileName ofType:@"plist"];
+    if (plistPath == nil) {
+        NSLog(@"error: PushConfig.plist not found");
+        assert(0);
+    }
+
+    NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
+    NSString *appkey       = [plistData valueForKey:JPushConfig_Appkey];
+    NSString *channel      = [plistData valueForKey:JPushConfig_Channel];
+    NSNumber *isProduction = [plistData valueForKey:JPushConfig_IsProduction];
+    NSNumber *isIDFA       = [plistData valueForKey:JPushConfig_IsIDFA];
+
+    NSString *advertisingId = nil;
+    if(isIDFA.boolValue){
+        advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
+    }
+    [JPUSHService setupWithOption:userInfo
+                           appKey:appkey
+                          channel:channel
+                 apsForProduction:[isProduction boolValue]
+            advertisingIdentifier:advertisingId];
+}
+
+#pragma mark 将参数返回给js
+-(void)handleResultWithValue:(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
+                           };
+    [self jpushFireDocumentEvent:JPushDocumentEvent_SetTagsWithAlias jsString:[dict toJsonString]];
+}
+
+- (void)networkDidReceiveMessage:(NSNotification *)notification {
+    if (notification && notification.userInfo) {
+        [self jpushFireDocumentEvent:JPushDocumentEvent_ReceiveMessage jsString:[notification.userInfo  toJsonString]];
+    }
+}
+
+@end
--- a/src/ios/PushConfig.plist
+++ b/src/ios/PushConfig.plist
@@ -2,13 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>APP_KEY</key>
-	<string></string>
-	<key>CHANNEL</key>
+	<key>Appkey</key>
+	<string>1c29cb5814072b5b1f8ef829</string>
+	<key>Channel</key>
 	<string>Subscription</string>
 	<key>IsProduction</key>
 	<false/>
 	<key>IsIDFA</key>
 	<false/>
+	<key>Delay</key>
+	<false/>
 </dict>
 </plist>
--- a/src/ios/lib/JPUSHService.h
+++ b/src/ios/lib/JPUSHService.h
@@ -9,23 +9,109 @@
 * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
 */

-#define JPUSH_VERSION_NUMBER 2.1.8
+#define JPUSH_VERSION_NUMBER 3.0.0

 #import <Foundation/Foundation.h>

@class CLRegion;
@class UILocalNotification;
+@class CLLocation;
+@class UNNotificationCategory;
+@class UNNotificationSettings;
+@class UNNotificationRequest;
+@class UNNotification;
+@protocol JPUSHRegisterDelegate;

 extern NSString *const kJPFNetworkIsConnectingNotification; // 正在连接中
 extern NSString *const kJPFNetworkDidSetupNotification;     // 建立连接
 extern NSString *const kJPFNetworkDidCloseNotification;     // 关闭连接
 extern NSString *const kJPFNetworkDidRegisterNotification;  // 注册成功
+extern NSString *const kJPFNetworkFailedRegisterNotification; //注册失败
 extern NSString *const kJPFNetworkDidLoginNotification;     // 登录成功
 extern NSString *const kJPFNetworkDidReceiveMessageNotification;         // 收到消息(非APNS)
 extern NSString *const kJPFServiceErrorNotification;  // 错误提示

-@class CLLocation;
+typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) {
+    JPAuthorizationOptionNone    = 0,   // the application may not present any UI upon a notification being received
+    JPAuthorizationOptionBadge   = (1 << 0),    // the application may badge its icon upon a notification being received
+    JPAuthorizationOptionSound   = (1 << 1),    // the application may play a sound upon a notification being received
+    JPAuthorizationOptionAlert   = (1 << 2),    // the application may display an alert upon a notification being received
+};

+/*!
+ * 通知注册实体类
+ */
+@interface JPUSHRegisterEntity : NSObject
+
+/*!
+ * 支持的类型
+ * badge,sound,alert
+ */
+@property (nonatomic, assign) NSInteger types;
+/*!
+ * 注入的类别
+ * iOS10 UNNotificationCategory
+ * iOS8-iOS9 UIUserNotificationCategory
+ */
+@property (nonatomic, strong) NSSet *categories;
+@end
+
+/*!
+ * 进行删除、查找推送实体类
+ */
+@interface JPushNotificationIdentifier : NSObject<NSCopying, NSCoding>
+
+@property (nonatomic, copy) NSArray<NSString *> *identifiers; // 推送的标识数组
+@property (nonatomic, copy) UILocalNotification *notificationObj NS_DEPRECATED_IOS(4_0, 10_0);  // iOS10以下可以传UILocalNotification对象数据，iOS10以上无效
+@property (nonatomic, assign) BOOL delivered NS_AVAILABLE_IOS(10_0); // 在通知中心显示的或待推送的标志，默认为NO，YES表示在通知中心显示的，NO表示待推送的
+@property (nonatomic, copy) void (^findCompletionHandler)(NSArray *results); // 用于查询回调，调用[findNotification:]方法前必须设置，results为返回相应对象数组，iOS10以下返回UILocalNotification对象数组；iOS10以上根据delivered传入值返回UNNotification或UNNotificationRequest对象数组（delivered传入YES，则返回UNNotification对象数组，否则返回UNNotificationRequest对象数组）
+
+@end
+
+/*!
+ * 推送内容实体类
+ */
+@interface JPushNotificationContent : NSObject<NSCopying, NSCoding>
+
+@property (nonatomic, copy) NSString *title;                // 推送标题
+@property (nonatomic, copy) NSString *subtitle;             // 推送副标题
+@property (nonatomic, copy) NSString *body;                 // 推送内容
+@property (nonatomic, copy) NSNumber *badge;                // 角标的数字。如果不需要改变角标传@(-1)
+@property (nonatomic, copy) NSString *action NS_DEPRECATED_IOS(8_0, 10_0); // 弹框的按钮显示的内容（IOS 8默认为"打开", 其他默认为"启动",iOS10以上无效）
+@property (nonatomic, copy) NSString *categoryIdentifier;   // 行为分类标识
+@property (nonatomic, copy) NSDictionary *userInfo;         // 本地推送时可以设置userInfo来增加附加信息，远程推送时设置的payload推送内容作为此userInfo
+@property (nonatomic, copy) NSString *sound;                // 声音名称，不设置则为默认声音
+@property (nonatomic, copy) NSArray *attachments NS_AVAILABLE_IOS(10_0);                 // 附件，iOS10以上有效，需要传入UNNotificationAttachment对象数组类型
+@property (nonatomic, copy) NSString *threadIdentifier NS_AVAILABLE_IOS(10_0); // 线程或与推送请求相关对话的标识，iOS10以上有效，可用来对推送进行分组
+@property (nonatomic, copy) NSString *launchImageName NS_AVAILABLE_IOS(10_0);  // 启动图片名，iOS10以上有效，从推送启动时将会用到
+
+@end
+
+/*!
+ * 推送触发方式实体类
+ * 注：dateComponents、timeInterval、region在iOS10以上可选择其中一个参数传入有效值，如果同时传入值会根据优先级I、II、III使其中一种触发方式生效，fireDate为iOS10以下根据时间触发时须传入的参数
+ */
+@interface JPushNotificationTrigger : NSObject<NSCopying, NSCoding>
+
+@property (nonatomic, assign) BOOL repeat;                  // 设置是否重复，默认为NO
+@property (nonatomic, copy) NSDate *fireDate NS_DEPRECATED_IOS(2_0, 10_0);           // 用来设置触发推送的时间，iOS10以上无效
+@property (nonatomic, copy) CLRegion *region NS_AVAILABLE_IOS(8_0);                  // 用来设置触发推送的位置，iOS8以上有效，iOS10以上优先级为I，应用需要有允许使用定位的授权
+@property (nonatomic, copy) NSDateComponents *dateComponents NS_AVAILABLE_IOS(10_0); // 用来设置触发推送的日期时间，iOS10以上有效，优先级为II
+@property (nonatomic, assign) NSTimeInterval timeInterval NS_AVAILABLE_IOS(10_0);    // 用来设置触发推送的时间，iOS10以上有效，优先级为III
+
+@end
+
+/*!
+ * 注册或更新推送实体类
+ */
+@interface JPushNotificationRequest : NSObject<NSCopying, NSCoding>
+
+@property (nonatomic, copy) NSString *requestIdentifier;    // 推送请求标识
+@property (nonatomic, copy) JPushNotificationContent *content; // 设置推送的具体内容
+@property (nonatomic, copy) JPushNotificationTrigger *trigger; // 设置推送的触发方式
+@property (nonatomic, copy) void (^completionHandler)(id result); // 注册或更新推送成功回调，iOS10以上成功则result为UNNotificationRequest对象，失败则result为nil;iOS10以下成功result为UILocalNotification对象，失败则result为nil
+
+@end

 /*!
 * JPush 核心头文件
@@ -77,12 +163,20 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
 * @abstract 注册要处理的远程通知类型
 *
 * @param types 通知类型
- * @param categories
+ * @param categories 类别组
 *
- * @discussion
 */
 + (void)registerForRemoteNotificationTypes:(NSUInteger)types
                                categories:(NSSet *)categories;
+/*!
+ * @abstract 新版本的注册方法（兼容iOS10）
+ *
+ * @param config 注册通知配置
+ * @param delegate 代理
+ *
+ */
+ (void)registerForRemoteNotificationConfig:(JPUSHRegisterEntity *)config delegate:(id<JPUSHRegisterDelegate>)delegate;
+

 + (void)registerDeviceToken:(NSData *)deviceToken;

@@ -99,14 +193,14 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示

 /*!
 * 下面的接口是可选的
- * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：http://docs.jpush.io/client/ios_api/#api-ios）
+ * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：https://docs.jiguang.cn/jpush/client/iOS/ios_api/）
 * setTags:alias:fetchCompletionHandle:是新的设置标签别名的方法，不再需要显示声明回调函数，只需要在block里面处理设置结果即可.
 * WARN: 使用block时需要注意循环引用问题
 */
 + (void) setTags:(NSSet *)tags
           alias:(NSString *)alias
 callbackSelector:(SEL)cbSelector
-          target:(id)theTarget __attribute__((deprecated("JPush 2.1.1 版本已过期")));;
+          target:(id)theTarget __attribute__((deprecated("JPush 2.1.1 版本已过期")));

 + (void) setTags:(NSSet *)tags
           alias:(NSString *)alias
@@ -156,7 +250,7 @@ callbackSelector:(SEL)cbSelector
 + (void)stopLogPageView:(NSString *)pageName;

 /*!
- * @abstract 直接上报在页面的停留时工
+ * @abstract 直接上报在页面的停留时间
 *
 * @param pageName 页面
 * @param seconds 停留的秒数
@@ -192,6 +286,35 @@ callbackSelector:(SEL)cbSelector
 ///----------------------------------------------------
 /// @name Local Notification 本地通知
 ///----------------------------------------------------
+/*!
+ * @abstract 注册或更新推送 (支持iOS10，并兼容iOS10以下版本)
+ *
+ * JPush 2.1.9新接口
+ * @param request JPushNotificationRequest类型，设置推送的属性，设置已有推送的request.requestIdentifier即更新已有的推送，否则为注册新推送，更新推送仅仅在iOS10以上有效，结果通过request.completionHandler返回
+ * @discussion 旧的注册本地推送接口被废弃，使用此接口可以替换
+ *
+ */
+ (void)addNotification:(JPushNotificationRequest *)request;
+
+/*!
+ * @abstract 移除推送 (支持iOS10，并兼容iOS10以下版本)
+ *
+ * JPush 2.1.9新接口
+ * @param identifier JPushNotificationIdentifier类型，iOS10以上identifier设置为nil，则移除所有在通知中心显示推送和待推送请求，也可以通过设置identifier.delivered和identifier.identifiers来移除相应在通知中心显示推送或待推送请求，identifier.identifiers如果设置为nil或空数组则移除相应标志下所有在通知中心显示推送或待推送请求；iOS10以下identifier设置为nil，则移除所有推送，identifier.delivered属性无效，另外可以通过identifier.notificationObj传入特定推送对象来移除此推送。
+ * @discussion 旧的所有删除推送接口被废弃，使用此接口可以替换
+ *
+ */
+ (void)removeNotification:(JPushNotificationIdentifier *)identifier;
+
+/*!
+ * @abstract 查找推送 (支持iOS10，并兼容iOS10以下版本)
+ *
+ * JPush 2.1.9新接口
+ * @param identifier JPushNotificationIdentifier类型，iOS10以上可以通过设置identifier.delivered和identifier.identifiers来查找相应在通知中心显示推送或待推送请求，identifier.identifiers如果设置为nil或空数组则返回相应标志下所有在通知中心显示推送或待推送请求；iOS10以下identifier.delivered属性无效，identifier.identifiers如果设置nil或空数组则返回所有推送。须要设置identifier.findCompletionHandler回调才能得到查找结果，通过(NSArray *results)返回相应对象数组。
+ * @discussion 旧的查找推送接口被废弃，使用此接口可以替换
+ *
+ */
+ (void)findNotification:(JPushNotificationIdentifier *)identifier;

 /*!
 * @abstract 本地推送，最多支持64个
@@ -204,7 +327,7 @@ callbackSelector:(SEL)cbSelector
 * @param userInfo 自定义参数，可以用来标识推送和增加附加信息
 * @param soundName 自定义通知声音，设置为nil为默认声音
 *
- * @discussion 最多支持 64 个定义
+ * @discussion 最多支持 64 个定义，此方法被[addNotification:]方法取代
 */
 + (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
                                    alertBody:(NSString *)alertBody
@@ -212,7 +335,7 @@ callbackSelector:(SEL)cbSelector
                                  alertAction:(NSString *)alertAction
                                identifierKey:(NSString *)notificationKey
                                     userInfo:(NSDictionary *)userInfo
-                                    soundName:(NSString *)soundName;
+                                    soundName:(NSString *)soundName __attribute__((deprecated("JPush 2.1.9 版本已过期")));

 /*!
 * @abstract 本地推送 (支持 iOS8 新参数)
@@ -221,6 +344,7 @@ callbackSelector:(SEL)cbSelector
 * @param region 自定义参数
 * @param regionTriggersOnce 自定义参数
 * @param category 自定义参数
+ * @discussion 此方法被[addNotification:]方法取代
 */
 + (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
                                    alertBody:(NSString *)alertBody
@@ -231,7 +355,7 @@ callbackSelector:(SEL)cbSelector
                                    soundName:(NSString *)soundName
                                       region:(CLRegion *)region
                           regionTriggersOnce:(BOOL)regionTriggersOnce
-                                     category:(NSString *)category NS_AVAILABLE_IOS(8_0);
+                                     category:(NSString *)category NS_AVAILABLE_IOS(8_0) __attribute__((deprecated("JPush 2.1.9 版本已过期")));

 /*!
 * @abstract 前台展示本地推送
@@ -239,35 +363,38 @@ callbackSelector:(SEL)cbSelector
 * @param notification 本地推送对象
 * @param notificationKey 需要前台显示的本地推送通知的标示符
 *
- * @discussion 默认App在前台运行时不会进行弹窗，在程序接收通知调用此接口可实现指定的推送弹窗。
+ * @discussion 默认App在前台运行时不会进行弹窗，在程序接收通知调用此接口可实现指定的推送弹窗。--iOS10以下还可继续使用，iOS10以上在[UNUserNotificationCenterDelegate willPresentNotification:withCompletionHandler:]方法中调用completionHandler(UNNotificationPresentationOptionSound | UNNotificationPresentationOptionAlert);即可
 */
 + (void)showLocalNotificationAtFront:(UILocalNotification *)notification
-                       identifierKey:(NSString *)notificationKey;
+                       identifierKey:(NSString *)notificationKey __attribute__((deprecated("JPush 2.1.9 版本已过期")));
 /*!
 * @abstract 删除本地推送定义
 *
 * @param notificationKey 本地推送标示符
- * @param myUILocalNotification 本地推送对象
+ * @discussion 此方法被[removeNotification:]方法取代
 */
-+ (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey;
+ (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey __attribute__((deprecated("JPush 2.1.9 版本已过期")));

 /*!
 * @abstract 删除本地推送定义
+ * @discussion 此方法被[removeNotification:]方法取代
 */
-+ (void)deleteLocalNotification:(UILocalNotification *)localNotification;
+ (void)deleteLocalNotification:(UILocalNotification *)localNotification __attribute__((deprecated("JPush 2.1.9 版本已过期")));

 /*!
 * @abstract 获取指定通知
 *
 * @param notificationKey 本地推送标示符
 * @return 本地推送对象数组, [array count]为0时表示没找到
+ * @discussion 此方法被[findNotification:]方法取代
 */
-+ (NSArray *)findLocalNotificationWithIdentifier:(NSString *)notificationKey;
+ (NSArray *)findLocalNotificationWithIdentifier:(NSString *)notificationKey __attribute__((deprecated("JPush 2.1.9 版本已过期")));

 /*!
 * @abstract 清除所有本地推送对象
+ * @discussion 此方法被[removeNotification:]方法取代
 */
-+ (void)clearAllLocalNotifications;
+ (void)clearAllLocalNotifications __attribute__((deprecated("JPush 2.1.9 版本已过期")));


 ///----------------------------------------------------
@@ -313,11 +440,13 @@ callbackSelector:(SEL)cbSelector
 *
 * JPush 支持根据 registrationID 来进行推送.
 * 如果你需要此功能, 应该通过此接口获取到 registrationID 后, 上报到你自己的服务器端, 并保存下来.
- *
+ * registrationIDCompletionHandler:是新增的获取registrationID的方法，需要在block中获取registrationID,resCode为返回码,模拟器调用此接口resCode返回1011,registrationID返回nil.
 * 更多的理解请参考 JPush 的文档网站.
 */
 + (NSString *)registrationID;

+ (void)registrationIDCompletionHandler:(void(^)(int resCode,NSString *registrationID))completionHandler;
+
 /*!
 * @abstract 打开日志级别到 Debug
 *
@@ -342,5 +471,26 @@ callbackSelector:(SEL)cbSelector
 */
 + (void)setLogOFF;

+@end
+
+@class UNUserNotificationCenter;
+@class UNNotificationResponse;
+
+@protocol JPUSHRegisterDelegate <NSObject>
+
+/*
+ * @brief handle UserNotifications.framework [willPresentNotification:withCompletionHandler:]
+ * @param center [UNUserNotificationCenter currentNotificationCenter] 新特性用户通知中心
+ * @param notification 前台得到的的通知对象
+ * @param completionHandler 该callback中的options 请使用UNNotificationPresentationOptions
+ */
+- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger options))completionHandler;
+/*
+ * @brief handle UserNotifications.framework [didReceiveNotificationResponse:withCompletionHandler:]
+ * @param center [UNUserNotificationCenter currentNotificationCenter] 新特性用户通知中心
+ * @param response 通知响应对象
+ * @param completionHandler
+ */
+- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler;

@end
--- a/src/ios/lib/jcore-ios-1.0.0.a
+++ b/src/ios/lib/jcore-ios-1.0.0.a
--- a/src/ios/lib/jpush-ios-2.1.8.a
+++ b/src/ios/lib/jpush-ios-2.1.8.a
--- a/src/ios/lib/jpush-ios-3.0.0.a
+++ b/src/ios/lib/jpush-ios-3.0.0.a
--- a/src/ios/notificationService/NotificationService.h
+++ b/src/ios/notificationService/NotificationService.h
@@ -0,0 +1,13 @@
+//
+//  NotificationService.h
+//  jpushNotificationService
+//
+//  Created by wuxingchen on 16/10/10.
+//
+//
+
+#import <UserNotifications/UserNotifications.h>
+
+@interface NotificationService : UNNotificationServiceExtension
+
+@end
--- a/src/ios/notificationService/NotificationService.m
+++ b/src/ios/notificationService/NotificationService.m
@@ -0,0 +1,44 @@
+//
+//  NotificationService.m
+//  jpushNotificationService
+//
+//  Created by wuxingchen on 16/10/10.
+//
+//
+
+#import "NotificationService.h"
+#import <UIKit/UIKit.h>
+
+@interface NotificationService ()
+
+@property (nonatomic, strong) void (^contentHandler)(UNNotificationContent *contentToDeliver);
+@property (nonatomic, strong) UNMutableNotificationContent *bestAttemptContent;
+
+@end
+
+@implementation NotificationService
+
+- (void)didReceiveNotificationRequest:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent * _Nonnull))contentHandler {
+
+    self.contentHandler = contentHandler;
+    self.bestAttemptContent = [request.content mutableCopy];
+
+    @try {
+        NSString *urlStr = [request.content.userInfo valueForKey:@"JPushPluginAttachment"];
+        NSArray *urls = [urlStr componentsSeparatedByString:@"."];
+        NSURL *urlNative = [[NSBundle mainBundle] URLForResource:urls[0] withExtension:urls[1]];
+        UNNotificationAttachment *attachment = [UNNotificationAttachment attachmentWithIdentifier:urlStr URL:urlNative options:nil error:nil];
+        self.bestAttemptContent.attachments = @[attachment];
+    } @catch (NSException *exception) {
+    }
+
+    self.contentHandler(self.bestAttemptContent);
+}
+
+- (void)serviceExtensionTimeWillExpire {
+    // Called just before the extension will be terminated by the system.
+    // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used.
+    self.contentHandler(self.bestAttemptContent);
+}
+
+@end
--- a/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -1,216 +1,166 @@
+var JPushPlugin = function () {}

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

 JPushPlugin.prototype.receiveMessage = {}
 JPushPlugin.prototype.openNotification = {}
 JPushPlugin.prototype.receiveNotification = {}

-
-JPushPlugin.prototype.isPlatformIOS = function() {
-	var isPlatformIOS = device.platform == "iPhone"
-		|| device.platform == "iPad"
-		|| device.platform == "iPod touch"
-		|| device.platform == "iOS";
-	return isPlatformIOS;
+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);
-	return ret;
+JPushPlugin.prototype.call_native = function (name, args, callback) {
+  ret = cordova.exec(callback, this.error_callback, 'JPushPlugin', name, args)
+  return ret
 }

 // 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.init = function () {
+  if (this.isPlatformIOS()) {
+    this.call_native('initial', [], null)
+  } else {
+    this.call_native('init', [], null)
+  }
 }

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

-JPushPlugin.prototype.stopPush = function() {
-	data = [];
-	this.call_native("stopPush", data, null);
+JPushPlugin.prototype.stopPush = function () {
+  this.call_native('stopPush', [], null)
 }

-JPushPlugin.prototype.resumePush = function() {
-	data = [];
-	this.call_native("resumePush", data, null);
+JPushPlugin.prototype.resumePush = function () {
+  this.call_native('resumePush', [], null)
 }

-JPushPlugin.prototype.isPushStopped = function(callback) {
-	data = [];
-	this.call_native("isPushStopped", data, callback);
+JPushPlugin.prototype.isPushStopped = function (callback) {
+  this.call_native('isPushStopped', [], 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];
-		arrayTagWithAlias.unshift(alias);
-		this.call_native("setTagsWithAlias", arrayTagWithAlias, null);
-	} catch(exception) {
-    	console.log(exception);
-	}
+
+JPushPlugin.prototype.startJPushSDK = function () {
+  this.call_native('startJPushSDK', [] , null)
 }

-JPushPlugin.prototype.setTags = function(tags) {
-	try {
-		this.call_native("setTags", tags, null);
-	} catch(exception) {
-		console.log(exception);
-	}
+JPushPlugin.prototype.setTagsWithAlias = function (tags, alias) {
+  if (tags == null) {
+    this.setAlias(alias)
+    return
+  }
+  if (alias == null) {
+    this.setTags(tags)
+    return
+  }
+  var arrayTagWithAlias = [tags]
+  arrayTagWithAlias.unshift(alias)
+  this.call_native('setTagsWithAlias', arrayTagWithAlias, null)
 }

-JPushPlugin.prototype.setAlias = function(alias) {
-	try {
-		this.call_native("setAlias", [alias], null);
-	} catch(exception) {
-		console.log(exception);
-	}
+JPushPlugin.prototype.setTags = function (tags) {
+  this.call_native('setTags', tags, null)
 }

-JPushPlugin.prototype.setBadge = function(value) {
-	if(this.isPlatformIOS()) {
-		try {
-			this.call_native("setBadge", [value], null);
-		} catch(exception) {
-			console.log(exception);
-		}
-	}
+JPushPlugin.prototype.setAlias = function (alias) {
+  this.call_native('setAlias', [alias], null)
 }

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

-JPushPlugin.prototype.setDebugModeFromIos = function() {
-	if(this.isPlatformIOS()) {
-		var data = [];
-    	this.call_native("setDebugModeFromIos", [data], null);
-	}
+JPushPlugin.prototype.resetBadge = function () {
+  if (this.isPlatformIOS()) {
+    this.call_native('resetBadge', [], null)
+  }
 }

-JPushPlugin.prototype.setLogOFF = function() {
-	if(this.isPlatformIOS()) {
-  		var data = [];
-    	this.call_native("setLogOFF", [data], null);
-	}
+JPushPlugin.prototype.setDebugModeFromIos = function () {
+  if (this.isPlatformIOS()) {
+    this.call_native('setDebugModeFromIos', [], null)
+  }
 }

-JPushPlugin.prototype.setCrashLogON = function() {
-    if (this.isPlatformIOS()) {
-        var data = [];
-        this.call_native("crashLogON", [data], null);
-    }
+JPushPlugin.prototype.setLogOFF = function () {
+  if (this.isPlatformIOS()) {
+    this.call_native('setLogOFF', [], 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.setCrashLogON = function () {
+  if (this.isPlatformIOS()) {
+    this.call_native('crashLogON', [], null)
+  }
 }

-JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function(
-	identifierKey) {
-    if (this.isPlatformIOS()) {
-        var data = [identifierKey];
-        this.call_native("deleteLocalNotificationWithIdentifierKey", data, null);
-    }
+JPushPlugin.prototype.addLocalNotificationForIOS = function (delayTime, content,
+  badge, notificationID, extras) {
+  if (this.isPlatformIOS()) {
+    this.call_native('setLocalNotification', [delayTime, content, badge, notificationID, extras], null)
+  }
 }

-JPushPlugin.prototype.clearAllLocalNotifications = function(){
-    if (this.isPlatformIOS()) {
-        var data = [];
-        this.call_native("clearAllLocalNotifications", data, null);
-    }
+JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function (identifierKey) {
+  if (this.isPlatformIOS()) {
+    this.call_native('deleteLocalNotificationWithIdentifierKey', [identifierKey], null)
+  }
 }

-JPushPlugin.prototype.setLocation = function(latitude, longitude){
-    if (this.isPlatformIOS()) {
-        var data = [latitude, longitude];
-        this.call_native("setLocation", data, null);
-    }
+JPushPlugin.prototype.clearAllLocalNotifications = function () {
+  if (this.isPlatformIOS()) {
+    this.call_native('clearAllLocalNotifications', [], 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);
-	}
+JPushPlugin.prototype.setLocation = function (latitude, longitude) {
+  if (this.isPlatformIOS()) {
+    this.call_native('setLocation', [latitude, longitude], null)
+  }
 }

-JPushPlugin.prototype.startLogPageView = function(pageName) {
-	if(this.isPlatformIOS()) {
-		this.call_native("startLogPageView", [pageName], null);
-  	}
+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.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.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.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.getApplicationIconBadgeNumber = function (callback) {
+  if (this.isPlatformIOS()) {
+    this.call_native('getApplicationIconBadgeNumber', [], callback)
+  }
 }

-
 // 判断系统设置中是否对本应用启用通知。
 // iOS: 返回值如果大于 0，代表通知开启；0: 通知关闭。
 //		UIRemoteNotificationTypeNone    = 0,
@@ -219,162 +169,149 @@ JPushPlugin.prototype.getApplicationIconBadgeNumber = function(callback) {
 //    	UIRemoteNotificationTypeAlert   = 1 << 2,
 //    	UIRemoteNotificationTypeNewsstandContentAvailability = 1 << 3,
 // Android: 返回值 1 代表通知启用、0: 通知关闭。
-JPushPlugin.prototype.getUserNotificationSettings = function(callback) {
-	if(this.isPlatformIOS()) {
-		this.call_native("getUserNotificationSettings", [], callback);
-	} else if (device.platform == "Android") {
-		this.call_native("areNotificationEnabled", [], callback);
-	}
+JPushPlugin.prototype.getUserNotificationSettings = function (callback) {
+  if (this.isPlatformIOS()) {
+    this.call_native('getUserNotificationSettings', [], callback)
+  } else if (device.platform == 'Android') {
+    this.call_native('areNotificationEnabled', [], callback)
+  }
+}
+
+JPushPlugin.prototype.addDismissActions = function (actions, categoryId) {
+  this.call_native('addDismissActions', [actions, categoryId])
+}
+
+JPushPlugin.prototype.addNotificationActions = function (actions, categoryId) {
+  this.call_native('addNotificationActions', [actions, categoryId])
 }

 // Android methods
-JPushPlugin.prototype.setDebugMode = function(mode) {
-	if(device.platform == "Android") {
-		this.call_native("setDebugMode", [mode], null);
-	}
+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.setBasicPushNotificationBuilder = function () {
+  if (device.platform == 'Android') {
+    this.call_native('setBasicPushNotificationBuilder', [], null)
+  }
 }

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

-JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data) {
-	try {
-		console.log("JPushPlugin:receiveMessageInAndroidCallback");
-		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.receiveMessageInAndroidCallback = function (data) {
+  data = JSON.stringify(data)
+  console.log('JPushPlugin:receiveMessageInAndroidCallback: ' + data)
+  this.receiveMessage = JSON.parse(data)
+  cordova.fireDocumentEvent('jpush.receiveMessage', this.receiveMessage)
 }

-JPushPlugin.prototype.openNotificationInAndroidCallback = function(data) {
-	try {
-		console.log("JPushPlugin:openNotificationInAndroidCallback");
-		data = JSON.stringify(data);
-		var bToObj = JSON.parse(data);
-		this.openNotification = bToObj;
-		cordova.fireDocumentEvent('jpush.openNotification', null);
-	} catch(exception) {
-		console.log(exception);
-	}
+JPushPlugin.prototype.openNotificationInAndroidCallback = function (data) {
+  data = JSON.stringify(data)
+  console.log('JPushPlugin:openNotificationInAndroidCallback: ' + data)
+  this.openNotification = JSON.parse(data)
+  cordova.fireDocumentEvent('jpush.openNotification', this.openNotification)
 }

-JPushPlugin.prototype.receiveNotificationInAndroidCallback = function(data) {
-	try{
-		console.log("JPushPlugin:receiveNotificationInAndroidCallback");
-		data = JSON.stringify(data);
-		var bToObj = JSON.parse(data);
-		this.receiveNotification = bToObj;
-		cordova.fireDocumentEvent('jpush.receiveNotification', null);
-	} catch(exception) {
-		console.log(exception);
-	}
+JPushPlugin.prototype.receiveNotificationInAndroidCallback = function (data) {
+  data = JSON.stringify(data)
+  console.log('JPushPlugin:receiveNotificationInAndroidCallback: ' + data)
+  this.receiveNotification = JSON.parse(data)
+  cordova.fireDocumentEvent('jpush.receiveNotification', this.receiveNotification)
 }

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

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

-JPushPlugin.prototype.setLatestNotificationNum = function(num) {
-	if(device.platform == "Android") {
-		this.call_native("setLatestNotificationNum", [num], null);
-	}
+JPushPlugin.prototype.setLatestNotificationNum = function (num) {
+  if (device.platform == 'Android') {
+    this.call_native('setLatestNotificationNum', [num], null)
+  }
 }

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

-JPushPlugin.prototype.removeLocalNotification = function(notificationID) {
-	if(device.platform == "Android") {
-		this.call_native("removeLocalNotification", [notificationID], 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.clearLocalNotifications = function () {
+  if (device.platform == 'Android') {
+    this.call_native('clearLocalNotifications', [], null)
+  }
 }

-JPushPlugin.prototype.reportNotificationOpened = function(msgID) {
-	if(device.platform == "Android") {
-		this.call_native("reportNotificationOpened", [msgID], 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);
-	}
+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);
-	}
+ * 用于在 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(startHour, startMinute, endHour, endMinute) {
-	if (device.platform == "Android") {
-		this.call_native("setSilenceTime", [startHour, startMinute, endHour, endMinute], null);
-	}
+JPushPlugin.prototype.setSilenceTime = function (startHour, startMinute, endHour, endMinute) {
+  if (device.platform == 'Android') {
+    this.call_native('setSilenceTime', [startHour, startMinute, endHour, endMinute], null)
+  }
 }

-JPushPlugin.prototype.setPushTime = function(weekdays, startHour, endHour) {
-	if (device.platform == "Android") {
-		this.call_native("setPushTime", [weekdays, startHour, endHour], null);
-	}
+JPushPlugin.prototype.setPushTime = function (weekdays, startHour, endHour) {
+  if (device.platform == 'Android') {
+    this.call_native('setPushTime', [weekdays, startHour, endHour], null)
+  }
 }

-if(!window.plugins) {
-	window.plugins = {};
+if (!window.plugins) {
+  window.plugins = {}
 }

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

-module.exports = new JPushPlugin();
+module.exports = new JPushPlugin()
Author	SHA1	Message	Date
pikacode	423304c5dc	Merge branch 'dev'	2016-12-15 16:02:27 +08:00
pikacode	5d7181a659	update package.json	2016-12-15 16:01:51 +08:00
pikacode	eb0595e5c0	iOS - add API 1.增加延迟启动 API 2.增加 doc 说明 3.优化代码	2016-12-15 14:51:15 +08:00
pikacode	c2f1bc86bf	Merge branch 'dev'	2016-12-12 10:45:48 +08:00
pikacode	30fbc6094f	iOS - fix #191	2016-12-12 10:41:38 +08:00
pikacode	d39dea2441	Merge branch 'dev'	2016-12-09 10:13:56 +08:00
pikacode	abfcd3c93a	iOS - update 1.fix a bug	2016-12-08 15:31:13 +08:00
pikacode	399d159757	Merge branch 'dev'	2016-12-08 10:34:48 +08:00
pikacode	b96e36d6aa	iOS - fix #188	2016-12-08 10:33:36 +08:00
Hevin	78310e5c69	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-12-07 00:20:56 +08:00
Hevin	fbad235605	Update README 更新 README 徽章中的版本号。	2016-12-07 00:12:36 +08:00
Hevin	fa8700f05d	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-12-06 23:53:31 +08:00
Hevin	cf7a481921	Update Android SDK to 3.0.0 & npm version.	2016-12-06 23:49:22 +08:00
pikacode	7f0eb6166d	Merge branch 'dev'	2016-12-06 14:33:34 +08:00
pikacode	dfaf84b695	iOS - update SDK 3.0.0	2016-12-06 14:25:15 +08:00
pikacode	b67b022db3	update demo	2016-12-06 13:59:33 +08:00
pikacode	309131e944	iOS - update 1.增加本地通知事件 2.更新 doc 3.fix bug	2016-12-06 13:56:27 +08:00
Hevin	e153e6685c	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-12-05 17:50:28 +08:00
Hevin	7ca29c3397	Update README. 增加对于 App 关闭后就收不到通知的说明。	2016-12-05 17:44:36 +08:00
Hevin	1339c0dde4	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-12-05 14:44:08 +08:00
Hevin	637624edab	Update Android_detail_api.md & Optimize JPushPlugin.js	2016-12-05 14:43:08 +08:00
Hevin	3adbc003b0	Update Common_detail_api.md 规范文档格式。	2016-11-30 16:29:36 +08:00
Hevin Lau	a88765e3ec	Update README	2016-11-30 15:57:39 +08:00
Hevin Lau	27b9ded064	更新文档、改正语法错误、规范格式	2016-11-30 15:55:32 +08:00
pikacode	6d0dce371e	iOS - update 1.更新 SDK 2.删除过期方法 3.更新过期方法 4.删除重复方法 5.发现并修复 bug 6.优化代码 7.更新 doc	2016-11-29 17:48:07 +08:00
Hevin	67e899fa72	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-11-23 10:13:15 +08:00
Hevin	1cbd1b6e9d	Update README	2016-11-23 10:11:21 +08:00
Hevin	62dca46c8e	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-11-04 17:04:38 +08:00
Hevin	7ce63d7cb9	Update README & npm version.	2016-11-04 17:02:56 +08:00
Hevin	54743f8bf5	Update Andoird SDK to v2.2.0	2016-11-04 12:24:26 +08:00
pikacode	27c5d80655	Merge branch 'dev'	2016-10-17 14:29:02 +08:00
pikacode	fe63a9f47f	iOS - update README.md 1.更新 README.md	2016-10-17 14:28:34 +08:00
pikacode	86fa5f3c23	Merge branch 'dev'	2016-10-17 14:25:58 +08:00
pikacode	1afa09cf25	iOS - update README.md 1.更新 README.md	2016-10-17 14:07:52 +08:00
Hevin Lau	4e579e6947	Merge branch 'dev'	2016-10-17 10:46:39 +08:00
pikacode	ff8032e88c	Merge branch 'dev'	2016-10-17 10:06:06 +08:00
Hevin Lau	9df019fb98	Update version number.	2016-10-17 10:05:51 +08:00
pikacode	29cbfc5448	Update iOS_API.md	2016-10-14 10:46:24 +08:00
pikacode	9b38c7744c	Update iOS_API.md	2016-10-14 10:29:18 +08:00
pikacode	cffcbc1a08	iOS - update doc	2016-10-14 10:23:48 +08:00
pikacode	ca72e500d1	iOS - doc update	2016-10-14 10:15:40 +08:00
pikacode	1a8cba8e75	iOS - add APIs & doc 1.增加 API - addDismissActions 2.增加 API - addNotificationActions 3.增加封装类 NotificationService 4.更新对应文档	2016-10-13 09:49:56 +08:00
Hevin	9887672545	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-09-26 12:37:08 +08:00
Hevin	c627166521	Update Android doc.	2016-09-26 12:34:59 +08:00
Hevin Lau	4f8288107e	Merge branch 'dev'	2016-09-22 18:02:41 +08:00
pikacode	0342577830	iOS - update support iOS 10 1.支持 iOS 10 设备推送。	2016-09-22 17:06:30 +08:00
E.B	116ac90492	iOS - update SDK v2.1.9 1.更新 iOS SDK v2.1.9	2016-09-22 14:15:14 +08:00
Hevin	a525ddc7df	Update Android SDK to 2.1.9	2016-09-19 10:17:56 +08:00
E.B	149083b8f4	iOS fix spelling errors 1.修改拼写错误	2016-08-01 10:34:50 +08:00
Hevin Lau	be7b9aa8ac	Update README & license.	2016-08-01 00:08:51 +08:00
Hevin	714a811ef2	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-07-22 11:22:04 +08:00
Hevin	13120cb88e	Format README	2016-07-21 17:09:58 +08:00
Hevin	a365c632d4	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-21 17:05:53 +08:00
Hevin	1d1d7bbec8	Update README	2016-07-21 17:04:24 +08:00
Hevin	abac27de1a	Update plugin.xml	2016-07-21 17:02:33 +08:00
Hevin	9cc27db799	Format doc.	2016-07-21 16:34:07 +08:00
Hevin	0c6450231b	Fix API doc.	2016-07-21 16:31:15 +08:00
Hevin	c3171e716a	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-21 16:27:19 +08:00
Hevin	e24d15db97	Update API doc.	2016-07-21 16:25:37 +08:00
Hevin	3101dcdd8e	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-20 14:41:42 +08:00
Hevin	a46da92fa1	Format js file.	2016-07-20 14:40:40 +08:00
Hevin	5547d5716e	Update event callback.	2016-07-20 14:34:35 +08:00
Hevin	7da0a25db0	Format js.	2016-07-19 17:15:40 +08:00
Hevin	0c74ff328d	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-07-19 17:13:58 +08:00
Hevin	2065ad44ce	Format README.	2016-07-18 16:39:15 +08:00
Hevin	cbe8e511f2	Update README	2016-07-18 16:06:14 +08:00
Hevin	9a47c88873	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-16 00:17:25 +08:00
Hevin	684039b044	Format README	2016-07-15 18:02:02 +08:00
Hevin	356de48d31	Format README	2016-07-15 18:00:39 +08:00
Hevin	d412b10d3e	Update README	2016-07-15 17:56:39 +08:00
Hevin	44345d9753	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-13 23:08:30 +08:00
Hevin	5f93fc3f49	Update API to don't depend support lib.	2016-07-13 23:07:01 +08:00
Hevin	673a402c51	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-07-13 22:23:37 +08:00
Hevin	09e0d62360	Update README	2016-07-13 22:03:35 +08:00
Hevin	b4830d4ef7	Remove dependency.	2016-07-13 16:34:40 +08:00
Hevin	2c3bf53792	Update npm version.	2016-07-12 14:57:58 +08:00
Hevin	78ebe0e787	Update plugin id.	2016-07-12 14:51:20 +08:00