Merge branch 'dev'

- setTags
- setAlias
- setTagsWithAlias

.gitignore

@@ -1 +1,39 @@
-.DS_Store
+# Created by https://www.gitignore.io/api/macos,apachecordova
+
+### ApacheCordova ###
+# Apache Cordova generated files and directories
+bin/*
+!/plugins
+!/plugins/android.json
+!/plugins/fetch.json
+plugins/*
+platforms/*
+
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# End of https://www.gitignore.io/api/macos,apachecordova

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-3.1.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)
 
@@ -17,22 +17,22 @@
 
 - 通过 Cordova Plugins 安装，要求 Cordova CLI 5.0+：
 
-  	    cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey
+  	    cordova plugin add jpush-phonegap-plugin --variable APP_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 https://github.com/jpush/jpush-phonegap-plugin.git --variable APP_KEY=your_jpush_appkey  
 
 - 或下载到本地安装：
 
-        cordova plugin add Your_Plugin_Path  --variable API_KEY=your_jpush_appkey
+        cordova plugin add Your_Plugin_Path  --variable APP_KEY=your_jpush_appkey
 
 
 ## Usage
 ### API
-- [公共 API](/doc/Common_detail_api.md)
+- [Common](/doc/Common_detail_api.md)
-- [iOS API](/doc/iOS_API.md)
+- [iOS](/doc/iOS_API.md)
-- [Android API](/doc/Android_detail_api.md)
+- [Android](/doc/Android_detail_api.md)
 
 ### Demo
 插件项目中包含一个简单的 Demo。若想参考，可以在 */example* 文件夹内找到并拷贝以下文件:
