Merge remote-tracking branch 'refs/remotes/origin/dev'

Update README & npm version.
Update Andoird SDK to v2.2.0
2026-01-28 00:00:03 +08:00 · 2016-11-04 17:04:38 +08:00 · 2016-11-04 17:02:56 +08:00 · 2016-11-04 12:24:26 +08:00 · 2016-10-17 14:29:02 +08:00 · 2016-10-17 14:28:34 +08:00
42 changed files with 800 additions and 277 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![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.4-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-2.2.7-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)

@@ -13,81 +13,68 @@

 > QQ 交流群：413602425。

-## 集成步骤
+## Install

- 先安装 cordova-plugin-device 插件：
+- 通过 Cordova Plugins 安装，要求 Cordova CLI 5.0+：

-        cordova plugin add cordova-plugin-device
+  	    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
+        cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable API_KEY=your_jpush_appkey  

-  - 或者直接通过 url 安装：
+- 或下载到本地安装：

-          cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable API_KEY=your_jpush_appkey  
-
-  - 或下载到本地安装：
-
-          cordova plugin add Your_Plugin_Path  --variable API_KEY=your_jpush_appkey
+        cordova plugin add Your_Plugin_Path  --variable API_KEY=your_jpush_appkey


-## Demo
+## Usage
+### API
+- [公共 API](/doc/Common_detail_api.md)
+- [iOS API](/doc/iOS_API.md)
+- [Android API](/doc/Android_detail_api.md)
+
+### 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 说明
-
-插件的 API 在 JPushPlugin.js 文件中，该文件的具体位置如下：
-### Android
-	[Project]/assets/www/plugins/cn.jpush.phonegap.JPushPlugin/www
-
-### iOS
-	[Project]/www/plugins/cn.jpush.phonegap.JPushPlugin/www
-
-### 具体的 API 请参考：
-
- [公共 API](/doc/Common_detail_api.md)。
-
- [iOS API](/doc/iOS_API.md)。
-
- [Android API](/doc/Android_detail_api.md)。
-
-
-## 常见问题
-
-若要使用 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)。
+## FAQ
+> 如果遇到了疑问，请优先参考 Demo 和 API 文档。若还无法解决，可访问[极光社区](http://community.jiguang.cn/)或 [Issues](https://github.com/jpush/jpush-phonegap-plugin/issues) 提问。

 ### Android
-
- Eclipse 中 import PhoneGap 工程之后出现：*Type CallbackContext cannot be resolved to a type*。
-
-  解决方案：Eclipse 中右键单击工程名，Build Path -> Config Build Path -> Projects -> 选中工程名称 -> CordovaLib -> 点击 add。
+#### 在 Eclipse 中 import 工程之后出现：*Type CallbackContext cannot be resolved to a type*。
+右键单击工程名 -> Build Path -> Config Build Path -> Projects -> 选中工程名称 -> CordovaLib -> 点击 add。

 ### iOS
+#### PushConfig.plist 文件中的字段都是什么意思？
+- APP_KEY：应用标识。
+- CHANNEL：渠道标识。
+- IsProduction：是否生产环境。
+- IsIDFA：是否使用 IDFA 启动 SDK。

- 设置 PushConfig.plist：
-	- APP_KEY：应用标识。
-	- CHANNEL：渠道标识。
-	- IsProduction：是否生产环境。
-	- IsIDFA：是否使用 IDFA 启动 SDK。
+#### 刚集成完插件收不到推送怎么办？
+请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)。

+#### iOS 集成插件白屏、或无法启动插件、或打包报错无法找到需要引入的文件怎么办?
+按照以下步骤逐个尝试：

- 收不到推送：
-	请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)。
+- 升级至 Xcode 8
+- 先删除插件、再重装插件
+- 先使用 `cordova platform add ios`，后使用 `cordova plugin add`