@@ -48,23 +48,54 @@
 > 如果遇到了疑问，请优先参考 Demo 和 API 文档。若还无法解决，可访问[极光社区](http://community.jiguang.cn/)或 [Issues](https://github.com/jpush/jpush-phonegap-plugin/issues) 提问。
 
 ### Android
-#### 在 Eclipse 中 import 工程之后出现：*Type CallbackContext cannot be resolved to a type*。
+#### 在 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
+
+#### 打包时遇到 i386 打包失败怎么办？
+
+```
+cordova platform update ios
+```
+
+#### ionic 2 如何调用 API？
+
+[issue 179](https://github.com/jpush/jpush-phonegap-plugin/issues/179)
+
 #### PushConfig.plist 文件中的字段都是什么意思？
-- APP_KEY：应用标识。
+
-- CHANNEL：渠道标识。
+- Appkey：应用标识。
+- Channel：渠道标识。
 - IsProduction：是否生产环境。
 - IsIDFA：是否使用 IDFA 启动 SDK。
 
-#### 收不到推送了。
+#### 刚集成完插件收不到推送怎么办？
-请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)。
+请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](https://docs.jiguang.cn/jpush/client/iOS/ios_cer_guide/)。
 
+#### iOS 集成插件白屏、或无法启动插件、或打包报错无法找到需要引入的文件怎么办?
+按照以下步骤逐个尝试：
+
+- 升级至 Xcode 8
+- 先删除插件、再重装插件
+- 先使用 `cordova platform add ios`，后使用 `cordova plugin add`
 
 ## Support
 - QQ 群：413602425
-- [JPush 官网文档](http://docs.jpush.io/)
+- [JPush 官网文档](https://docs.jiguang.cn/jpush/guideline/intro/)
 - [极光社区](http://community.jiguang.cn/)
 
 ## Contribute

doc/Android_detail_api.md

@@ -1,9 +1,10 @@
 # Android API 简介
 
+- [注册成功事件](#注册成功事件)
 - [接收通知时获得通知的内容](#接收通知时获得通知的内容)
 - [打开通知时获得通知的内容](#打开通知时获得通知的内容)
 - [收到自定义消息时获取消息的内容](#收到自定义消息时获取消息的内容)
-- [获取集成日志](#获取集成日志)
+- [获取集成日志（同时适用于 iOS）](#获取集成日志同时适用于-ios)
 - [接收消息和点击通知事件](#接收消息和点击通知事件)
 - [统计分析](#统计分析)
 - [清除通知](#清除通知)
@@ -14,6 +15,18 @@
 - [本地通知](#本地通知)
 - [富媒体页面 JavaScript 回调 API](#富媒体页面-javascript-回调-api)
 
+## 注册成功事件
+### jpush.receiveRegistrationId
+集成了 JPush SDK 的应用程序在第一次成功注册到 JPush 服务器时，JPush 服务器会给客户端返回一个唯一的该设备的标识 - RegistrationID。
+就会触发这个事件（注意只有第一次会触发该事件，之后如果想要取到 registrationId，可以直接调用 *getRegistrationID* 方法）。
+
+#### 代码示例
+```Javascript
+document.addEventListener('jpush.receiveRegistrationId', function (event) {
+    console.log(event.registrationId)
+}, false)
+```
+
 ## 接收通知时获得通知的内容
 
 - 内容:
@@ -39,7 +52,7 @@
 - 附加字段:
     window.plugins.jPushPlugin.receiveMessage.extras.yourKey
 
-## 获取集成日志
+## 获取集成日志（同时适用于 iOS）
 
 ### API - setDebugMode
 
@@ -55,7 +68,6 @@
 	- true  显示集成日志。
 	- false 不显示集成日志。
 
-
 ##  接收消息和点击通知事件
 ### API - receiveMessageInAndroidCallback
 
@@ -82,7 +94,6 @@
 
 - data: js 字符串。
 
-
 ##  统计分析
 
 ### API - onResume / onPause
@@ -157,6 +168,19 @@
 
 	window.plugins.jPushPlugin.clearAllNotification()
 
+### API - clearNotificationById
+根据通知 Id 清除通知（包括本地通知）。
+
+#### 接口定义
+
+    window.plugins.jPushPlugin.clearNotificationById(notificationId)
+
+#### 参数说明
+- notificationId：int，通知的 id。
+
+#### 代码示例
+
+    window.plugins.jPushPlugin.clearNotificationById(1)
 
 ## 设置允许推送时间
 
@@ -201,7 +225,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 个用于定制通知栏样式的构建类：
 
@@ -237,28 +261,27 @@ JPush SDK 提供了 2 个用于定制通知栏样式的构建类：
 
 ##  本地通知
 ### API - addLocalNotification, removeLocalNotification, clearLocalNotifications
-
 本地通知 API 不依赖于网络，无网条件下依旧可以触发。
 
 本地通知与网络推送的通知是相互独立的，不受保留最近通知条数上限的限制。
 
 本地通知的定时时间是自发送时算起的，不受中间关机等操作的影响。
 
-三个接口的功能分别为：添加一个本地通知，删除一个本地通知，删除所有的本地通知。
+三个接口的功能分别为：添加一个本地通知，清除一个本地通知，清除所有的本地通知。
 
-#####接口定义
+#### 接口定义
 
 	window.plugins.jPushPlugin.addLocalNotification(builderId, content, title,
          notificaitonID, broadcastTime, extras)
 	window.plugins.jPushPlugin.removeLocalNotification(notificationID)
-	window.plugins.jPushPlugin.clearLocalNotifications()
+	window.plugins.jPushPlugin.clearLocalNotifications() // 同时适用于 iOS
 
 #### 参数说明
 
 - builderId: 设置本地通知样式。
 - content: 设置本地通知的 content。
 - title: 设置本地通知的 title。
-- notificaitonID: 设置本地通知的 ID。
+- notificaitonID: 设置本地通知的 ID（不要为 0）。
 - broadcastTime: 设置本地通知触发时间，为距离当前时间的数值，单位是毫秒。
 - extras: 设置额外的数据信息 extras 为 json 字符串。
 

doc/Common_detail_api.md

@@ -1,4 +1,4 @@
-# 通用 API 说明
+# 通用 API 说明（同时适用于 Android 和 iOS 系统）
 
 - [停止与恢复推送服务](#停止与恢复推送服务)
 - [获取 RegistrationID](#获取-registrationid)
@@ -17,11 +17,9 @@
 
 本功能是一个完全本地的状态操作，也就是说：停止推送服务的状态不会保存到服务器上。
 
-如果停止推送服务后，开发者 App 被重新安装，或者被清除数据，
+如果停止推送服务后，开发者 App 被重新安装，或者被清除数据，JPush SDK 会恢复正常的默认行为（因为保存在本地的状态数据被清除掉了）。
-JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数据被清除掉了）。
 
-本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，
+本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
-恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
 
 #### 接口定义
 
@@ -41,14 +39,12 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 
 + iOS 平台:
 
-	+ 不推荐调用，因为这个 API 只是让你的 DeviceToken 失效，在 设置－通知 中您的应用程序没有任何变化。
+	+ 不推荐调用，因为这个 API 只是让你的 DeviceToken 失效，在 设置－通知 中您的应用程序没有任何变化。**建议设置一个 UI 界面， 提醒用户在 设置－通知 中关闭推送服务**。
-    + 推荐：设置一个 UI 界面， 提醒用户在 设置－通知 中关闭推送服务。
 
 #### 接口定义
 
     window.plugins.jPushPlugin.stopPush()
 
-
 ### API - resumePush
 
 恢复推送服务。调用了此 API 后:
@@ -75,7 +71,6 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 
 	+ 平台检查推送服务是否注册。
 
-
 #### 接口定义
 
     window.plugins.jPushPlugin.isPushStopped(callback)
@@ -94,6 +89,20 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 		 }
     })
 
+## 开启 Debug 模式
+### API - setDebugMode
+用于开启 Debug 模式，显示更多的日志信息。
+
+#### 接口定义
+
+		JPushPlugin.prototype.setDebugMode(isOpen)
+
+#### 参数说明
+- isOpen: true，开启 Debug 模式；false，关闭 Debug 模式，不显示错误信息之外的日志信息。
+
+#### 代码示例
+
+		window.plugins.jPushPlugin.setDebugMode(true)
 
 ## 获取 RegistrationID
 
@@ -116,14 +125,9 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 代码示例
 
- 	window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+     window.plugins.jPushPlugin.getRegistrationID(function(data) {
-	var onGetRegistradionID = function(data) {
+       console.log("JPushPlugin:registrationID is " + data)
-		try {
+     })
-			console.log("JPushPlugin:registrationID is " + data);		
-		} catch(exception) {
-			console.log(exception);
-		}
-	}
 
 ## 设置别名与标签
 
@@ -143,7 +147,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 系统不限定一个别名只能指定一个用户。如果一个别名被指定到了多个用户，当给指定这个别名发消息时，服务器端 API 会同时给这多个用户发送消息。
 
-举例：在一个用户要登录的游戏中，可能设置别名为 userid。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userid 调用服务器端 API 发通知到客户端提醒用户。
+举例：在一个用户要登录的游戏中，可能设置别名为 userId。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userId 调用服务器端 API 发通知到客户端提醒用户。
 
 **标签 Tag**:
 
@@ -157,9 +161,11 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 接口定义
 
-	JPushPlugin.prototype.setTagsWithAlias(tags, alias)
+```js
-	JPushPlugin.prototype.setTags(tags)
+JPushPlugin.prototype.setTagsWithAlias(tags, alias, successCallback, errorCallback)
-	JPushPlugin.prototype.setAlias(alias)
+JPushPlugin.prototype.setTags(tags, successCallback, errorCallback)
+JPushPlugin.prototype.setAlias(alias, successCallback, errorCallback)
+```
 
 #### 参数说明
 * tags:
@@ -177,22 +183,15 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
 	* 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。
 
-#### 返回值说明
+#### 代码示例
 
-函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果:
+```js
-
+window.plugins.jPushPlugin.setTagsWithAlias([tag1, tag2], alias1, function () {
-	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
+  // success callback.
-    var onTagsWithAlias = function(event) {
+}, function (errorMsg) {
-    	try {
+  // errorMsg 格式为 'errorCode: error message'.
-        	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);
-       	}
-   	}
 
 #### 错误码定义
 
@@ -219,19 +218,16 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.openNotification", onOpenNotification, false);
+        document.addEventListener("jpush.openNotification", function (event) {
-
+	      var alertContent
-- onOpenNotification 需要这样写：
-
-        var alertContent;
           if(device.platform == "Android") {
-            alertContent = event.alert;
+            alertContent = event.alert
           } else {
-            alertContent = event.aps.alert;
+            lertContent = event.aps.alert
           }
-        alert("open Notificaiton:" + alertContent);
+	    }, false)
 
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
 
 + Android:
 
@@ -273,19 +269,18 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.o
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+		  document.addEventListener("jpush.receiveNotification", function (event) {
-
+		    var alertContent
-- onReceiveNotification 需要这样写：
-
-	    var alertContent;
 	        if(device.platform == "Android") {
-	        alertContent = event.alert;
+	          alertContent = event.alert
 	        } else {
-	        alertContent = event.aps.alert;
+	          alertContent = event.aps.alert
 	        }
-	    alert("open Notificaiton:" + alertContent);
+	        alert("open Notificaiton:" + alertContent)
+		  }, false)
 
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
 
 + Android:
 
@@ -330,26 +325,16 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+	    document.addEventListener("jpush.receiveMessage", function (event) {
-
-- onReceiveMessage 需要这样写：
-
-        var onReceiveMessage = function(event) {
-            try{
 	      var message
           if(device.platform == "Android") {
             message = event.message;
           } else {
             message = event.content;
           }      
-                 $("#messageResult").html(message);
+	    }, false)
-            } catch(exception) {
-                console.log("JPushPlugin:onReceiveMessage-->" + exception);
-            }
-        }
 
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveMessage，
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
-直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
 
 + Android:
 
@@ -370,7 +355,6 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 			 "extras":{"key":"不填写没有"}
 		}
 
-
 ## 判断系统设置中是否允许当前应用推送
 ### API - getUserNotificationSettings
 判断系统设置中是否允许当前应用推送。
@@ -392,5 +376,4 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 			// 系统设置中已关闭应用推送。
 		} else if(result > 0) {
 			// 系统设置中打开了应用推送。
-		}
+		})
-	});

doc/iOS_API.md

@@ -1,5 +1,6 @@
 # iOS API
 
+- [延迟注册和启动推送通知服务](#延迟注册和启动推送通知服务)
 - [开始与停止推送服务](#开始与停止推送服务)
 - [获取 RegistrationID](#获取-registrationid)
 - [别名与标签](#别名与标签)
@@ -10,16 +11,46 @@
 - [获取自定义消息内容](#获取自定义消息内容)
 - [设置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()
-
+```
 
 ### API - stopPush
 
@@ -45,14 +77,16 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 
   window.plugins.jPushPlugin.stopPush()
 
-
 ### API - resumePush
 
 恢复推送服务。调用了此 API 后，iOS平台，重新去APNS注册。
 
 #### 接口定义
 
+```
 window.plugins.jPushPlugin.resumePush()
+```
+
 
 
 ### API - isPushStopped
@@ -61,23 +95,25 @@ iOS平台，检查推送服务是否停止。
 
 #### 接口定义
 
+```
 window.plugins.jPushPlugin.isPushStopped(callback)
-
+```
 
 #### 参数说明
 
 - callback 回调函数，用来通知 JPush 的推送服务是否开启。
 
 #### 代码示例
-	window.plugins.jPushPlugin.isPushStopped(callback)
+
-	var callback = function(data) {
+```js
+window.plugins.jPushPlugin.isPushStopped(function(data) {
 	  if(data > 0) {
 	    // 已关闭
 	  } else {
 	    // 已开启
 	  }
-	}
+  })
-
+```
 
 ## 获取 RegistrationID
 
@@ -92,7 +128,9 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 接口定义
 
+```js
 JPushPlugin.prototype.getRegistrationID(callback)
+```
 
 #### 返回值
 
@@ -100,14 +138,13 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 调用示例
 
- 	window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+```js
-	var onGetRegistradionID = function(data) {
+window.plugins.jPushPlugin.getRegistrationID(function(data) {
-		try {
+	console.log("JPushPlugin:registrationID is " + data)
-			console.log("JPushPlugin:registrationID is " + data);
+})
-		} catch(exception) {
+```
-			console.log(exception);
+
-		}
+
-	}
 
 ## 别名与标签
 
@@ -141,47 +178,48 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 接口定义
 
+```
 JPushPlugin.prototype.setTagsWithAlias(tags, alias)
 JPushPlugin.prototype.setTags(tags)
 JPushPlugin.prototype.setAlias(alias)
+```
 
 #### 参数说明
-* tags:
+
-	* 参数类型为数组。
+- tags:
-	* nil 此次调用不设置此值。
+  - 参数类型为数组。
-	* 空集合表示取消之前的设置。
+  - nil 此次调用不设置此值。
-	* 每次调用至少设置一个 tag，覆盖之前的设置，不是新增。
+  - 空集合表示取消之前的设置。
-	* 有效的标签组成：字母（区分大小写）、数字、下划线、汉字。
+  - 每次调用至少设置一个 tag，覆盖之前的设置，不是新增。
-	* 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节（判断长度需采用UTF-8编码）。
+  - 有效的标签组成：字母（区分大小写）、数字、下划线、汉字。
-	* 单个设备最多支持设置 100 个 tag，App 全局 tag 数量无限制。
+  - 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节（判断长度需采用UTF-8编码）。
-* alias:
+  - 单个设备最多支持设置 100 个 tag，App 全局 tag 数量无限制。
-	* 参数类型为字符串。
+- alias:
-	* nil 此次调用不设置此值。
+  - 参数类型为字符串。
-	* 空字符串 （""）表示取消之前的设置。
+  - nil 此次调用不设置此值。
-	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
+  - 空字符串 （""）表示取消之前的设置。
-	* 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。
+  - 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
+  - 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。
 
 #### 返回值说明
 
 函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果。
 
-	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
+```js
 var onTagsWithAlias = function(event) {
-        try {
+    console.log("onTagsWithAlias")
-           console.log("onTagsWithAlias");    
+    var result = "result code:"+event.resultCode + " "
-           var result = "result code:"+event.resultCode + " ";
+    result += "tags:" + event.tags + " "
-           result += "tags:" + event.tags + " ";
+    result += "alias:" + event.alias + " "
-           result += "alias:" + event.alias + " ";
+    $("#tagAliasResult").html(result)
-           $("#tagAliasResult").html(result);
-        } catch(exception) {
-           console.log(exception)
-        }
 }
+document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false)
+```
 
 #### 错误码定义
 
 | Code | 描述                          | 详细解释                              |
-|----|:----------------------------------------|:--------|
+| ---- | :-------------------------- | :-------------------------------- |
 | 6001 | 无效的设置，tag/alias 不应参数都为 null |                                   |
 | 6002 | 设置超时                        | 建议重试。                             |
 | 6003 | alias 字符串不合法                | 有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。   |
@@ -192,7 +230,6 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 | 6008 | tag/alias 超出总长度限制           | 总长度最多 1K 字节。                      |
 | 6011 | 10s内设置tag或alias大于3次         | 短时间内操作过于频繁。                       |
 
-
 ## 获取 APNS 推送内容
 
 ### 点击推送通知
@@ -205,18 +242,23 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.openNotification", onOpenNotification, false);
+  ```js
+  document.addEventListener("jpush.openNotification", onOpenNotification, false)
+  ```
 
 - onOpenNotification 需要这样写：
 
+  ```js
   var onOpenNotification = function(event) {
-			var alertContent;
+  	var alertContent
-			alertContent = event.aps.alert;
+  	alertContent = event.aps.alert
-			alert("open Notificaiton:" + alertContent);
+  	alert("open Notificaiton:" + alertContent)
   }
+  ```
 
 - event 举例:
 
+  ```json
   {
   	"aps":{
   		  "badge":1,
@@ -227,6 +269,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
   	"key2":"value2",
   	"_j_msgid":154604475
   }
+  ```
 
 ### 前台收到推送
 
@@ -238,18 +281,23 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+  ```js
+  document.addEventListener("jpush.receiveNotification", onReceiveNotification, false)
+  ```
 
 - onReceiveNotification 需要这样写：
 
+  ```js
   var onReceiveNotification = function(event) {
-			var alertContent;
+  	var alertContent
-			alertContent = event.aps.alert;
+  	alertContent = event.aps.alert
-			alert("open Notificaiton:" + alertContent);
+  	alert("open Notificaiton:" + alertContent)
   }
+  ```
 
 - event 举例
 
+  ```json
   {
   	"aps":{
   		  "badge":1,
@@ -260,29 +308,36 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
   	"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 需要这样写：
 
+  ```js
   var onBackgroundNotification = function(event) {
-			var alertContent;
+  	var alertContent
-			alertContent = event.aps.alert;
+  	alertContent = event.aps.alert
-			alert("open Notificaiton:" + alertContent);
+  	alert("open Notificaiton:" + alertContent)
   }
+  ```
 
-+ event 举例
 
+- event 举例
+
+  ```json
   {
   	"aps":{
   		  "badge":1,
@@ -293,52 +348,42 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
   	"key2":"value2",
   	"_j_msgid":154604475
   }
+  ```
 
-#### API - receiveMessageIniOSCallback
 
-用于 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 需要这样写：
 
+  ```js
   var onReceiveMessage = function(event) {
   	try {
-				var message;
+  		var message = event.content
-				message = event.content;      
+  		$("#messageResult").html(message)
-				$("#messageResult").html(message);
   	} catch(exception) {
   		console.log("JPushPlugin:onReceiveMessage-->" + exception);
   	}
   }
-
+  ```
 
 - event 举例:
 
+  ```json
   {
   	"content":"今天去哪儿",
   	"extras":
@@ -346,32 +391,40 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
   		"key":"不填写没有"
   	}
   }
+  ```
 
 ## 设置Badge
+
 ### API - setBadge, resetBadge
 
- JPush 封装 badge 功能，允许应用上传 badge 值至 JPush 服务器，
+JPush 封装 badge 功能，允许应用上传 badge 值至 JPush 服务器，由 JPush 后台帮助管理每个用户所对应的推送 badge 值，简化了设置推送 badge 的操作。
- 由 JPush 后台帮助管理每个用户所对应的推送 badge 值，简化了设置推送 badge 的操作。
 （本接口不会直接改变应用本地的角标值. 要修改本地 badege 值，使用 setApplicationIconBadgeNumber）
 
 实际应用中，开发者可以直接对 badge 值做增减操作，无需自己维护用户与 badge 值之间的对应关系。
+
 #### 接口定义
 
+```js
 window.plugins.jPushPlugin.prototype.setBadge(value)
 window.plugins.jPushPlugin.prototype.reSetBadge()
+```
 
 resetBadge 相当于 setBadge(0)。
 
 #### 参数说明
+
 value 取值范围：[0,99999]。
 
 #### 返回值
+
 无，控制台会有 log 打印设置结果。
 
 #### 代码示例
 
-	window.plugins.jPushPlugin.setBadge(5);
+```js
-	window.plugins.jPushPlugin.reSetBadge();
+window.plugins.jPushPlugin.setBadge(5)
+window.plugins.jPushPlugin.reSetBadge()
+```
 
 ### API - setApplicationIconBadgeNumber
 
@@ -379,7 +432,9 @@ value 取值范围：[0,99999]。
 
 #### 接口定义
 
+```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)
+```
 
 #### 参数说明
 
@@ -403,10 +462,11 @@ value 取值范围：[0,99999]。
 
 #### 代码示例
 
+```js
 window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data) {
-	     console.log(data);               
+  console.log(data)
-	});
+})
-
+```
 
 ## 本地通知
 
@@ -416,7 +476,9 @@ value 取值范围：[0,99999]。
 
 #### 接口定义
 
+```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]。
 
 #### 接口定义
 
+```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.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)
+```
 
 #### 参数说明
 
@@ -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");
-
+```
 
 ## 日志等级设置
 
@@ -499,11 +596,15 @@ value 取值范围：[0,99999]。
 
 #### 接口定义
 
+```
 window.plugins.jPushPlugin.prototype.setDebugModeFromIos()
+```
 
 #### 代码示例
 
+```
 window.plugins.jPushPlugin.setDebugModeFromIos();
+```
 
 ### API - setLogOFF
 
@@ -513,11 +614,15 @@ value 取值范围：[0,99999]。
 
 #### 接口定义
 
+```
 window.plugins.jPushPlugin.prototype.setLogOFF()
+```
 
 #### 代码示例
 
+```
 window.plugins.jPushPlugin.setLogOFF();
+```
 
 ### API - setCrashLogON
 
@@ -527,11 +632,15 @@ value 取值范围：[0,99999]。
 
 #### 接口定义
 
+```
 window.plugins.jPushPlugin.prototype.setCrashLogON()
+```
 
 #### 代码示例
 
+```
 window.plugins.jPushPlugin.setCrashLogON();
+```
 
 ## 地理位置上报
 
@@ -541,7 +650,9 @@ value 取值范围：[0,99999]。
 
 #### 接口定义
 
+```
 window.plugins.jPushPlugin.prototype.setLocation(latitude, longitude)
+```
 
 #### 参数说明
 
@@ -550,7 +661,9 @@ value 取值范围：[0,99999]。
 
 #### 代码示例
 
+```
 window.plugins.jPushPlugin.setLocation(39.26,115.25);
+```
 
 ## 设备平台判断
 
@@ -560,12 +673,213 @@ value 取值范围：[0,99999]。
 
 #### 接口定义
 
+```
 window.plugins.jPushPlugin.prototype.isPlatformIOS()
+```
 
 #### 代码示例
 
+```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-收到本地通知)
+

doc/iOS_install.md

@@ -1,15 +1,17 @@
 ## iOS 手动安装
 
-- 下载 JPush PhoneGap Plugin 插件，并解压
+> **不建议使用手动安装，请参照 README.md 进行自动安装。**
 
-- 将 [/src/ios](/src/ios) 文件夹及内容在 xcode 中拖到你的工程里，并配置 [/src/ios/PushConfig.plist](/src/ios/PushConfig.plist) 中相应参数：
 
-		APP_KEY：     应用标识 
+
-		CHANNEL：     渠道标识
+1. 下载 JPush PhoneGap Plugin 插件，并解压
+2. 将 [/src/ios](/src/ios) 文件夹及内容在 xcode 中拖到你的工程里，并配置 [/src/ios/PushConfig.plist](/src/ios/PushConfig.plist) 中相应参数：
+
+   Appkey：      应用标识 
+   Channel：     渠道标识
    IsProduction：是否生产环境
    IsIDFA：      是否使用 IDFA 启动 sdk
-
+3. 打开 xcode，点击工程目录中顶部的 工程，选择(Target -> Build Phases -> Link Binary With Libraries)，添加以下框架：
-- 打开 xcode，点击工程目录中顶部的 工程，选择(Target -> Build Phases -> Link Binary With Libraries)，添加以下框架：
 
    CFNetwork.framework
    CoreFoundation.framework
@@ -20,16 +22,20 @@
    UIKit.framework
    AdSupport.framework
    libz.tbd(若存在 libz.dylib 则替换为 libz.tbd)
+   UserNotifications.framework
+   libresolv.tbd
+4. 修改 phonegap config.xml 文件以添加 JPushPlugin 插件
 
-- 修改 phonegap config.xml 文件以添加 JPushPlugin 插件
+```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
-
-- 在需要使用插件处加入以下代码，并根据 [iOS API](/doc/iOS_API.md) 文档说明调用相应接口
-
 <script type="text/javascript" src="JPushPlugin.js"></script>
+```
+

example/index.html

@@ -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);
@@ -116,7 +116,10 @@
                     if (tag3 != "") {
                         tags.push(tag3);
                     }
-                    window.plugins.jPushPlugin.setTagsWithAlias(tags, alias);
+                    window.plugins.jPushPlugin.setTagsWithAlias(tags, alias, function () {
+                      // Success callback
+                      console.log(tags + ' - ' + alias)
+                    });
                 } catch (exception) {
                     console.log(exception);
                 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jpush-phonegap-plugin",
-  "version": "2.2.6",
+    "version": "3.1.7",
     "description": "JPush for cordova plugin",
     "cordova": {
         "id": "jpush-phonegap-plugin",
@@ -21,14 +21,13 @@
         "cordova-ios",
         "cordova-android"
     ],
-  "engines": [
+    "engines": [{
-    {
         "name": "cordova",
         "version": ">=3.0"
-    }
+    }],
-  ],
+    "dependencies": {
-  "peerDependencies": {
+        "cordova-plugin-device": "*",
-    "cordova-plugin-device": ">=1.0.0"
+        "cordova-plugin-jcore": "1.1.4"
     },
     "author": "JiGuang",
     "license": "MIT",

plugin.xml

@@ -2,15 +2,15 @@
 <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.5">
+  version="3.1.7">
 
-    <name>JPush Plugin</name>
+    <name>JPush</name>
     <description>JPush for cordova plugin</description>
     <author>JPush</author>
     <keywords>JPush,push</keywords>
     <license>MIT License</license>
 
-    <preference name="API_KEY" />
+    <preference name="APP_KEY" />
 
     <engines>
         <engine name="cordova" version=">=3.0" />
@@ -18,6 +18,7 @@
 
     <!-- dependencies -->
     <dependency id="cordova-plugin-device" />
+    <dependency id="cordova-plugin-jcore" />
 
     <js-module src="www/JPushPlugin.js" name="JPushPlugin">
         <clobbers target="JPush" />
@@ -30,14 +31,16 @@
             </feature>
         </config-file>
 
+        <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/lib/JPUSHService.h" />
-        <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" />
+
+        <header-file src="src/ios/lib/JPUSHService.h" />
+        <source-file src="src/ios/lib/jpush-ios-3.0.5.a" framework="true" />
+        <resource-file src="src/ios/JPushConfig.plist" />
+
         <framework src="CFNetwork.framework" weak="true" />
         <framework src="CoreFoundation.framework" weak="true" />
         <framework src="CoreTelephony.framework" weak="true" />
@@ -49,17 +52,17 @@
         <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="*JPushConfig.plist" parent="Appkey">
-        <config-file target="*PushConfig.plist" parent="APP_KEY">
+            <string>$APP_KEY</string>
-            <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.jiguang.cordova.push.JPushPlugin" />
             </feature>
         </config-file>
 
@@ -77,11 +80,15 @@
             <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" />
+            <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" />
@@ -90,7 +97,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核心功能-->
@@ -102,7 +111,8 @@
             <!-- Required SDK 核心功能-->
             <service android:name="cn.jpush.android.service.PushService"
               android:enabled="true"
-              android:exported="false">
+              android:exported="false"
+              android:process=":remote">
                 <intent-filter>
                     <action android:name="cn.jpush.android.intent.REGISTER" />
                     <action android:name="cn.jpush.android.intent.REPORT" />
@@ -113,10 +123,11 @@
 
             <!-- Required SDK核心功能-->
             <receiver android:name="cn.jpush.android.service.PushReceiver"
-              android:enabled="true">
+              android:enabled="true"
+              android:exported="false">
                 <intent-filter android:priority="1000">
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                     <!--Required  显示通知栏 -->
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                     <category android:name="$PACKAGE_NAME" />
                 </intent-filter>
                 <intent-filter>
@@ -127,12 +138,15 @@
                 <intent-filter>
                     <action android:name="android.intent.action.PACKAGE_ADDED" />
                     <action android:name="android.intent.action.PACKAGE_REMOVED" />
+                    <data android:scheme="package" />
                 </intent-filter>
             </receiver>
 
             <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
             <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
-            <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true">
+            <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" />
@@ -140,7 +154,9 @@
             </service>
 
             <!-- User defined.  For test only  用户自定义的广播接收器 -->
-            <receiver android:name="cn.jpush.phonegap.MyReceiver" android:enabled="true">
+            <receiver
+              android:name="cn.jiguang.cordova.push.MyReceiver" 
+              android:enabled="true">
                 <intent-filter android:priority="1000">
                     <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                     <!-- Required  显示通知栏 -->
@@ -161,32 +177,36 @@
                     <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"
+              android:exported="false" />
+
             <!-- 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_APPKEY" android:value="$APP_KEY" />
         </config-file>
 
-        <source-file src="src/android/jpush-android-2.1.9.jar" target-dir="libs" />
+        <source-file src="src/android/libs/jpush-android_v3.0.6.jar" target-dir="libs" />
-        <source-file src="src/android/armeabi/libjpush219.so" target-dir="libs/armeabi" />
-        <source-file src="src/android/armeabi-v7a/libjpush219.so" target-dir="libs/armeabi-v7a" />
-        <source-file src="src/android/arm64-v8a/libjpush219.so" target-dir="libs/arm64-v8a" />
-        <source-file src="src/android/x86/libjpush219.so" target-dir="libs/x86" />
-        <source-file src="src/android/x86_64/libjpush219.so" target-dir="libs/x86_64" />
 
-        <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap" />
+        <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jiguang/cordova/push" />
-        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap" />
+        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jiguang/cordova/push" />
-        <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/res/drawable-hdpi/jpush_richpush_btn_selector.xml"
-        <source-file src="src/android/ic_richpush_actionbar_back.png" target-dir="res/drawable" />
+          target-dir="res/drawable" />
-        <source-file src="src/android/ic_richpush_actionbar_divider.png" target-dir="res/drawable" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml"
-        <source-file src="src/android/richpush_btn_selector.xml" target-dir="res/drawable" />
+          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_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>

src/android/JPushPlugin.java

@@ -1,4 +1,4 @@
-package cn.jpush.phonegap;
+package cn.jiguang.cordova.push;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -262,6 +262,26 @@ public class JPushPlugin extends CordovaPlugin {
         JPushPlugin.notificationAlert = null;
     }
 
+    static void transmitReceiveRegistrationId(String rId) {
+        if (instance == null) {
+            return;
+        }
+        JSONObject data = new JSONObject();
+        try {
+            data.put("registrationId", rId);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        String format = "window.plugins.jPushPlugin.receiveRegistrationIdInAndroidCallback(%s);";
+        final String js = String.format(format, data.toString());
+        cordovaActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                instance.webView.loadUrl("javascript:" + js);
+            }
+        });
+    }
+
     @Override
     public boolean execute(final String action, final JSONArray data,
                            final CallbackContext callbackContext) throws JSONException {
@@ -438,6 +458,9 @@ public class JPushPlugin extends CordovaPlugin {
         }
     }
 
+    /**
+     *   自定义通知行为，声音、震动、呼吸灯等。
+     */
     void setBasicPushNotificationBuilder(JSONArray data,
                                          CallbackContext callbackContext) {
         BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(
@@ -476,6 +499,7 @@ public class JPushPlugin extends CordovaPlugin {
         } catch (JSONException e) {
             e.printStackTrace();
             callbackContext.error("error reading id json");
+            return;
         }
         if (notificationId != -1) {
             JPushInterface.clearNotificationById(this.cordova.getActivity(), notificationId);
@@ -614,7 +638,6 @@ public class JPushPlugin extends CordovaPlugin {
             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();
@@ -629,5 +652,4 @@ public class JPushPlugin extends CordovaPlugin {
         }
         return true;
     }
-
 }

src/android/MyReceiver.java

@@ -1,18 +1,18 @@
-package cn.jpush.phonegap;
+package cn.jiguang.cordova.push;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import cn.jpush.android.api.JPushInterface;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
 
 public class MyReceiver extends BroadcastReceiver {
-    private static String TAG = "JPushPlugin";
+
     private static final List<String> IGNORED_EXTRAS_KEYS =
             Arrays.asList(
                     "cn.jpush.android.TITLE",
@@ -24,18 +24,15 @@ public class MyReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
-        if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(action)) {
+        if (action.equals(JPushInterface.ACTION_REGISTRATION_ID)) {
+            String rId = intent.getStringExtra(JPushInterface.EXTRA_REGISTRATION_ID);
+            JPushPlugin.transmitReceiveRegistrationId(rId);
+        } else if (action.equals(JPushInterface.ACTION_MESSAGE_RECEIVED)) {
             handlingMessageReceive(intent);
-        } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(action)) {
+        } else if (action.equals(JPushInterface.ACTION_NOTIFICATION_RECEIVED)) {
             handlingNotificationReceive(context, intent);
-        } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(action)) {
+        } else if (action.equals(JPushInterface.ACTION_NOTIFICATION_OPENED)) {
             handlingNotificationOpen(context, intent);
-        } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(action)) {
-            // 当在 HTML 页面中调用 JPushWeb.triggerNativeAction(String params) 方法时触发此方法，
-            // 再进行相关的操作。
-            
-        } else {
-            Log.d(TAG, "Unhandled intent - " + action);
         }
     }
 
@@ -46,8 +43,6 @@ public class MyReceiver extends BroadcastReceiver {
     }
 
     private void handlingNotificationOpen(Context context, Intent intent) {
-        Log.i(TAG, "----------------  handlingNotificationOpen");
-
         String title = intent.getStringExtra(JPushInterface.EXTRA_NOTIFICATION_TITLE);
         JPushPlugin.openNotificationTitle = title;
 
@@ -67,8 +62,6 @@ public class MyReceiver extends BroadcastReceiver {
     }
 
     private void handlingNotificationReceive(Context context, Intent intent) {
-        Log.i(TAG, "----------------  handlingNotificationReceive");
-
         Intent launch = context.getPackageManager().getLaunchIntentForPackage(
                 context.getPackageName());
         launch.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -99,5 +92,4 @@ public class MyReceiver extends BroadcastReceiver {
         }
         return extrasMap;
     }
-
 }

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> 

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>

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"

src/ios/JPushConfig.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>
+	<key>Appkey</key>
 	<string></string>
-	<key>CHANNEL</key>
+	<key>Channel</key>
-	<string>Subscription</string>
+	<string>channel name</string>
 	<key>IsProduction</key>
 	<false/>
 	<key>IsIDFA</key>
 	<false/>
+	<key>Delay</key>
+	<false/>
 </dict>
 </plist>

src/ios/Plugins/AppDelegate+JPush.h

@@ -11,5 +11,6 @@
 #import "JPUSHService.h"
 
 @interface AppDelegate (JPush) <JPUSHRegisterDelegate>
--(void)registerForIos10RemoteNotification;
+-(void)registerForRemoteNotification;
+-(void)startJPushSDK;
 @end

src/ios/Plugins/AppDelegate+JPush.m

@@ -11,19 +11,16 @@
 #import <objc/runtime.h>
 #import <AdSupport/AdSupport.h>
 #import <UserNotifications/UserNotifications.h>
-
+#import "JPushDefine.h"
-
 
 @implementation AppDelegate (JPush)
 
 +(void)load{
-
+    Method origin1;
-    Method origin;
+    Method swizzle1;
-    Method swizzle;
+    origin1  = class_getInstanceMethod([self class],@selector(init));
-
+    swizzle1 = class_getInstanceMethod([self class], @selector(init_plus));
-    origin=class_getInstanceMethod([self class],@selector(init));
+    method_exchangeImplementations(origin1, swizzle1);
-    swizzle=class_getInstanceMethod([self class], @selector(init_plus));
-    method_exchangeImplementations(origin, swizzle);
 }
 
 -(instancetype)init_plus{
@@ -31,10 +28,67 @@
     return [self init_plus];
 }
 
+-(void)fireOpenNotification:(NSTimer*)timer{
+    if (SharedJPushPlugin) {
+        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[timer.userInfo toJsonString]];
+        [timer invalidate];
+    }
+}
+
+NSDictionary *_launchOptions;
 -(void)applicationDidLaunch:(NSNotification *)notification{
+
+
     if (notification) {
-        [self registerForIos10RemoteNotification];
+        if (notification.userInfo) {
-        [JPushPlugin setLaunchOptions:notification.userInfo];
+            NSDictionary *userInfo1 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+            if (userInfo1.count > 0) {
+                [NSTimer scheduledTimerWithTimeInterval:0.01 target:self selector:@selector(fireOpenNotification:) userInfo:userInfo1 repeats:YES];
+            }
+
+            NSDictionary *userInfo2 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey];
+            if (userInfo2.count > 0) {
+                [NSTimer scheduledTimerWithTimeInterval:0.01 target:self selector:@selector(fireOpenNotification:) userInfo:userInfo2 repeats:YES];
+            }
+        }
+        [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];
     }
 }
 
@@ -44,17 +98,48 @@
 
 -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
     [JPUSHService handleRemoteNotification:userInfo];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
+
+    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
 }
 
 -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
     [JPUSHService handleRemoteNotification:userInfo];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object: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;
+    }
+    [JPushPlugin fireDocumentEvent: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];
+    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
+    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"];
+    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo toJsonString]];
+    completionHandler();
+}
+
 - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
-    [JPUSHService showLocalNotificationAtFront:notification identifierKey:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:JPushDocumentEvent_ReceiveLocalNotification object:notification.userInfo];
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {
@@ -66,33 +151,4 @@
     //  [[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];
-    [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

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     = @"JPushConfig";
+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";
+
+

src/ios/Plugins/JPushPlugin.h

@@ -8,16 +8,12 @@
 
 #import <Cordova/CDV.h>
 
-#define kJPushPluginReceiveNotification @"JPushPluginReceiveNofication"
-#define kJPushPluginiOS10ForegroundReceiveNotification @"kJPushPluginiOS10ForegroundReceiveNotification"
-#define kJPushPluginiOS10ClickNotification @"kJPushPluginiOS10ClickNotification"
-
-
 @interface JPushPlugin : CDVPlugin{
 
 }
 
-+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions;
+//注册通知服务并启动 SDK
+-(void)startJPushSDK:(CDVInvokedUrlCommand*)command;
 
 //以下为js中可调用接口
 //设置标签、别名
@@ -64,6 +60,10 @@
 //检查用户的推送设置情况
 -(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command;
 
+//ios 10 APIs
+-(void)addDismissActions:(CDVInvokedUrlCommand*)command;
+-(void)addNotificationActions:(CDVInvokedUrlCommand*)command;
+
 /*
  *  以下为js中可监听到的事件
  *  jpush.openNotification      点击推送消息启动或唤醒app
@@ -73,4 +73,22 @@
  *  jpush.backgroundNotification 后台收到推送
  */
 
+# pragma mark - private
+
++(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString;
+
++(void)setupJPushSDK:(NSDictionary*)userInfo;
+
 @end
+
+JPushPlugin *SharedJPushPlugin;
+
+@interface NSDictionary (JPush)
+-(NSString*)toJsonString;
+@end
+
+@interface NSString (JPush)
+-(NSDictionary*)toDictionary;
+@end
+
+

src/ios/Plugins/JPushPlugin.m

@@ -1,3 +1,4 @@
+
 //
 //  PushTalkPlugin.m
 //  PushTalk
@@ -12,15 +13,7 @@
 #import <AdSupport/AdSupport.h>
 #import <UserNotifications/UserNotifications.h>
 #import "AppDelegate+JPush.h"
-
+#import "JPushDefine.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;
-
-#define WEAK_SELF(weakSelf)  __weak __typeof(&*self)weakSelf = self;
 
 @implementation NSDictionary (JPush)
 -(NSString*)toJsonString{
@@ -46,22 +39,21 @@ static NSDictionary *_launchOptions = nil;
 
 @implementation JPushPlugin
 
+-(void)startJPushSDK:(CDVInvokedUrlCommand*)command{
+    [(AppDelegate*)[UIApplication sharedApplication].delegate startJPushSDK];
+}
+
 #pragma mark- 外部接口
 -(void)stopPush:(CDVInvokedUrlCommand*)command{
     [[UIApplication sharedApplication]unregisterForRemoteNotifications];
 }
 
 -(void)resumePush:(CDVInvokedUrlCommand*)command{
-    [JPushPlugin registerForRemoteNotification];
+    [(AppDelegate*)[UIApplication sharedApplication].delegate registerForRemoteNotification];
 }
 
 -(void)isPushStopped:(CDVInvokedUrlCommand*)command{
-    NSNumber *result;
+    NSNumber *result = [[UIApplication sharedApplication] isRegisteredForRemoteNotifications] ? @(0) : @(1);
-    if ([[UIApplication sharedApplication] isRegisteredForRemoteNotifications]) {
-        result = @(0);
-    }else{
-        result = @(1);
-    }
     [self handleResultWithValue:result command:command];
 }
 
@@ -69,12 +61,11 @@ static NSDictionary *_launchOptions = nil;
     //do nithng,because Cordova plugin use lazy load mode.
 }
 
-
 #ifdef __CORDOVA_4_0_0
 
 - (void)pluginInitialize {
     NSLog(@"### pluginInitialize ");
-    [self initNotifications];
+    [self initPlugin];
 }
 
 #else
@@ -82,140 +73,97 @@ static NSDictionary *_launchOptions = nil;
 - (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
     NSLog(@"### initWithWebView ");
     if (self=[super initWithWebView:theWebView]) {
-        [self initNotifications];
     }
+    [self initPlugin];
     return self;
 }
 
-
 #endif
 
--(void)initNotifications {
+-(void)initPlugin{
-    NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
+    if (!SharedJPushPlugin) {
-    [defaultCenter addObserver:self
+        SharedJPushPlugin = self;
+    }
+    [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(networkDidReceiveMessage:)
                                                  name:kJPFNetworkDidReceiveMessageNotification
                                                object:nil];
+}
 
-    [defaultCenter addObserver:self
++(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{
-                      selector:@selector(networkDidReceiveNotification:)
-                          name:kJPushPluginReceiveNotification
-                        object:nil];
-
-    [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]]];
+        [SharedJPushPlugin.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
     });
 }
 
-    }
-}
-
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
-    NSArray  *arguments = command.arguments;
+    NSString *alias = [command argumentAtIndex:0];
-    NSString *alias;
+    NSArray  *tags  = [command argumentAtIndex:1];
-    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:)
+    fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) {
-                   object:self];
+        CDVPluginResult *result;
+        if (iResCode == 0) {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil];
+        } else {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil];
+        }
+    }];
 }
 
 -(void)setTags:(CDVInvokedUrlCommand*)command{
-
     NSArray *tags = command.arguments;
-
-    NSLog(@"#### setTags %@",tags);
-
     [JPUSHService setTags:[NSSet setWithArray:tags]
-         callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+                    alias:nil
-                   object:self];
+    fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) {
-
+        CDVPluginResult *result;
+        if (iResCode == 0) {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil];
+        } else {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil];
+        }
+    }];
 }
 
 -(void)setAlias:(CDVInvokedUrlCommand*)command{
-
+    NSString *alias = [command argumentAtIndex:0];
-    NSLog(@"#### setAlias %@",command.arguments);
+    [JPUSHService setTags:nil
-    [JPUSHService setAlias:command.arguments[0]
+                    alias:alias
-          callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
+    fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) {
-                    object:self];
+        CDVPluginResult *result;
+        if (iResCode == 0) {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil];
+        } else {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil];
+        }
+    }];
 }
 
 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
     NSString* registrationID = [JPUSHService registrationID];