+## Support
+- QQ 群：413602425
+- [JPush 官网文档](http://docs.jpush.io/)
+- [极光社区](http://community.jiguang.cn/)

-## 更多
- QQ 群：413602425；
- [JPush 官网文档](http://docs.jpush.io/)；
- 如有问题可访问[极光社区](http://community.jiguang.cn/)。
+## Contribute
+Please contribute! [Look at the issues](https://github.com/jpush/jpush-phonegap-plugin/issues).
+
+## License
+MIT © [JiGuang](/license)
--- a/doc/Android_detail_api.md
+++ b/doc/Android_detail_api.md
@@ -201,7 +201,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
@@ -86,14 +86,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
--- a/doc/iOS_API.md
+++ b/doc/iOS_API.md
@@ -4,9 +4,9 @@
 - [获取 RegistrationID](#获取-registrationid)
 - [别名与标签](#别名与标签)
 - [获取 APNS 推送内容](#获取-apns-推送内容)
-	- [点击推送通知](#点击推送通知)
-	- [前台收到推送](#前台收到推送)
-	- [后台收到推送](#后台收到推送)
+  - [点击推送通知](#点击推送通知)
+  - [前台收到推送](#前台收到推送)
+  - [后台收到推送](#后台收到推送)
 - [获取自定义消息内容](#获取自定义消息内容)
 - [设置Badge](#设置badge)
 - [本地通知](#本地通知)
@@ -14,6 +14,8 @@
 - [日志等级设置](#日志等级设置)
 - [地理位置上报](#地理位置上报)
 - [设备平台判断](#设备平台判断)
+- [iOS 10 进阶推送特性](#ios-10-进阶推送特性)
+- [获取用户推送设置](#获取用户推送设置)

 ## 开始与停止推送服务

@@ -147,50 +149,50 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

 #### 参数说明
 * tags:
-	* 参数类型为数组。
-	* nil 此次调用不设置此值。
-	* 空集合表示取消之前的设置。
-	* 每次调用至少设置一个 tag，覆盖之前的设置，不是新增。
-	* 有效的标签组成：字母（区分大小写）、数字、下划线、汉字。
-	* 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节（判断长度需采用UTF-8编码）。
-	* 单个设备最多支持设置 100 个 tag，App 全局 tag 数量无限制。
+  * 参数类型为数组。
+  * nil 此次调用不设置此值。
+  * 空集合表示取消之前的设置。
+  * 每次调用至少设置一个 tag，覆盖之前的设置，不是新增。
+  * 有效的标签组成：字母（区分大小写）、数字、下划线、汉字。
+  * 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节（判断长度需采用UTF-8编码）。
+  * 单个设备最多支持设置 100 个 tag，App 全局 tag 数量无限制。
 * alias:
-	* 参数类型为字符串。
-	* nil 此次调用不设置此值。
-	* 空字符串 （""）表示取消之前的设置。
-	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
-	* 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。
+  * 参数类型为字符串。
+  * 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)
-        }
+	var onTagsWithAlias = function(event) {
+	    try {
+	       console.log("onTagsWithAlias");    
+	       var result = "result code:"+event.resultCode + " ";
+	       result += "tags:" + event.tags + " ";
+	       result += "alias:" + event.alias + " ";
+	       $("#tagAliasResult").html(result);
+	    } catch(exception) {
+	       console.log(exception)
+	    }
   	}

 #### 错误码定义

-|Code|描述                   		       |详细解释 |
-|----|:----------------------------------------|:--------|
-|6001|无效的设置，tag/alias 不应参数都为 null  |   	 |
-|6002|设置超时			       	       |建议重试。|
-|6003|alias 字符串不合法	               |有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
-|6004|alias超长			       |最多 40个字节	中文 UTF-8 是 3 个字节。|
-|6005|某一个 tag 字符串不合法		       |有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
-|6006|某一个 tag 超长			       |一个 tag 最多 40个字节	中文 UTF-8 是 3 个字节。|
-|6007|tags 数量超出限制(最多 100 个)	       |这是一台设备的限制。一个应用全局的标签数量无限制。|
-|6008|tag/alias 超出总长度限制	       	       |总长度最多 1K 字节。|
-|6011|10s内设置tag或alias大于3次	       |短时间内操作过于频繁。|
+| 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 +207,28 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

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

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

 - onOpenNotification 需要这样写：

-		var onOpenNotification = function(event) {
-			var alertContent;
-			alertContent = event.aps.alert;
-			alert("open Notificaiton:" + alertContent);
-		}
+  	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
-		}
+  	{
+  		"aps":{
+  			  "badge":1,
+  			  "sound":"default",
+  			  "alert":"今天去哪儿"
+  		},
+  		"key1":"value1",
+  		"key2":"value2",
+  		"_j_msgid":154604475
+  	}

 ### 前台收到推送

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

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

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

 - onReceiveNotification 需要这样写：

-		var onReceiveNotification = function(event) {
-			var alertContent;
-			alertContent = event.aps.alert;
-			alert("open Notificaiton:" + alertContent);
-		}
+  	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
-		}
+  	{
+  		"aps":{
+  			  "badge":1,
+  			  "sound":"default",
+  			  "alert":"今天去哪儿"
+  		},
+  		"key1":"value1",
+  		"key2":"value2",
+  		"_j_msgid":154604475
+  	}

 ### 后台收到推送

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

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

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

 - onBackgroundNotification 需要这样写：

-		var onBackgroundNotification = function(event) {
-			var alertContent;
-			alertContent = event.aps.alert;
-			alert("open Notificaiton:" + alertContent);
-		}
+  	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
-		}
+  	{
+  		"aps":{
+  			  "badge":1,
+  			  "sound":"default",
+  			  "alert":"今天去哪儿"
+  		},
+  		"key1":"value1",
+  		"key2":"value2",
+  		"_j_msgid":154604475
+  	}

 #### API - receiveMessageIniOSCallback

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

 - data: 是一个 js 字符串使用如下代码解析，js 具体 key 根据应用内消息来确定:

-	var bToObj = JSON.parse(data);
+  var bToObj = JSON.parse(data);


 ## 获取自定义消息内容
@@ -322,30 +324,30 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

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

-		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+  	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);
-			}
-		}
+  	var onReceiveMessage = function(event) {
+  		try{
+  			var message;
+  			message = event.content;      
+  			$("#messageResult").html(message);
+  		}catch(exception) {
+  			console.log("JPushPlugin:onReceiveMessage-->" + exception);
+  		}
+  	}


 - event 举例:

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

 ## 设置Badge
 ### API - setBadge, resetBadge
@@ -569,3 +571,151 @@ value 取值范围：[0,99999]。
 	} 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]。
+
+#### 代码示例
+
+```
+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
+
--- 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/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,6 +1,6 @@
 {
  "name": "jpush-phonegap-plugin",
-  "version": "2.2.5",
+  "version": "2.2.8",
  "description": "JPush for cordova plugin",
  "cordova": {
    "id": "jpush-phonegap-plugin",
@@ -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
@@ -2,13 +2,13 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
  xmlns:android="http://schemas.android.com/apk/res/android"
  id="jpush-phonegap-plugin"
-  version="2.2.4">
+  version="2.2.7">

    <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" />

@@ -16,6 +16,9 @@
        <engine name="cordova" version=">=3.0" />
    </engines>

+    <!-- dependencies -->
+    <dependency id="cordova-plugin-device" />
+
    <js-module src="www/JPushPlugin.js" name="JPushPlugin">
        <clobbers target="JPush" />
    </js-module>
@@ -31,7 +34,7 @@
        <source-file src="src/ios/Plugins/JPushPlugin.m" />

        <header-file src="src/ios/lib/JPUSHService.h" />
-        <source-file src="src/ios/lib/jpush-ios-2.1.8.a" framework="true" />
+        <source-file src="src/ios/lib/jpush-ios-2.1.9.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" />
@@ -45,6 +48,8 @@
        <framework src="Security.framework" weak="true" />
        <framework src="libz.tbd" weak="true" />
        <framework src="AdSupport.framework" weak="true" />
+        <framework src="UserNotifications.framework" weak="true" />
+

        <config-file target="*PushConfig.plist" parent="APP_KEY">
            <string>$API_KEY</string>
@@ -76,7 +81,9 @@
        </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" />
@@ -85,7 +92,9 @@
            </activity>

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

            <!-- Required  SDK核心功能-->
@@ -163,25 +172,26 @@
            <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-2.2.0.jar" target-dir="libs" />
+        <source-file src="src/android/libs/armeabi/libjpush220.so" target-dir="libs/armeabi" />
+        <source-file src="src/android/libs/armeabi-v7a/libjpush220.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="src/android/libs/arm64-v8a/libjpush220.so" target-dir="libs/arm64-v8a" />
+        <source-file src="src/android/libs/x86/libjpush220.so" target-dir="libs/x86" />
+        <source-file src="src/android/libs/x86_64/libjpush220.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" />

-        <!-- 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
@@ -89,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();

@@ -438,6 +438,9 @@ public class JPushPlugin extends CordovaPlugin {
        }
    }

+    /**
+     *   自定义通知行为，声音、震动、呼吸灯等。
+     */
    void setBasicPushNotificationBuilder(JSONArray data,
                                         CallbackContext callbackContext) {
        BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(
--- 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/libjpush220.so
+++ b/src/android/libs/arm64-v8a/libjpush220.so
--- a/src/android/libs/armeabi-v7a/libjpush220.so
+++ b/src/android/libs/armeabi-v7a/libjpush220.so
--- a/src/android/libs/armeabi/libjpush220.so
+++ b/src/android/libs/armeabi/libjpush220.so
--- a/src/android/libs/jpush-android-2.2.0.jar
+++ b/src/android/libs/jpush-android-2.2.0.jar
--- a/src/android/libs/x86/libjpush220.so
+++ b/src/android/libs/x86/libjpush220.so
--- a/src/android/libs/x86_64/libjpush220.so
+++ b/src/android/libs/x86_64/libjpush220.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/ios/Plugins/AppDelegate+JPush.h
+++ b/src/ios/Plugins/AppDelegate+JPush.h
@@ -7,7 +7,9 @@
 //

 #import "AppDelegate.h"
+#import <UserNotifications/UserNotifications.h>
+#import "JPUSHService.h"

-@interface AppDelegate (JPush)
-
+@interface AppDelegate (JPush) <JPUSHRegisterDelegate>
+-(void)registerForIos10RemoteNotification;
@end
--- a/src/ios/Plugins/AppDelegate+JPush.m
+++ b/src/ios/Plugins/AppDelegate+JPush.m
@@ -8,8 +8,11 @@

 #import "AppDelegate+JPush.h"
 #import "JPushPlugin.h"
-#import "JPUSHService.h"
 #import <objc/runtime.h>
+#import <AdSupport/AdSupport.h>
+#import <UserNotifications/UserNotifications.h>
+
+

@implementation AppDelegate (JPush)

@@ -24,12 +27,13 @@
 }

 -(instancetype)init_plus{
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidLaunch:) name:@"UIApplicationDidFinishLaunchingNotification" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidLaunch:) name:UIApplicationDidFinishLaunchingNotification object:nil];
    return [self init_plus];
 }

 -(void)applicationDidLaunch:(NSNotification *)notification{
    if (notification) {
+        [self registerForIos10RemoteNotification];
        [JPushPlugin setLaunchOptions:notification.userInfo];
    }
 }
@@ -62,4 +66,36 @@
    //  [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
 }

+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{
+
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:notification.request.content.userInfo];
+
+    [userInfo setValue:kJPushPluginiOS10ForegroundReceiveNotification forKey:@"JPushNotificationType"];
+
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginiOS10ForegroundReceiveNotification object:userInfo];
+
+    completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert);
+}
+
+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{
+    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"];
+    [userInfo setValue:kJPushPluginiOS10ClickNotification forKey:@"JPushNotificationType"];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginiOS10ClickNotification object:userInfo];
+    completionHandler();
+}
+
+-(void)registerForIos10RemoteNotification{
+    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
+    }
+}
+
@end
--- a/src/ios/Plugins/JPushPlugin.h
+++ b/src/ios/Plugins/JPushPlugin.h
@@ -9,6 +9,9 @@
 #import <Cordova/CDV.h>

 #define kJPushPluginReceiveNotification @"JPushPluginReceiveNofication"
+#define kJPushPluginiOS10ForegroundReceiveNotification @"kJPushPluginiOS10ForegroundReceiveNotification"
+#define kJPushPluginiOS10ClickNotification @"kJPushPluginiOS10ClickNotification"
+

@interface JPushPlugin : CDVPlugin{

@@ -61,13 +64,17 @@
 //检查用户的推送设置情况
 -(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.backgoundNotification 后台收到推送
+ *  jpush.backgroundNotification 后台收到推送
 */

@end
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -10,6 +10,8 @@
 #import "JPUSHService.h"
 #import <UIKit/UIKit.h>
 #import <AdSupport/AdSupport.h>
+#import <UserNotifications/UserNotifications.h>
+#import "AppDelegate+JPush.h"

 static NSString *const JP_APP_KEY = @"APP_KEY";
 static NSString *const JP_APP_CHANNEL = @"CHANNEL";
@@ -18,6 +20,30 @@ static NSString *const JP_APP_ISIDFA = @"IsIDFA";
 static NSString *const JPushConfigFileName = @"PushConfig";
 static NSDictionary *_launchOptions = nil;

+#define WEAK_SELF(weakSelf)  __weak __typeof(&*self)weakSelf = self;
+
+@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

 #pragma mark- 外部接口
@@ -29,22 +55,6 @@ static NSDictionary *_launchOptions = nil;
    [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]) {
@@ -92,19 +102,23 @@ static NSDictionary *_launchOptions = nil;
                          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]];
-                });
+    [defaultCenter addObserver:self
+                      selector:@selector(networkDidReceiveNotification:)
+                          name:kJPushPluginiOS10ForegroundReceiveNotification
+                        object:nil];

-            }
+    [defaultCenter addObserver:self
+                      selector:@selector(networkDidReceiveNotification:)
+                          name:kJPushPluginiOS10ClickNotification
+                        object:nil];
+
+
+    if (_launchOptions) {
+        NSDictionary *userInfo = [_launchOptions valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+        if ([userInfo count] >0) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",[userInfo toJsonString]]];
+            });
        }

    }
@@ -248,7 +262,14 @@ static NSDictionary *_launchOptions = nil;
 }

 -(void)deleteLocalNotificationWithIdentifierKey:(CDVInvokedUrlCommand*)command{
-    [JPUSHService deleteLocalNotificationWithIdentifierKey:(NSString*)command.arguments[0]];
+    NSString *identifier = [command argumentAtIndex:0];
+    if ([UIDevice currentDevice].systemVersion.floatValue >= 10.0) {
+        JPushNotificationIdentifier *jpid = [JPushNotificationIdentifier new];
+        jpid.identifiers = @[identifier];
+        [JPUSHService removeNotification:jpid];
+    }else{
+        [JPUSHService deleteLocalNotificationWithIdentifierKey:identifier];
+    }
 }

 -(void)clearAllLocalNotifications:(CDVInvokedUrlCommand*)command{
@@ -260,7 +281,22 @@ static NSDictionary *_launchOptions = nil;
 }

 -(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command{
-    if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+    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];
@@ -270,10 +306,47 @@ static NSDictionary *_launchOptions = nil;
        NSNumber *number = [NSNumber numberWithInteger:type];
        [self handleResultWithValue:number command:command];
    }
-
 }

-#pragma mark- 内部方法
+#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)setLaunchOptions:(NSDictionary *)theLaunchOptions{
    _launchOptions = theLaunchOptions;

@@ -294,11 +367,6 @@ static NSDictionary *_launchOptions = nil;
    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];
@@ -311,6 +379,24 @@ static NSDictionary *_launchOptions = nil;

 }

+(void)registerForRemoteNotification{
+    [(AppDelegate*)[UIApplication sharedApplication].delegate registerForIos10RemoteNotification];
+
+    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];
+    }
+}
+
 #pragma mark 将参数返回给js
 -(void)handleResultWithValue:(id)value command:(CDVInvokedUrlCommand*)command{
    CDVPluginResult *result = nil;
@@ -337,50 +423,35 @@ static NSDictionary *_launchOptions = nil;

 #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]];
+        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.setTagsWithAlias',%@)",[dict toJsonString]]];
    });
-
 }

-
 - (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:@"cordova.fireDocumentEvent('jpush.receiveMessage',%@)",[notification.userInfo toJsonString]]];

-            [self.commandDelegate evalJs:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",jsonString]];
+            [self.commandDelegate evalJs:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",[notification.userInfo toJsonString]]];

        });
    }
 }

-(void)networkDidReceiveNotification:(id)notification{
+-(void)networkDidReceiveNotification:(NSNotification *)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:{
            //前台收到
@@ -404,10 +475,10 @@ static NSDictionary *_launchOptions = nil;
            break;
        }
        default:
-        //do nothing
-        break;
+            //do nothing
+            break;
    }
-
+    
 }

@end
--- a/src/ios/lib/JPUSHService.h
+++ b/src/ios/lib/JPUSHService.h
@@ -9,23 +9,102 @@
 * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
 */

-#define JPUSH_VERSION_NUMBER 2.1.8
+#define JPUSH_VERSION_NUMBER 2.1.9

 #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;
+/*!
+ * 通知注册实体类
+ */
+@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 +156,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 +186,14 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示

 /*!
 * 下面的接口是可选的
- * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：http://docs.jpush.io/client/ios_api/#api-ios）
+ * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：http://docs.jiguang.cn/client/ios_api/#api-ios）
 * 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
@@ -192,6 +279,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 +320,7 @@ callbackSelector:(SEL)cbSelector
 * @param userInfo 自定义参数，可以用来标识推送和增加附加信息
 * @param soundName 自定义通知声音，设置为nil为默认声音
 *
- * @discussion 最多支持 64 个定义
+ * @discussion 最多支持 64 个定义，此方法被[addNotification:]方法取代
 */
 + (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
                                    alertBody:(NSString *)alertBody
@@ -212,7 +328,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 +337,7 @@ callbackSelector:(SEL)cbSelector
 * @param region 自定义参数
 * @param regionTriggersOnce 自定义参数
 * @param category 自定义参数
+ * @discussion 此方法被[addNotification:]方法取代
 */
 + (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
                                    alertBody:(NSString *)alertBody
@@ -231,7 +348,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 +356,39 @@ 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 +434,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 +465,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/jpush-ios-2.1.9.a
+++ b/src/ios/lib/jpush-ios-2.1.9.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
@@ -222,6 +222,14 @@ JPushPlugin.prototype.getUserNotificationSettings = function (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') {
Author	SHA1	Message	Date
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