-    NSLog(@"### getRegistrationID %@",registrationID);
     [self handleResultWithValue:registrationID command:command];
 }
 
 -(void)startLogPageView:(CDVInvokedUrlCommand*)command{
-    NSArray *arguments = command.arguments;
+    NSString * pageName = [command argumentAtIndex:0];
-    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;
+    NSString * pageName = [command argumentAtIndex:0];
-    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;
+    NSString *pageName = [command argumentAtIndex:0];
-    if (!arguments || [arguments count] < 2) {
+    NSNumber *duration = [command argumentAtIndex:1];
-        NSLog(@"beginLogPageView argument  error");
+    [JPUSHService beginLogPageView:pageName duration:duration.intValue];
-        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;
+    NSNumber *badge = [command argumentAtIndex:0];
-    if ([argument count] < 1) {
+    [JPUSHService setBadge:badge.intValue];
-        NSLog(@"setBadge argument error!");
-        return;
-    }
-    NSNumber *badge = argument[0];
-    [JPUSHService setBadge:[badge intValue]];
 }
 
 -(void)resetBadge:(CDVInvokedUrlCommand*)command{
@@ -223,14 +171,8 @@ static NSDictionary *_launchOptions = nil;
 }
 
 -(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command{
-    //
+    NSNumber *badge = [command argumentAtIndex:0];
-    NSArray *argument = command.arguments;
+    [UIApplication sharedApplication].applicationIconBadgeNumber = badge.intValue;
-    if ([argument count] < 1) {
-        NSLog(@"setBadge argument error!");
-        return;
-    }
-    NSNumber *badge = [argument objectAtIndex:0];
-    [UIApplication sharedApplication].applicationIconBadgeNumber = [badge intValue];
 }
 
 -(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command {
@@ -252,32 +194,31 @@ static NSDictionary *_launchOptions = nil;
 }
 
 -(void)setLocalNotification:(CDVInvokedUrlCommand*)command{
-    NSArray      *arguments = command.arguments;
+    NSLog(@"ios 10 after please use UNNotificationRequest to set local notification, see apple doc to learn more");
-    NSDate       *date      = arguments[0] == [NSNull null] ? nil : [NSDate dateWithTimeIntervalSinceNow:[((NSString*)arguments[0]) intValue]];
+
-    NSString     *alertBody = arguments[1] == [NSNull null] ? nil : (NSString*)arguments[1];
+    NSDate       *date  = [NSDate dateWithTimeIntervalSinceNow:[[command argumentAtIndex:0] intValue]];
-    int           badge     = arguments[2] == [NSNull null] ? 0   : [(NSString*)arguments[2] intValue];
+    NSString     *alert = [command argumentAtIndex:1];
-    NSString     *idKey     = arguments[3] == [NSNull null] ? nil : (NSString*)arguments[3];
+    NSNumber     *badge = [command argumentAtIndex:2];
-    NSDictionary *dict      = arguments[4] == [NSNull null] ? nil : (NSDictionary*)arguments[4];
+    NSString     *idKey = [command argumentAtIndex:3];
-    [JPUSHService setLocalNotification:date alertBody:alertBody badge:badge alertAction:nil identifierKey:idKey userInfo:dict soundName:nil];
+    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];
-    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{
-    [JPUSHService clearAllLocalNotifications];
+    [JPUSHService removeNotification:nil];
 }
 
 -(void)setLocation:(CDVInvokedUrlCommand*)command{
-    [JPUSHService setLatitude:[((NSString*)command.arguments[0]) doubleValue] longitude:[((NSString*)command.arguments[1]) doubleValue]];
+    NSNumber *latitude  = [command argumentAtIndex:0];
+    NSNumber *longitude = [command argumentAtIndex:1];
+    [JPUSHService setLatitude:latitude.doubleValue longitude:longitude.doubleValue];
 }
 
 -(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command{
@@ -308,55 +249,74 @@ static NSDictionary *_launchOptions = nil;
     }
 }
 
+#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;
 
-    [JPUSHService setDebugMode];
++(void)setupJPushSDK:(NSDictionary*)userInfo{
-
+    NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfig_FileName ofType:@"plist"];
-    [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 *appkey       = [plistData valueForKey:JPushConfig_Appkey];
-    NSString * channel      = [plistData valueForKey:JP_APP_CHANNEL];
+    NSString *channel      = [plistData valueForKey:JPushConfig_Channel];
-    NSNumber * isProduction = [plistData valueForKey:JP_APP_ISPRODUCTION];
+    NSNumber *isProduction = [plistData valueForKey:JPushConfig_IsProduction];
-    NSNumber *isIDFA        = [plistData valueForKey:JP_APP_ISIDFA];
+    NSNumber *isIDFA       = [plistData valueForKey:JPushConfig_IsIDFA];
 
     NSString *advertisingId = nil;
-    if(isIDFA){
+    if(isIDFA.boolValue) {
         advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
     }
-    [JPUSHService setupWithOption:_launchOptions
+    [JPUSHService setupWithOption:userInfo
                            appKey:appkey
                           channel:channel
                  apsForProduction:[isProduction boolValue]
             advertisingIdentifier:advertisingId];
-
-}
-
-+(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
@@ -385,62 +345,18 @@ static NSDictionary *_launchOptions = nil;
 
 #pragma mark 设置标签及别名回调
 -(void)tagsWithAliasCallback:(int)resultCode tags:(NSSet *)tags alias:(NSString *)alias {
-    NSDictionary *dict = @{@"resultCode":[NSNumber numberWithInt:resultCode],
+    if (resultCode == 0) {  // Success
-                           @"tags"      :tags  == nil ? [NSNull null] : [tags allObjects],
+
-                           @"alias"     :alias == nil ? [NSNull null] : alias
+    } else {
-                           };
+
-    dispatch_async(dispatch_get_main_queue(), ^{
+    }
-        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.setTagsWithAlias',%@)",[dict toJsonString]]];
-    });
 }
 
 - (void)networkDidReceiveMessage:(NSNotification *)notification {
-    if (notification) {
+    if (notification && notification.userInfo) {
-        dispatch_async(dispatch_get_main_queue(), ^{
+        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveMessage
-
+                              jsString:[notification.userInfo toJsonString]];
-            [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveMessage',%@)",[notification.userInfo toJsonString]]];
-
-            [self.commandDelegate evalJs:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",[notification.userInfo toJsonString]]];
-
-        });
     }
 }
 
--(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:{
-            //前台收到
-            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

src/ios/lib/JPUSHService.h

@@ -6,10 +6,10 @@
  *  | |    | |   / /\ \   | |    | |  \ \______| |
  *  | |    | |  /_/  \_\  | |    | |   \_________|
  *
- * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
+ * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 2.1.9
+#define JPUSH_VERSION_NUMBER 3.0.5
 
 #import <Foundation/Foundation.h>
 
@@ -31,6 +31,13 @@ extern NSString *const kJPFNetworkDidLoginNotification;     // 登录成功
 extern NSString *const kJPFNetworkDidReceiveMessageNotification;         // 收到消息(非APNS)
 extern NSString *const kJPFServiceErrorNotification;  // 错误提示
 
+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
+};
+
 /*!
  * 通知注册实体类
  */
@@ -186,7 +193,7 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
 
 /*!
  * 下面的接口是可选的
- * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：http://docs.jiguang.cn/client/ios_api/#api-ios）
+ * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：https://docs.jiguang.cn/jpush/client/iOS/ios_api/）
  * setTags:alias:fetchCompletionHandle:是新的设置标签别名的方法，不再需要显示声明回调函数，只需要在block里面处理设置结果即可.
  * WARN: 使用block时需要注意循环引用问题
  */
@@ -243,7 +250,7 @@ callbackSelector:(SEL)cbSelector
 + (void)stopLogPageView:(NSString *)pageName;
 
 /*!
- * @abstract 直接上报在页面的停留时工
+ * @abstract 直接上报在页面的停留时间
  *
  * @param pageName 页面
  * @param seconds 停留的秒数
@@ -364,7 +371,6 @@ callbackSelector:(SEL)cbSelector
  * @abstract 删除本地推送定义
  *
  * @param notificationKey 本地推送标示符
- * @param myUILocalNotification 本地推送对象
  * @discussion 此方法被[removeNotification:]方法取代
  */
 + (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey __attribute__((deprecated("JPush 2.1.9 版本已过期")));
@@ -450,7 +456,7 @@ callbackSelector:(SEL)cbSelector
  *
  * SDK 默认开启的日志级别为: Info. 只显示必要的信息, 不打印调试日志.
  *
- * 调用本接口可打开日志级别为: Debug, 打印调试日志.
+ * 请在SDK启动后调用本接口，调用本接口可打开日志级别为: Debug, 打印调试日志.
  */
 + (void)setDebugMode;
 

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

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

www/JPushPlugin.js

@@ -7,60 +7,70 @@ JPushPlugin.prototype.openNotification = {}
 JPushPlugin.prototype.receiveNotification = {}
 
 JPushPlugin.prototype.isPlatformIOS = function () {
-  var isPlatformIOS = device.platform == 'iPhone'
+  return (device.platform === 'iPhone' ||
-    || device.platform == 'iPad'
+    device.platform === 'iPad' ||
-    || device.platform == 'iPod touch'
+    device.platform === 'iPod touch' ||
-    || device.platform == 'iOS'
+    device.platform === 'iOS')
-  return isPlatformIOS
 }
 
-JPushPlugin.prototype.error_callback = function (msg) {
+JPushPlugin.prototype.errorCallback = function (msg) {
-  console.log('Javascript Callback Error: ' + msg)
+  console.log('JPush Callback Error: ' + msg)
 }
 
-JPushPlugin.prototype.call_native = function (name, args, callback) {
+JPushPlugin.prototype.callNative = function (name, args, successCallback, errorCallback) {
-  ret = cordova.exec(callback, this.error_callback, 'JPushPlugin', name, args)
+  if (errorCallback) {
-  return ret
+    cordova.exec(successCallback, errorCallback, 'JPushPlugin', name, args)
+  } else {
+    cordova.exec(successCallback, this.errorCallback, 'JPushPlugin', name, args)
+  }
 }
 
-// public methods
+// Common methods
 JPushPlugin.prototype.init = function () {
   if (this.isPlatformIOS()) {
-    var data = []
+    this.callNative('initial', [], null)
-    this.call_native('initial', data, null)
   } else {
-    data = []
+    this.callNative('init', [], null)
-    this.call_native('init', data, null)
   }
 }
 
-JPushPlugin.prototype.getRegistrationID = function (callback) {
+JPushPlugin.prototype.setDebugMode = function (mode) {
-  try {
+  if (device.platform === 'Android') {
-    var data = []
+    this.callNative('setDebugMode', [mode], null)
-    this.call_native('getRegistrationID', [data], callback)
+  } else {
-  } catch(exception) {
+    if (mode === true) {
-    console.log(exception)
+      this.setDebugModeFromIos()
+    } else {
+      this.setLogOFF()
     }
   }
+}
+
+JPushPlugin.prototype.getRegistrationID = function (successCallback) {
+  this.callNative('getRegistrationID', [], successCallback)
+}
 
 JPushPlugin.prototype.stopPush = function () {
-  data = []
+  this.callNative('stopPush', [], null)
-  this.call_native('stopPush', data, null)
 }
 
 JPushPlugin.prototype.resumePush = function () {
-  data = []
+  this.callNative('resumePush', [], null)
-  this.call_native('resumePush', data, null)
 }
 
-JPushPlugin.prototype.isPushStopped = function (callback) {
+JPushPlugin.prototype.isPushStopped = function (successCallback) {
-  data = []
+  this.callNative('isPushStopped', [], successCallback)
-  this.call_native('isPushStopped', data, callback)
 }
 
-// iOS methods
+JPushPlugin.prototype.clearLocalNotifications = function () {
-JPushPlugin.prototype.setTagsWithAlias = function (tags, alias) {
+  if (device.platform === 'Android') {
-  try {
+    this.callNative('clearLocalNotifications', [], null)
+  } else {
+    this.clearAllLocalNotifications()
+  }
+}
+
+JPushPlugin.prototype.setTagsWithAlias = function (tags, alias, successCallback, errorCallback) {
   if (tags == null) {
     this.setAlias(alias)
     return
@@ -71,139 +81,15 @@ JPushPlugin.prototype.setTagsWithAlias = function (tags, alias) {
   }
   var arrayTagWithAlias = [tags]
   arrayTagWithAlias.unshift(alias)
-    this.call_native('setTagsWithAlias', arrayTagWithAlias, null)
+  this.callNative('setTagsWithAlias', arrayTagWithAlias, successCallback, errorCallback)
-  } catch(exception) {
-    console.log(exception)
-  }
 }
 
-JPushPlugin.prototype.setTags = function (tags) {
+JPushPlugin.prototype.setTags = function (tags, successCallback, errorCallback) {
-  try {
+  this.callNative('setTags', tags, successCallback, errorCallback)
-    this.call_native('setTags', tags, null)
-  } catch(exception) {
-    console.log(exception)
-  }
 }
 
-JPushPlugin.prototype.setAlias = function (alias) {
+JPushPlugin.prototype.setAlias = function (alias, successCallback, errorCallback) {
-  try {
+  this.callNative('setAlias', [alias], successCallback, errorCallback)
-    this.call_native('setAlias', [alias], null)
-  } catch(exception) {
-    console.log(exception)
-  }
-}
-
-JPushPlugin.prototype.setBadge = function (value) {
-  if (this.isPlatformIOS()) {
-    try {
-      this.call_native('setBadge', [value], null)
-    } catch(exception) {
-      console.log(exception)
-    }
-  }
-}
-
-JPushPlugin.prototype.resetBadge = function () {
-  if (this.isPlatformIOS()) {
-    try {
-      var data = []
-      this.call_native('resetBadge', [data], null)
-    } catch(exception) {
-      console.log(exception)
-    }
-  }
-}
-
-JPushPlugin.prototype.setDebugModeFromIos = function () {
-  if (this.isPlatformIOS()) {
-    var data = []
-    this.call_native('setDebugModeFromIos', [data], null)
-  }
-}
-
-JPushPlugin.prototype.setLogOFF = function () {
-  if (this.isPlatformIOS()) {
-    var data = []
-    this.call_native('setLogOFF', [data], null)
-  }
-}
-
-JPushPlugin.prototype.setCrashLogON = function () {
-  if (this.isPlatformIOS()) {
-    var data = []
-    this.call_native('crashLogON', [data], null)
-  }
-}
-
-JPushPlugin.prototype.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.deleteLocalNotificationWithIdentifierKeyInIOS = function (
-  identifierKey) {
-  if (this.isPlatformIOS()) {
-    var data = [identifierKey]
-    this.call_native('deleteLocalNotificationWithIdentifierKey', data, null)
-  }
-}
-
-JPushPlugin.prototype.clearAllLocalNotifications = function () {
-  if (this.isPlatformIOS()) {
-    var data = []
-    this.call_native('clearAllLocalNotifications', data, null)
-  }
-}
-
-JPushPlugin.prototype.setLocation = function (latitude, longitude) {
-  if (this.isPlatformIOS()) {
-    var data = [latitude, longitude]
-    this.call_native('setLocation', data, null)
-  }
-}
-
-JPushPlugin.prototype.receiveMessageIniOSCallback = function (data) {
-  try {
-    console.log('JPushPlugin:receiveMessageIniOSCallback--data:' + data)
-    var bToObj = JSON.parse(data)
-    var content = bToObj.content
-    console.log(content)
-  } catch(exception) {
-    console.log('JPushPlugin:receiveMessageIniOSCallback' + exception)
-  }
-}
-
-JPushPlugin.prototype.startLogPageView = function (pageName) {
-  if (this.isPlatformIOS()) {
-    this.call_native('startLogPageView', [pageName], null)
-  }
-}
-
-JPushPlugin.prototype.stopLogPageView = function (pageName) {
-  if (this.isPlatformIOS()) {
-    this.call_native('stopLogPageView', [pageName], null)
-  }
-}
-
-JPushPlugin.prototype.beginLogPageView = function (pageName, duration) {
-  if (this.isPlatformIOS()) {
-    this.call_native('beginLogPageView', [pageName, duration], null)
-  }
-}
-
-JPushPlugin.prototype.setApplicationIconBadgeNumber = function (badge) {
-  if (this.isPlatformIOS()) {
-    this.call_native('setApplicationIconBadgeNumber', [badge], null)
-  }
-}
-
-JPushPlugin.prototype.getApplicationIconBadgeNumber = function (callback) {
-  if (this.isPlatformIOS()) {
-    this.call_native('getApplicationIconBadgeNumber', [], callback)
-  }
 }
 
 // 判断系统设置中是否对本应用启用通知。
@@ -213,119 +99,191 @@ JPushPlugin.prototype.getApplicationIconBadgeNumber = function (callback) {
 // UIRemoteNotificationTypeSound = 1 << 1,
 // UIRemoteNotificationTypeAlert = 1 << 2,
 // UIRemoteNotificationTypeNewsstandContentAvailability = 1 << 3,
-// Android: 返回值 1 代表通知启用、0: 通知关闭。
+// Android: 返回值 1 代表通知启用；0: 通知关闭。
-JPushPlugin.prototype.getUserNotificationSettings = function (callback) {
+JPushPlugin.prototype.getUserNotificationSettings = function (successCallback) {
   if (this.isPlatformIOS()) {
-    this.call_native('getUserNotificationSettings', [], callback)
+    this.callNative('getUserNotificationSettings', [], successCallback)
-  } else if (device.platform == 'Android') {
+  } else if (device.platform === 'Android') {
-    this.call_native('areNotificationEnabled', [], callback)
+    this.callNative('areNotificationEnabled', [], successCallback)
   }
 }
 
+// iOS methods
+
+JPushPlugin.prototype.startJPushSDK = function () {
+  this.callNative('startJPushSDK', [], null)
+}
+
+JPushPlugin.prototype.setBadge = function (value) {
+  if (this.isPlatformIOS()) {
+    this.callNative('setBadge', [value], null)
+  }
+}
+
+JPushPlugin.prototype.resetBadge = function () {
+  if (this.isPlatformIOS()) {
+    this.callNative('resetBadge', [], null)
+  }
+}
+
+JPushPlugin.prototype.setDebugModeFromIos = function () {
+  if (this.isPlatformIOS()) {
+    this.callNative('setDebugModeFromIos', [], null)
+  }
+}
+
+JPushPlugin.prototype.setLogOFF = function () {
+  if (this.isPlatformIOS()) {
+    this.callNative('setLogOFF', [], null)
+  }
+}
+
+JPushPlugin.prototype.setCrashLogON = function () {
+  if (this.isPlatformIOS()) {
+    this.callNative('crashLogON', [], null)
+  }
+}
+
+JPushPlugin.prototype.addLocalNotificationForIOS = function (delayTime, content,
+  badge, notificationID, extras) {
+  if (this.isPlatformIOS()) {
+    this.callNative('setLocalNotification', [delayTime, content, badge, notificationID, extras], null)
+  }
+}
+
+JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function (identifierKey) {
+  if (this.isPlatformIOS()) {
+    this.callNative('deleteLocalNotificationWithIdentifierKey', [identifierKey], null)
+  }
+}
+
+JPushPlugin.prototype.clearAllLocalNotifications = function () {
+  if (this.isPlatformIOS()) {
+    this.callNative('clearAllLocalNotifications', [], null)
+  }
+}
+
+JPushPlugin.prototype.setLocation = function (latitude, longitude) {
+  if (this.isPlatformIOS()) {
+    this.callNative('setLocation', [latitude, longitude], null)
+  }
+}
+
+JPushPlugin.prototype.startLogPageView = function (pageName) {
+  if (this.isPlatformIOS()) {
+    this.callNative('startLogPageView', [pageName], null)
+  }
+}
+
+JPushPlugin.prototype.stopLogPageView = function (pageName) {
+  if (this.isPlatformIOS()) {
+    this.callNative('stopLogPageView', [pageName], null)
+  }
+}
+
+JPushPlugin.prototype.beginLogPageView = function (pageName, duration) {
+  if (this.isPlatformIOS()) {
+    this.callNative('beginLogPageView', [pageName, duration], null)
+  }
+}
+
+JPushPlugin.prototype.setApplicationIconBadgeNumber = function (badge) {
+  if (this.isPlatformIOS()) {
+    this.callNative('setApplicationIconBadgeNumber', [badge], null)
+  }
+}
+
+JPushPlugin.prototype.getApplicationIconBadgeNumber = function (callback) {
+  if (this.isPlatformIOS()) {
+    this.callNative('getApplicationIconBadgeNumber', [], callback)
+  }
+}
+
+JPushPlugin.prototype.addDismissActions = function (actions, categoryId) {
+  this.callNative('addDismissActions', [actions, categoryId])
+}
+
+JPushPlugin.prototype.addNotificationActions = function (actions, categoryId) {
+  this.callNative('addNotificationActions', [actions, categoryId])
+}
+
 // Android methods
-JPushPlugin.prototype.setDebugMode = function (mode) {
-  if (device.platform == 'Android') {
-    this.call_native('setDebugMode', [mode], null)
-  }
-}
-
 JPushPlugin.prototype.setBasicPushNotificationBuilder = function () {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    data = []
+    this.callNative('setBasicPushNotificationBuilder', [], null)
-    this.call_native('setBasicPushNotificationBuilder', data, null)
   }
 }
 
 JPushPlugin.prototype.setCustomPushNotificationBuilder = function () {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    data = []
+    this.callNative('setCustomPushNotificationBuilder', [], null)
-    this.call_native('setCustomPushNotificationBuilder', data, null)
+  }
+}
+
+JPushPlugin.prototype.receiveRegistrationIdInAndroidCallback = function (data) {
+  if (device.platform === 'Android') {
+    data = JSON.stringify(data)
+    var event = JSON.parse(data)
+    cordova.fireDocumentEvent('jpush.receiveRegistrationId', event)
   }
 }
 
 JPushPlugin.prototype.receiveMessageInAndroidCallback = function (data) {
-  try {
   data = JSON.stringify(data)
   console.log('JPushPlugin:receiveMessageInAndroidCallback: ' + data)
   this.receiveMessage = JSON.parse(data)
   cordova.fireDocumentEvent('jpush.receiveMessage', this.receiveMessage)
-  } catch(exception) {
-    console.log('JPushPlugin:pushCallback ' + exception)
-  }
 }
 
 JPushPlugin.prototype.openNotificationInAndroidCallback = function (data) {
-  try {
   data = JSON.stringify(data)
   console.log('JPushPlugin:openNotificationInAndroidCallback: ' + data)
   this.openNotification = JSON.parse(data)
   cordova.fireDocumentEvent('jpush.openNotification', this.openNotification)
-  } catch(exception) {
-    console.log(exception)
-  }
 }
 
 JPushPlugin.prototype.receiveNotificationInAndroidCallback = function (data) {
-  try {
   data = JSON.stringify(data)
   console.log('JPushPlugin:receiveNotificationInAndroidCallback: ' + data)
   this.receiveNotification = JSON.parse(data)
   cordova.fireDocumentEvent('jpush.receiveNotification', this.receiveNotification)
-  } catch(exception) {
-    console.log(exception)
-  }
 }
 
 JPushPlugin.prototype.clearAllNotification = function () {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    data = []
+    this.callNative('clearAllNotification', [], null)
-    this.call_native('clearAllNotification', data, null)
   }
 }
 
-JPushPlugin.prototype.clearNotificationById = function (notificationId) {
+JPushPlugin.prototype.clearNotificationById = function (id) {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    data = []
+    this.callNative('clearNotificationById', [id], null)
-    this.call_native('clearNotificationById', [notificationId], null)
   }
 }
 
 JPushPlugin.prototype.setLatestNotificationNum = function (num) {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    this.call_native('setLatestNotificationNum', [num], null)
+    this.callNative('setLatestNotificationNum', [num], 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') {
+  if (device.platform === 'Android') {
-    data = [builderId, content, title, notificationID, broadcastTime, extras]
+    this.callNative('addLocalNotification',
-    this.call_native('addLocalNotification', data, null)
+      [builderId, content, title, notificationID, broadcastTime, extras], null)
   }
 }
 
 JPushPlugin.prototype.removeLocalNotification = function (notificationID) {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    this.call_native('removeLocalNotification', [notificationID], null)
+    this.callNative('removeLocalNotification', [notificationID], null)
-  }
-}
-
-JPushPlugin.prototype.clearLocalNotifications = function () {
-  if (device.platform == 'Android') {
-    data = []
-    this.call_native('clearLocalNotifications', data, null)
   }
 }
 
 JPushPlugin.prototype.reportNotificationOpened = function (msgID) {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    this.call_native('reportNotificationOpened', [msgID], null)
+    this.callNative('reportNotificationOpened', [msgID], null)
   }
 }
 
@@ -334,8 +292,8 @@ JPushPlugin.prototype.reportNotificationOpened = function (msgID) {
  *在 Portal 上展示给开发者。
  */
 JPushPlugin.prototype.setStatisticsOpen = function (mode) {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    this.call_native('setStatisticsOpen', [mode], null)
+    this.callNative('setStatisticsOpen', [mode], null)
   }
 }
 
@@ -344,20 +302,20 @@ JPushPlugin.prototype.setStatisticsOpen = function (mode) {
  * 具体可看：http://docs.jpush.io/client/android_api/#android-60
  */
 JPushPlugin.prototype.requestPermission = function () {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    this.call_native('requestPermission', [], null)
+    this.callNative('requestPermission', [], null)
   }
 }
 
 JPushPlugin.prototype.setSilenceTime = function (startHour, startMinute, endHour, endMinute) {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    this.call_native('setSilenceTime', [startHour, startMinute, endHour, endMinute], null)
+    this.callNative('setSilenceTime', [startHour, startMinute, endHour, endMinute], null)
   }
 }
 
 JPushPlugin.prototype.setPushTime = function (weekdays, startHour, endHour) {
-  if (device.platform == 'Android') {
+  if (device.platform === 'Android') {
-    this.call_native('setPushTime', [weekdays, startHour, endHour], null)
+    this.callNative('setPushTime', [weekdays, startHour, endHour], null)
   }
 }