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

Format js file.
Update event callback.
2026-02-08 00:05:13 +08:00 · 2016-07-20 14:41:42 +08:00 · 2016-07-20 14:40:40 +08:00 · 2016-07-20 14:34:35 +08:00 · 2016-07-19 17:15:40 +08:00 · 2016-07-19 17:13:58 +08:00
38 changed files with 801 additions and 628 deletions
--- a/API/iOS_install.md
+++ b/API/iOS_install.md
@@ -1,62 +0,0 @@
-### iOS 手动安装
-
- 下载 JPush PhoneGap 插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
-
- 用 xcode 打开 iOS 工程 将 `$JPUSH_PLUGIN_DIR`/src/ios/Plugins/ 拖到 project 中  
-
- 将 `$JPUSH_PLUGIN_DIR`/src/ios/lib/ 拖到 project 中  
-
- 添加以下框架，打开 xcode，点击 project，选择(Target -> Build Phases -> Link Binary With Libraries)
-
-		CFNetwork.framework
-		CoreFoundation.framework
-		CoreTelephony.framework
-		SystemConfiguration.framework
-		CoreGraphics.framework
-		Foundation.framework
-		UIKit.framework
-
-
- 在你的工程中创建一个新的 Property List 文件
-
-		并将其命名为 PushConfig.plist，填入 Portal 为你的应用提供的 APP_KEY 等参数
-
- 在 AppDelegate.m 中包含头文件
-
-		#import "JPUSHService.h"
-		#import "JPushPlugin.h"
-
- 在 AppDelegate.m 中的下列方法中添加代码，如果方法不存在则增加相应方法与内容
-
-		- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
-		   //原内容保持不变
-		   //Required add
-		   [JPushPlugin setLaunchOptions:launchOptions];
-		    return YES;
-		}
-		- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken   {
-		    //原内容保持不变
-		    // Required add
-		    [JPUSHService registerDeviceToken:deviceToken];
-		}
-		- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-		    //原内容保持不变
-		    // Required add
-		    [JPUSHService handleRemoteNotification:userInfo];
-    		[[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
-		}
-
- 修改 phonegap config.xml 文件用来包含 Plugin/ 内的插件
-
-
-		<feature name="JPushPlugin">
-		    <param name="ios-package" value="JPushPlugin" />
-		    <param name="onload" value="true" />
-		</feature>
-
-
- 复制 `$JPUSH_PLUGIN_DIR`/www/JPushPlugin.js 到工程的 www 目录下面  
-
- 在需要使用插件处加入
-
-		<script type="text/javascript" src="JPushPlugin.js"></script>
--- a/README.md
+++ b/README.md
@@ -1,79 +1,40 @@
 # JPush PhoneGap / Cordova Plugin

 [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin)
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jpush/jpush-phonegap-plugin)
-[![release](https://img.shields.io/badge/release-2.1.3-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-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)
+[![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jpush-phonegap-plugin)
 [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)

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

-## 功能特性
-+ 发送推送通知。
-+ 发送推送自定义消息。
-+ 设置推送标签和别名。
-+ 设置角标（iOS）。
+> 如需要短信验证码功能的插件，可关注 [JSMS Cordova Plugin](https://github.com/jpush/cordova-plugin-jsms)。

-*如需要 IM 功能插件，请关注 [jmessage-phonegap-plugin](https://github.com/jpush/jmessage-phonegap-plugin)*。
+> QQ 交流群：413602425。

-## 安装
-### 准备工作
+## 集成步骤

-1. cordova create 文件夹名字 包名 应用名字
+- 先安装 cordova-plugin-device 插件：

-		cordova create Myproj com.myproj.jpush MyTestProj
+        cordova plugin add cordova-plugin-device

-2. 添加平台:
+- 安装本插件
+  - 通过 Cordova Plugins 安装，要求 Cordova CLI 5.0+：

-		cd Myproj
-		cordova platform add android  
-		cordova platform add ios
+    	   cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey

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

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

-### 安装插件(Android & iOS)
-
-#### 1.安装 JPush PhoneGap Plugin
-安装 JPush PhoneGap Plugin 有两种方法：
-
-方法一：在线安装
-
-通过 cordova plugins 安装，要求 phonegap/cordova CLI 5.0+:
-
-	cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey
-
-直接通过 url 安装:
-
-    cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable API_KEY=your_jpush_appkey  
-
-方法二：下载到本地再安装
-
-使用 git 命令将 JPush PhoneGap 插件下载的本地，目录标记为 $JPUSH_PLUGIN_DIR。
-
-    git clone https://github.com/jpush/jpush-phonegap-plugin.git
-    cordova plugin add $JPUSH_PLUGIN_DIR  --variable API_KEY=your_jpush_appkey
-
-[Android 手动安装文档地址](API/Android_handle_install.md)
-
-[IOS 手动安装文档地址](API/iOS_install.md)
-
-
-#### 2.安装 org.apache.cordova.device 插件
-
-     cordova plugin add org.apache.cordova.device
-
-
-#### 3.在 js 中调用函数，初始化 JPush
-
-    //由于 PhoneGap 插件采用了 Lazy load 的特性，所以建议在 js 文件能执行的最开始就添加
-    window.plugins.jPushPlugin.init();
+  - 或下载到本地安装：

+          cordova plugin add Your_Plugin_Path  --variable API_KEY=your_jpush_appkey


 ## Demo
-插件中包含示例 Demo。若想参考，可以在 $JPUSH_PLUGIN_DIR/example 文件夹内找到并拷贝以下文件:
+插件项目中包含一个简单的 Demo。若想参考，可以在 */example* 文件夹内找到并拷贝以下文件:

 	src/example/index.html -> www/index.html
 	src/example/css/* -> www/css
@@ -81,58 +42,52 @@

 ## 关于 PhoneGap build 云服务

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

 ## API 说明

-插件的 API 集中在 JPushPlugin.js 文件中，该文件的具体位置如下：
-
-Android:
-
+插件的 API 在 JPushPlugin.js 文件中，该文件的具体位置如下：
+### Android
 	[Project]/assets/www/plugins/cn.jpush.phonegap.JPushPlugin/www

-iOS:
-
+### iOS
 	[Project]/www/plugins/cn.jpush.phonegap.JPushPlugin/www

 ### 具体的 API 请参考：

- [公共 API](https://github.com/jpush/jpush-phonegap-plugin/blob/dev/API/Common_detail_api.md)
+- [公共 API](/doc/Common_detail_api.md)。

- [iOS API](https://github.com/jpush/jpush-phonegap-plugin/blob/dev/API/iOS%20API.md)
+- [iOS API](/doc/iOS_API.md)。

- [Android API](https://github.com/jpush/jpush-phonegap-plugin/blob/dev/API/Android_detail_api.md)
+- [Android API](/doc/Android_detail_api.md)。


 ## 常见问题

-若要使用 CLI 来编译项目，注意使用 cordova compile 而不是 cordova build，因为 cordova build 会清除对插件文件的修改。
-具体 cordova CLI 用法可参考[cordova CLI 官方文档](https://cordova.apache.org/docs/en/latest/reference/cordova-cli/index.html)。
+若要使用 CLI 来编译项目，注意应使用 cordova compile 而不是 cordova build 命令，因为如果修改了插件安装时默认写入到 AndroidManifest.xml
+中的代码，cordova build 可能会导致对 AndroidManifest.xml 的修改。
+Cordova CLI 的具体用法可参考 [Cordova CLI 官方文档](https://cordova.apache.org/docs/en/latest/reference/cordova-cli/index.html)。

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

-eclipse 中 import PhoneGap 工程之后出现：`Type CallbackContext cannot be resolved to a type`。
+- Eclipse 中 import PhoneGap 工程之后出现：*Type CallbackContext cannot be resolved to a type*。

-解决方案：eclipse 中右键单击工程名，Build Path -> Config Build Path -> Projects -> 选中工程名称 -> CordovaLib -> 点击 add。
+  解决方案：Eclipse 中右键单击工程名，Build Path -> Config Build Path -> Projects -> 选中工程名称 -> CordovaLib -> 点击 add。

-### 2. iOS
+### iOS

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


- 收不到推送:
-
-	请首先按照正确方式再次配置证书、描述文件
-	[iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)。
+- 收不到推送：
+	请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)。


 ## 更多
- [JPush 官网文档](http://docs.jpush.io/)
-
- 如有问题可访问[极光社区](http://community.jpush.cn/)
+- QQ 群：413602425；
+- [JPush 官网文档](http://docs.jpush.io/)；
+- 如有问题可访问[极光社区](http://community.jiguang.cn/)。
--- a/doc/Android_detail_api.md
+++ b/doc/Android_detail_api.md
@@ -12,7 +12,7 @@
 - [通知栏样式定制](#通知栏样式定制)
 - [设置保留最近通知条数](#设置保留最近通知条数)
 - [本地通知](#本地通知)
-
+- [富媒体页面 JavaScript 回调 API](#富媒体页面-javascript-回调-api)

 ## 接收通知时获得通知的内容

@@ -261,3 +261,64 @@ JPush SDK 提供了 2 个用于定制通知栏样式的构建类：
 - notificaitonID: 设置本地通知的 ID。
 - broadcastTime: 设置本地通知触发时间，为距离当前时间的数值，单位是毫秒。
 - extras: 设置额外的数据信息 extras 为 json 字符串。
+
+
+## 富媒体页面 JavaScript 回调 API
+富媒体推送通知时，用户可以用自定义的Javascript 函数来控制页面，如关闭当前页面，点击按钮跳转到指定的 Activity，通知应用程序做一些指定的动作等。
+
+此 API 提供的回调函数包括：关闭当前页面、打开应用的主 Activity、根据 Activity 名字打开对应的 Activity、以广播的形式传递页面参数到应用程序等功能。
+
+### API - 关闭当前页面
+
+    JPushWeb.close();   // 在富文本 HTML 页面中调用后会关闭当前页面。
+
+### API - 打开主 Activity
+
+    JPushWeb.startMainActivity(String params);
+
+在HTML中调用此函数后,会打开程序的主Activity， 并在对应的 Intent 传入参数 ”params“ ，Key 为 JPushInterface.EXTRA_EXTRA。
+
+对应 Activity 获取 params 示例代码：
+
+    Intent intent = getIntent();
+    if (null != intent ) {
+        String params = intent.getStringExtra(JPushInterface.EXTRA_EXTRA);
+    }
+
+### API - 触发应用中的操作
+
+    JPushWeb.triggerNativeAction(String params);
+
+调用了该方法后需要在 MyReceiver.java 中实现后面的业务逻辑：
+
+    if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(intent.getAction())) {
+        Log.d(TAG, "用户收到到RICH PUSH CALLBACK: " + bundle.getString(JPushInterface.EXTRA_EXTRA));
+        //在这里根据 JPushInterface.EXTRA_EXTRA 的内容触发客户端动作，比如打开新的Activity 、打开一个网页等。
+    }
+
+#### 代码示例
+
+    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+    <html>
+     <head>
+      <title>JPush Webview Test</title>
+      <script>
+           function clickButton() {
+             JPushWeb.close();
+           }
+
+          function openUrl() {
+             var json = "{'action':'open', 'url':'www.jpush.cn'}";
+             JPushWeb.triggerNativeAction(json);
+             JPushWeb.close(); //客服端在广播中收到json 后，可以打开对应的URL。
+          }
+     </script>
+     </head>
+     <body>
+         <button onclick="javascript:clickButton(this);return false;">Close</button>
+         <button onclick="javascript:JPushWeb.startMainActivity('test - startMainActivity');return false;">StartMainActivity</button>
+         <button onclick="javascript:JPushWeb.triggerNativeAction('test - triggerNativeAction');Javascript:JPushWeb.close();">triggerNativeAction and Close current webwiew</button>
+         <button onclick="javascript:JPushWeb.startActivityByName('com.example.jpushdemo.TestActivity','test - startActivityByName');">startActivityByName</button>
+         <button onclick="javascript:openUrl();">open a url</button>
+     </body>
+    </html>
--- a/doc/Android_handle_install.md
+++ b/doc/Android_handle_install.md
--- a/doc/Common_detail_api.md
+++ b/doc/Common_detail_api.md
@@ -6,7 +6,7 @@
 - [获取点击通知内容](#获取点击通知内容)
 - [获取通知内容](#获取通知内容)
 - [获取自定义消息推送内容](#获取自定义消息推送内容)
-
+- [判断系统设置中是否允许当前应用推送](#判断系统设置中是否允许当前应用推送)

 ## 停止与恢复推送服务
 ### API - init
@@ -226,7 +226,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。

        var alertContent;
        if(device.platform == "Android") {
-            alertContent = window.plugins.jPushPlugin.openNotification.alert;
+            alertContent = event.alert;
        } else {
            alertContent = event.aps.alert;
        }
@@ -280,7 +280,7 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.o

 	    var alertContent;
 	    if(device.platform == "Android") {
-	        alertContent = window.plugins.jPushPlugin.receiveNotification.alert;
+	        alertContent = event.alert;
 	    } else {
 	        alertContent = event.aps.alert;
 	    }
@@ -339,7 +339,7 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
            try{
                var message
                if(device.platform == "Android") {
-              		 message = window.plugins.jPushPlugin.receiveMessage.message;
+              		 message = event.message;
                } else {
                     message = event.content;
                }          
@@ -370,3 +370,28 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 			 "content":"今天去哪儿",
 			 "extras":{"key":"不填写没有"}
 		}
+
+
+## 判断系统设置中是否允许当前应用推送
+### API - getUserNotificationSettings
+判断系统设置中是否允许当前应用推送。
+
+在 Android 中，返回值为 0 时，代表系统设置中关闭了推送；为 1 时，代表打开了推送（目前仅适用于Android 4.4+）。
+
+在 iOS 中，返回值为 0 时，代表系统设置中关闭了推送；大于 0 时，代表打开了推送，且能够根据返回值判断具体通知形式：
+
+	UIRemoteNotificationTypeNone    = 0,		// 0
+	UIRemoteNotificationTypeBadge   = 1 << 0,	// 1
+	UIRemoteNotificationTypeSound   = 1 << 1,	// 2
+	UIRemoteNotificationTypeAlert   = 1 << 2,	// 4
+	UIRemoteNotificationTypeNewsstandContentAvailability = 1 << 3	// 8
+
+#### 代码示例
+
+	window.plugins.jPushPlugin.getUserNotificationSettings(function(result) {
+		if(result == 0) {
+			// 系统设置中已关闭应用推送。
+		} else if(result > 0) {
+			// 系统设置中打开了应用推送。
+		}
+	});
--- a/doc/iOS_API.md
+++ b/doc/iOS_API.md
@@ -57,7 +57,7 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数

 ### API - isPushStopped

-iOS平台，检查推送服务是否注册。
+iOS平台，检查推送服务是否停止。

 #### 接口定义

@@ -69,12 +69,12 @@ iOS平台，检查推送服务是否注册。
 - callback 回调函数，用来通知 JPush 的推送服务是否开启。

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

--- a/doc/iOS_install.md
+++ b/doc/iOS_install.md
@@ -0,0 +1,35 @@
+## iOS 手动安装
+
+- 下载 JPush PhoneGap Plugin 插件，并解压
+
+- 将 [/src/ios](/src/ios) 文件夹及内容在 xcode 中拖到你的工程里，并配置 [/src/ios/PushConfig.plist](/src/ios/PushConfig.plist) 中相应参数：
+
+		APP_KEY：     应用标识 
+		CHANNEL：     渠道标识
+		IsProduction：是否生产环境
+		IsIDFA：      是否使用 IDFA 启动 sdk
+
+- 打开 xcode，点击工程目录中顶部的 工程，选择(Target -> Build Phases -> Link Binary With Libraries)，添加以下框架：
+
+		CFNetwork.framework
+		CoreFoundation.framework
+		CoreTelephony.framework
+		SystemConfiguration.framework
+		CoreGraphics.framework
+		Foundation.framework
+		UIKit.framework
+		AdSupport.framework
+		libz.tbd(若存在 libz.dylib 则替换为 libz.tbd)
+
+- 修改 phonegap config.xml 文件以添加 JPushPlugin 插件
+
+		<feature name="JPushPlugin">
+		    <param name="ios-package" value="JPushPlugin" />
+		    <param name="onload" value="true" />
+		</feature>
+
+- 将 [/www/JPushPlugin.js](/www/JPushPlugin.js) 在 xcode 中拖到工程的 www 目录下面  
+
+- 在需要使用插件处加入以下代码，并根据 [iOS API](/doc/iOS_API.md) 文档说明调用相应接口
+
+		<script type="text/javascript" src="JPushPlugin.js"></script>
--- a/example/.DS_Store
+++ b/example/.DS_Store
--- a/example/index.html
+++ b/example/index.html
@@ -47,7 +47,7 @@
            try {
                var alertContent;
                if (device.platform == "Android") {
-                    alertContent = window.plugins.jPushPlugin.openNotification.alert;
+                    alertContent = event.alert;
                } else {
                    alertContent = event.aps.alert;
                }
@@ -61,7 +61,7 @@
            try {
                var alertContent;
                if (device.platform == "Android") {
-                    alertContent = window.plugins.jPushPlugin.receiveNotification.alert;
+                    alertContent = event.alert;
                } else {
                    alertContent = event.aps.alert;
                }
@@ -75,7 +75,7 @@
            try {
                var message;
                if (device.platform == "Android") {
-                    message = window.plugins.jPushPlugin.receiveMessage.message;
+                    message = event.message;
                } else {
                    message = event.content;
                }
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
  "name": "jpush-phonegap-plugin",
-  "version": "2.1.6",
+  "version": "2.2.5",
  "description": "JPush for cordova plugin",
  "cordova": {
-    "id": "cn.jpush.phonegap.JPushPlugin",
+    "id": "jpush-phonegap-plugin",
    "platforms": [
      "ios",
      "android"
@@ -16,6 +16,7 @@
  "keywords": [
    "JPush",
    "push",
+    "Push",
    "ecosystem:cordova",
    "cordova-ios",
    "cordova-android"
@@ -26,6 +27,9 @@
      "version": ">=3.0"
    }
  ],
+  "peerDependencies": {
+    "cordova-plugin-device": ">=1.0.0"
+  },
  "author": "jpush",
  "license": "Apache 2.0 License",
  "bugs": {
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        id="cn.jpush.phonegap.JPushPlugin"
-        version="2.1.6">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  id="jpush-phonegap-plugin"
+  version="2.2.4">

    <name>JPush Plugin</name>
    <description>JPush for cordova plugin</description>
@@ -13,168 +13,175 @@
    <preference name="API_KEY" />

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

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

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

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

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

-            <config-file target="*PushConfig.plist" parent="APP_KEY">
-                <string>$API_KEY</string>
-            </config-file>
-        </platform>
+        <config-file target="*PushConfig.plist" parent="APP_KEY">
+            <string>$API_KEY</string>
+        </config-file>
+    </platform>

-    <!-- android -->
    <platform name="android">
-        <hook type="after_plugin_add" src="scripts/android-install.js" />
-        <hook type="after_plugin_install" src="scripts/android-install.js" />
-        <hook type="before_plugin_rm" src="scripts/android-install.js" />
-        <hook type="before_plugin_uninstall" src="scripts/android-install.js" />
-
        <config-file target="res/xml/config.xml" parent="/*">
            <feature name="JPushPlugin">
-                <param name="android-package" value="cn.jpush.phonegap.JPushPlugin"/>
+                <param name="android-package" value="cn.jpush.phonegap.JPushPlugin" />
            </feature>
        </config-file>

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

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

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

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

+            <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
+            <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
+            <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true">
+                <intent-filter>
+                    <action android:name="cn.jpush.android.intent.DaemonService" />
+                    <category android:name="$PACKAGE_NAME" />
+                </intent-filter>
+            </service>
+
            <!-- User defined.  For test only  用户自定义的广播接收器 -->
-            <receiver
-                    android:name="cn.jpush.phonegap.MyReceiver"
-                    android:enabled="true">
+            <receiver android:name="cn.jpush.phonegap.MyReceiver" android:enabled="true">
                <intent-filter android:priority="1000">
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                    <!-- Required  显示通知栏 -->
-                    <category android:name="$PACKAGE_NAME"/>
+                    <category android:name="$PACKAGE_NAME" />
                </intent-filter>
                <intent-filter>
-                    <action android:name="cn.jpush.android.intent.REGISTRATION"/>
+                    <action android:name="cn.jpush.android.intent.REGISTRATION" />
                    <!-- Required  用户注册SDK的intent -->
-                    <action android:name="cn.jpush.android.intent.UNREGISTRATION"/>
-                    <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED"/>
+                    <action android:name="cn.jpush.android.intent.UNREGISTRATION" />
+                    <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
                    <!-- Required  用户接收SDK消息的intent -->
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED"/>
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
                    <!-- Required  用户接收SDK通知栏信息的intent -->
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/>
+                    <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
                    <!-- Required  用户打开自定义通知栏的intent -->
-                    <action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK"/>
+                    <action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK" />
                    <!-- Optional 用户接受Rich Push Javascript 回调函数的intent -->
-                    <category android:name="$PACKAGE_NAME"/>
+                    <category android:name="$PACKAGE_NAME" />
                </intent-filter>
            </receiver>
            <!-- Required SDK核心功能-->
-            <receiver android:name="cn.jpush.android.service.AlarmReceiver"/>
-            <!-- 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"/>
+            <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
+            <!-- Required. Enable it you can get statistics data with channel -->
+            <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
+            <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY" />
        </config-file>
-        <source-file src="src/android/jpush-android-2.1.3.jar" target-dir="libs"/>
-        <source-file src="src/android/armeabi/libjpush213.so" target-dir="libs/armeabi"/>
-        <source-file src="src/android/armeabi-v7a/libjpush213.so" target-dir="libs/armeabi-v7a"/>
-        <source-file src="src/android/arm64-v8a/libjpush213.so" target-dir="libs/arm64-v8a"/>
-        <source-file src="src/android/x86/libjpush213.so" target-dir="libs/x86"/>
-        <source-file src="src/android/x86_64/libjpush213.so" target-dir="libs/x86_64"/>

-        <!--<source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>-->
-        <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap"/>
-    	<source-file src="src/android/test_notification_layout.xml" target-dir="res/layout"/>
-    	<source-file src="src/android/jpush_notification_icon.png" target-dir="res/drawable"/>
+        <source-file src="src/android/jpush-android-2.1.7.jar" target-dir="libs" />
+        <source-file src="src/android/armeabi/libjpush217.so" target-dir="libs/armeabi" />
+        <source-file src="src/android/armeabi-v7a/libjpush217.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="src/android/arm64-v8a/libjpush217.so" target-dir="libs/arm64-v8a" />
+        <source-file src="src/android/x86/libjpush217.so" target-dir="libs/x86" />
+        <source-file src="src/android/x86_64/libjpush217.so" target-dir="libs/x86_64" />
+
+        <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap" />
+        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap" />
+        <source-file src="src/android/test_notification_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/jpush_notification_icon.png" target-dir="res/drawable" />
+
+        <!-- Rich Push resources  -->
+        <source-file src="src/android/ic_richpush_actionbar_back.png" target-dir="res/drawable" />
+        <source-file src="src/android/ic_richpush_actionbar_divider.png" target-dir="res/drawable" />
+        <source-file src="src/android/richpush_btn_selector.xml" target-dir="res/drawable" />
+        <source-file src="src/android/jpush_popwin_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/jpush_webview_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/jpush_style.xml" target-dir="res/values" />
+
    </platform>
 </plugin>
--- a/scripts/android-install.js
+++ b/scripts/android-install.js
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-module.exports = function (context) {
-    var path         = context.requireCordovaModule('path'),
-        fs           = context.requireCordovaModule('fs'),
-        shell        = context.requireCordovaModule('shelljs'),
-        projectRoot  = context.opts.projectRoot,
-        ConfigParser = context.requireCordovaModule('cordova-lib/src/configparser/ConfigParser'),
-        config       = new ConfigParser(path.join(context.opts.projectRoot, "config.xml")),
-        packageName  = config.android_packageName() || config.packageName();
-
-    console.info("Running android-install.Hook: " + context.hook
-        + ", Package: " + packageName + ", Path: " + projectRoot + ".");
-
-    if (!packageName) {
-        console.error("Package name could not be found!");
-        return ;
-    }
-
-    // android platform available?
-    if (context.opts.cordova.platforms.indexOf("android") === -1) {
-        console.info("Android platform has not been added.");
-        return ;
-    }
-
-    var targetDir  = path.join(projectRoot, "platforms", "android", "src", "cn", "jpush", "phonegap");
-        targetFile = path.join(targetDir, "JPushPlugin.java");
-        console.log(targetDir);
-
-    if (['after_plugin_add', 'after_plugin_install', 'after_platform_add'].indexOf(context.hook) === -1) {
-        // remove it?
-        try {
-            fs.unlinkSync(targetFile);
-        } catch (err) {}
-    } else {
-        // create directory
-        shell.mkdir('-p', targetDir);
-
-        // sync the content
-        fs.readFile(path.join(context.opts.plugin.dir, 'src', 'android', 'JPushPlugin.java'),
-            {encoding: 'utf-8'}, function (err, data) {
-                if (err) {
-                    throw err;
-                }
-                data = data.replace(/^import __PACKAGE_NAME__.R;/m, 'import ' + packageName + '.R;');
-                fs.writeFileSync(targetFile, data);
-        });
-    }
-};
--- a/src/android/JPushPlugin.java
+++ b/src/android/JPushPlugin.java
@@ -1,12 +1,14 @@
 package cn.jpush.phonegap;

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

-import __PACKAGE_NAME__.R;
-
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaPlugin;
@@ -15,6 +17,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -28,7 +32,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

 import cn.jpush.android.api.BasicPushNotificationBuilder;
-import cn.jpush.android.api.CustomPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.api.TagAliasCallback;
 import cn.jpush.android.data.JPushLocalNotification;
@@ -37,6 +40,7 @@ public class JPushPlugin extends CordovaPlugin {
    private final static List<String> methodList =
            Arrays.asList(
                    "addLocalNotification",
+                    "areNotificationEnabled",
                    "clearAllNotification",
                    "clearLocalNotifications",
                    "clearNotificationById",
@@ -139,7 +143,7 @@ public class JPushPlugin extends CordovaPlugin {
    }

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

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

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

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

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

+    void areNotificationEnabled(JSONArray data, final CallbackContext callback) {
+        int isEnabled;
+        if (hasPermission("OP_POST_NOTIFICATION")) {
+            isEnabled = 1;
+        } else {
+            isEnabled = 0;
+        }
+        callback.success(isEnabled);
+    }
+
    void setLatestNotificationNum(JSONArray data, CallbackContext callbackContext) {
        int num = -1;
        try {
@@ -425,7 +439,7 @@ public class JPushPlugin extends CordovaPlugin {
    }

    void setBasicPushNotificationBuilder(JSONArray data,
-            CallbackContext callbackContext) {
+                                         CallbackContext callbackContext) {
        BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(
                this.cordova.getActivity());
        builder.developerArg0 = "Basic builder 1";
@@ -438,19 +452,17 @@ public class JPushPlugin extends CordovaPlugin {
        }
    }

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

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

+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private boolean hasPermission(String appOpsServiceId) {
+        Context context = cordova.getActivity().getApplicationContext();
+        AppOpsManager mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        ApplicationInfo appInfo = context.getApplicationInfo();
+
+        String pkg = context.getPackageName();
+        int uid = appInfo.uid;
+        Class appOpsClazz = null;
+
+        try {
+            appOpsClazz = Class.forName(AppOpsManager.class.getName());
+            Method checkOpNoThrowMethod = appOpsClazz.getMethod("checkOpNoThrow",
+                    Integer.TYPE, Integer.TYPE, String.class);
+            Field opValue = appOpsClazz.getDeclaredField(appOpsServiceId);
+            int value = opValue.getInt(Integer.class);
+            Object result = checkOpNoThrowMethod.invoke(mAppOps, value, uid, pkg);
+
+            return Integer.parseInt(result.toString()) == AppOpsManager.MODE_ALLOWED;
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
 }
--- a/src/android/MyReceiver.java
+++ b/src/android/MyReceiver.java
@@ -30,6 +30,10 @@ public class MyReceiver extends BroadcastReceiver {
            handlingNotificationReceive(context, intent);
        } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(action)) {
            handlingNotificationOpen(context, intent);
+        } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(action)) {
+            // 当在 HTML 页面中调用 JPushWeb.triggerNativeAction(String params) 方法时触发此方法，
+            // 再进行相关的操作。
+            
        } else {
            Log.d(TAG, "Unhandled intent - " + action);
        }
--- a/src/android/arm64-v8a/libjpush213.so
+++ b/src/android/arm64-v8a/libjpush213.so
--- a/src/android/arm64-v8a/libjpush217.so
+++ b/src/android/arm64-v8a/libjpush217.so
--- a/src/android/armeabi-v7a/libjpush213.so
+++ b/src/android/armeabi-v7a/libjpush213.so
--- a/src/android/armeabi-v7a/libjpush217.so
+++ b/src/android/armeabi-v7a/libjpush217.so
--- a/src/android/armeabi/libjpush213.so
+++ b/src/android/armeabi/libjpush213.so
--- a/src/android/armeabi/libjpush217.so
+++ b/src/android/armeabi/libjpush217.so
--- a/src/android/ic_richpush_actionbar_back.png
+++ b/src/android/ic_richpush_actionbar_back.png
--- a/src/android/ic_richpush_actionbar_divider.png
+++ b/src/android/ic_richpush_actionbar_divider.png
--- a/src/android/jpush-android-2.1.3.jar
+++ b/src/android/jpush-android-2.1.3.jar
--- a/src/android/jpush-android-2.1.7.jar
+++ b/src/android/jpush-android-2.1.7.jar
--- a/src/android/jpush_popwin_layout.xml
+++ b/src/android/jpush_popwin_layout.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/popLayoutId"
+    style="@style/MyDialogStyle"
+    android:orientation="vertical"
+    android:layout_width="280dp"
+    android:layout_height="250dp" >
+
+        <WebView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/wvPopwin"/>
+
+</LinearLayout>
--- a/src/android/jpush_style.xml
+++ b/src/android/jpush_style.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="MyDialogStyle">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+</resources>
--- a/src/android/jpush_webview_layout.xml
+++ b/src/android/jpush_webview_layout.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cn.jpush.android.ui.FullScreenView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbarLayoutId"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <RelativeLayout
+        android:id="@+id/rlRichpushTitleBar"
+        android:layout_width="match_parent"
+        android:layout_height="40.0dp"
+        android:background="#29313a">
+
+        <ImageButton
+            android:id="@+id/imgRichpushBtnBack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/richpush_btn_selector" />
+
+        <ImageView
+            android:id="@+id/imgView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/imgRichpushBtnBack"
+            android:clickable="false"
+            android:src="@drawable/ic_richpush_actionbar_divider" />
+
+        <TextView
+            android:id="@+id/tvRichpushTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="7dp"
+            android:layout_toRightOf="@id/imgView"
+            android:clickable="false"
+            android:text=" "
+            android:textSize="20sp"
+            android:textColor="#ffffff" />
+    </RelativeLayout>
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/fullWebView"
+        android:background="#000000" />
+
+</cn.jpush.android.ui.FullScreenView>
--- a/src/android/richpush_btn_selector.xml
+++ b/src/android/richpush_btn_selector.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<selector xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 获得焦点但未按下时的背景图片 --> 
+    <item 
+        android:state_focused="true" 
+        android:state_enabled="true" 
+        android:state_pressed="false" 
+        android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+     <!-- 按下时的背景图片 --> 
+    <item 
+        android:state_enabled="true" 
+        android:state_pressed="true" 
+        android:drawable="@android:color/darker_gray" /> 
+    <!-- 按下时的背景图片 --> 
+    <item 
+        android:state_enabled="true" 
+        android:state_checked="true" 
+        android:drawable="@android:color/darker_gray" /> 
+    <!-- 默认时的背景图片 --> 
+    <item android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+</selector> 
--- a/src/android/x86/libjpush213.so
+++ b/src/android/x86/libjpush213.so
--- a/src/android/x86/libjpush217.so
+++ b/src/android/x86/libjpush217.so
--- a/src/android/x86_64/libjpush213.so
+++ b/src/android/x86_64/libjpush213.so
--- a/src/android/x86_64/libjpush217.so
+++ b/src/android/x86_64/libjpush217.so
--- a/src/ios/Plugins/JPushPlugin.h
+++ b/src/ios/Plugins/JPushPlugin.h
@@ -58,6 +58,9 @@
 //地理位置上报 [latitude,longitude]
 -(void)setLocation:(CDVInvokedUrlCommand*)command;

+//检查用户的推送设置情况
+-(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command;
+
 /*
 *  以下为js中可监听到的事件
 *  jpush.openNotification      点击推送消息启动或唤醒app
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -9,12 +9,14 @@
 #import "JPushPlugin.h"
 #import "JPUSHService.h"
 #import <UIKit/UIKit.h>
+#import <AdSupport/AdSupport.h>

-static NSString *const JM_APP_KEY = @"APP_KEY";
-static NSString *const JM_APP_CHANNEL = @"CHANNEL";
-static NSString *const JM_APP_ISPRODUCTION = @"IsProduction";
+static NSString *const 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 *_luanchOptions = nil;
+static NSDictionary *_launchOptions = nil;

@implementation JPushPlugin

@@ -50,7 +52,7 @@ static NSDictionary *_luanchOptions = nil;
    }else{
        result = @(1);
    }
-    [self hanleResultWithValue:result command:command];
+    [self handleResultWithValue:result command:command];
 }

 -(void)initial:(CDVInvokedUrlCommand*)command{
@@ -90,8 +92,8 @@ static NSDictionary *_luanchOptions = nil;
                          name:kJPushPluginReceiveNotification
                        object:nil];

-    if (_luanchOptions) {
-        NSDictionary *userInfo = [_luanchOptions
+    if (_launchOptions) {
+        NSDictionary *userInfo = [_launchOptions
                                  valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
        if ([userInfo count] >0) {
            NSError  *error;
@@ -151,7 +153,7 @@ static NSDictionary *_luanchOptions = nil;
 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
    NSString* registrationID = [JPUSHService registrationID];
    NSLog(@"### getRegistrationID %@",registrationID);
-    [self hanleResultWithValue:registrationID command:command];
+    [self handleResultWithValue:registrationID command:command];
 }

 -(void)startLogPageView:(CDVInvokedUrlCommand*)command{
@@ -220,7 +222,7 @@ static NSDictionary *_luanchOptions = nil;
 -(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command {
    NSInteger num = [UIApplication sharedApplication].applicationIconBadgeNumber;
    NSNumber *number = [NSNumber numberWithInteger:num];
-    [self hanleResultWithValue:number command:command];
+    [self handleResultWithValue:number command:command];
 }

 -(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command{
@@ -257,9 +259,23 @@ static NSDictionary *_luanchOptions = nil;
    [JPUSHService setLatitude:[((NSString*)command.arguments[0]) doubleValue] longitude:[((NSString*)command.arguments[1]) doubleValue]];
 }

+-(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command{
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+        UIUserNotificationSettings *settings = [[UIApplication sharedApplication] currentUserNotificationSettings];
+        UIUserNotificationType type = settings.types;
+        NSNumber *number = [NSNumber numberWithInteger:type];
+        [self handleResultWithValue:number command:command];
+    }else{
+        UIRemoteNotificationType type = [[UIApplication sharedApplication] enabledRemoteNotificationTypes];
+        NSNumber *number = [NSNumber numberWithInteger:type];
+        [self handleResultWithValue:number command:command];
+    }
+
+}
+
 #pragma mark- 内部方法
 +(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{
-    _luanchOptions = theLaunchOptions;
+    _launchOptions = theLaunchOptions;

    [JPUSHService setDebugMode];

@@ -273,21 +289,30 @@ static NSDictionary *_luanchOptions = nil;
    }

    NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
-    NSString * appkey       = [plistData valueForKey:JM_APP_KEY];
-    NSString * channel      = [plistData valueForKey:JM_APP_CHANNEL];
-    NSNumber * isProduction = [plistData valueForKey:JM_APP_ISPRODUCTION];
+    NSString * appkey       = [plistData valueForKey:JP_APP_KEY];
+    NSString * channel      = [plistData valueForKey:JP_APP_CHANNEL];
+    NSNumber * isProduction = [plistData valueForKey:JP_APP_ISPRODUCTION];
+    NSNumber *isIDFA        = [plistData valueForKey:JP_APP_ISIDFA];

    if (!appkey || appkey.length == 0) {
        NSLog(@"error: app key not found in PushConfig.plist ");
        assert(0);
    }

-    [JPUSHService setupWithOption:_luanchOptions appKey:appkey
-                          channel:channel apsForProduction:[isProduction boolValue] ];
+    NSString *advertisingId = nil;
+    if(isIDFA){
+        advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
+    }
+    [JPUSHService setupWithOption:_launchOptions
+                           appKey:appkey
+                          channel:channel
+                 apsForProduction:[isProduction boolValue]
+            advertisingIdentifier:advertisingId];
+
 }

 #pragma mark 将参数返回给js
-(void)hanleResultWithValue:(id)value command:(CDVInvokedUrlCommand*)command{
+-(void)handleResultWithValue:(id)value command:(CDVInvokedUrlCommand*)command{
    CDVPluginResult *result = nil;
    CDVCommandStatus status = CDVCommandStatus_OK;

--- a/src/ios/PushConfig.plist
+++ b/src/ios/PushConfig.plist
@@ -8,5 +8,7 @@
 	<string>Subscription</string>
 	<key>IsProduction</key>
 	<false/>
+	<key>IsIDFA</key>
+	<false/>
 </dict>
 </plist>
--- a/src/ios/lib/JPUSHService.h
+++ b/src/ios/lib/JPUSHService.h
@@ -9,7 +9,7 @@
 * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
 */

-#define JPUSH_VERSION_NUMBER 2.1.0
+#define JPUSH_VERSION_NUMBER 2.1.8

 #import <Foundation/Foundation.h>

@@ -51,6 +51,7 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
 * @param appKey 一个JPush 应用必须的,唯一的标识. 请参考 JPush 相关说明文档来获取这个标识.
 * @param channel 发布渠道. 可选.
 * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES.
+ * @param advertisingIdentifier 广告标识符（IDFA） 如果不需要使用IDFA，传nil.
 *
 * @discussion 提供SDK启动必须的参数, 来启动 SDK.
 * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作.
@@ -61,6 +62,13 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
       apsForProduction:(BOOL)isProduction;


+ (void)setupWithOption:(NSDictionary *)launchingOption
+                 appKey:(NSString *)appKey
+                channel:(NSString *)channel
+       apsForProduction:(BOOL)isProduction
+  advertisingIdentifier:(NSString *)advertisingId;
+
+
 ///----------------------------------------------------
 /// @name APNs about 通知相关
 ///----------------------------------------------------
@@ -78,6 +86,7 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示

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

+
 /*!
 * @abstract 处理收到的 APNs 消息
 */
@@ -97,7 +106,7 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
 + (void) setTags:(NSSet *)tags
           alias:(NSString *)alias
 callbackSelector:(SEL)cbSelector
-          target:(id)theTarget;
+          target:(id)theTarget __attribute__((deprecated("JPush 2.1.1 版本已过期")));;

 + (void) setTags:(NSSet *)tags
           alias:(NSString *)alias
@@ -108,9 +117,9 @@ callbackSelector:(SEL)cbSelector
 callbackSelector:(SEL)cbSelector
          object:(id)theTarget;

-+ (void)      setTags:(NSSet *)tags
-                alias:(NSString *)alias
-fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler;
+ (void)setTags:(NSSet *)tags
+          alias:(NSString *)alias
+    fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler;

 + (void)  setTags:(NSSet *)tags
 aliasInbackground:(NSString *)alias;
--- a/src/ios/lib/jpush-ios-2.1.8.a
+++ b/src/ios/lib/jpush-ios-2.1.8.a
--- a/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -1,363 +1,372 @@
+var JPushPlugin = function () {}

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

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

-
-JPushPlugin.prototype.isPlatformIOS = function() {
-	var isPlatformIOS = device.platform == "iPhone"
-		|| device.platform == "iPad"
-		|| device.platform == "iPod touch"
-		|| device.platform == "iOS";
-	return isPlatformIOS;
+JPushPlugin.prototype.isPlatformIOS = function () {
+  var isPlatformIOS = device.platform == 'iPhone'
+    || device.platform == 'iPad'
+    || device.platform == 'iPod touch'
+    || device.platform == 'iOS'
+  return isPlatformIOS
 }

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

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

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

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

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

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

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

 // iOS methods
-JPushPlugin.prototype.setTagsWithAlias = function(tags, alias) {
-	try {
-  		if(tags == null) {
-  			this.setAlias(alias);
-      		return;
-  		}
-  		if(alias == null) {
-  			this.setTags(tags);
-			return;
-		}
-		var arrayTagWithAlias = [tags];
-		arrayTagWithAlias.unshift(alias);
-		this.call_native("setTagsWithAlias", arrayTagWithAlias, null);
-	} catch(exception) {
-    	console.log(exception);
-	}
-}
-
-JPushPlugin.prototype.setTags = function(tags) {
-	try {
-		this.call_native("setTags", tags, null);
-	} catch(exception) {
-		console.log(exception);
-	}
-}
-
-JPushPlugin.prototype.setAlias = function(alias) {
-	try {
-		this.call_native("setAlias", [alias], null);
-	} catch(exception) {
-		console.log(exception);
-	}
-}
-
-JPushPlugin.prototype.setBadge = function(value) {
-	if(this.isPlatformIOS()) {
-		try {
-			this.call_native("setBadge", [value], null);
-		} catch(exception) {
-			console.log(exception);
-		}
-	}
-}
-
-JPushPlugin.prototype.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.setTagsWithAlias = function (tags, alias) {
+  try {
+    if (tags == null) {
+      this.setAlias(alias)
+      return
    }
-}
-
-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);
+    if (alias == null) {
+      this.setTags(tags)
+      return
    }
+    var arrayTagWithAlias = [tags]
+    arrayTagWithAlias.unshift(alias)
+    this.call_native('setTagsWithAlias', arrayTagWithAlias, null)
+  } catch(exception) {
+    console.log(exception)
+  }
 }

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

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

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

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

-JPushPlugin.prototype.stopLogPageView = function(pageName) {
-  	if(this.isPlatformIOS()) {
-		this.call_native("stopLogPageView", [pageName], 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.beginLogPageView = function(pageName, duration) {
-  	if(this.isPlatformIOS()) {
-		this.call_native("beginLogPageView", [pageName, duration], null);
-	}
+JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function (
+  identifierKey) {
+  if (this.isPlatformIOS()) {
+    var data = [identifierKey]
+    this.call_native('deleteLocalNotificationWithIdentifierKey', data, null)
+  }
 }

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

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

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

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

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

-JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data) {
-	try {
-		console.log("JPushPlugin:receiveMessageInAndroidCallback");
-		data = JSON.stringify(data);
-		var bToObj = JSON.parse(data);
-		this.receiveMessage = bToObj
-		cordova.fireDocumentEvent('jpush.receiveMessage', null);
-	} catch(exception) {
-		console.log("JPushPlugin:pushCallback " + exception);
-	}
+JPushPlugin.prototype.receiveMessageInAndroidCallback = function (data) {
+  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 {
-		console.log("JPushPlugin:openNotificationInAndroidCallback");
-		data = JSON.stringify(data);
-		var bToObj = JSON.parse(data);
-		this.openNotification = bToObj;
-		cordova.fireDocumentEvent('jpush.openNotification', null);
-	} catch(exception) {
-		console.log(exception);
-	}
+JPushPlugin.prototype.openNotificationInAndroidCallback = function (data) {
+  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{
-		console.log("JPushPlugin:receiveNotificationInAndroidCallback");
-		data = JSON.stringify(data);
-		var bToObj = JSON.parse(data);
-		this.receiveNotification = bToObj;
-		cordova.fireDocumentEvent('jpush.receiveNotification', null);
-	} catch(exception) {
-		console.log(exception);
-	}
+JPushPlugin.prototype.receiveNotificationInAndroidCallback = function (data) {
+  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") {
-		data = [];
-		this.call_native("clearAllNotification", data, null);
-	}
+JPushPlugin.prototype.clearAllNotification = function () {
+  if (device.platform == 'Android') {
+    data = []
+    this.call_native('clearAllNotification', data, null)
+  }
 }

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

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

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

-JPushPlugin.prototype.addLocalNotification = function(builderId, content, title,
-	notificationID, broadcastTime, extras) {
-	if(device.platform == "Android") {
-		data = [builderId, content, title, notificationID, broadcastTime, extras];
-		this.call_native("addLocalNotification", data, null);
-	}
+JPushPlugin.prototype.addLocalNotification = function (builderId, content, title,
+  notificationID, broadcastTime, extras) {
+  if (device.platform == 'Android') {
+    data = [builderId, content, title, notificationID, broadcastTime, extras]
+    this.call_native('addLocalNotification', data, null)
+  }
 }

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

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

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

 /**
 *是否开启统计分析功能，用于“用户使用时长”，“活跃用户”，“用户打开次数”的统计，并上报到服务器上，
 *在 Portal 上展示给开发者。
 */
-JPushPlugin.prototype.setStatisticsOpen = function(mode) {
-	if(device.platform == "Android") {
-		this.call_native("setStatisticsOpen", [mode], null);
-	}
+JPushPlugin.prototype.setStatisticsOpen = function (mode) {
+  if (device.platform == 'Android') {
+    this.call_native('setStatisticsOpen', [mode], null)
+  }
 }

 /**
 * 用于在 Android 6.0 及以上系统，申请一些权限
 * 具体可看：http://docs.jpush.io/client/android_api/#android-60
 */
-JPushPlugin.prototype.requestPermission = function() {
-	if(device.platform == "Android") {
-		this.call_native("requestPermission", [], null);
-	}
+JPushPlugin.prototype.requestPermission = function () {
+  if (device.platform == 'Android') {
+    this.call_native('requestPermission', [], null)
+  }
 }

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

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

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

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

-module.exports = new JPushPlugin();
+module.exports = new JPushPlugin()
Author	SHA1	Message	Date
Hevin	3101dcdd8e	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-20 14:41:42 +08:00
Hevin	a46da92fa1	Format js file.	2016-07-20 14:40:40 +08:00
Hevin	5547d5716e	Update event callback.	2016-07-20 14:34:35 +08:00
Hevin	7da0a25db0	Format js.	2016-07-19 17:15:40 +08:00
Hevin	0c74ff328d	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-07-19 17:13:58 +08:00
Hevin	2065ad44ce	Format README.	2016-07-18 16:39:15 +08:00
Hevin	cbe8e511f2	Update README	2016-07-18 16:06:14 +08:00
Hevin	9a47c88873	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-16 00:17:25 +08:00
Hevin	684039b044	Format README	2016-07-15 18:02:02 +08:00
Hevin	356de48d31	Format README	2016-07-15 18:00:39 +08:00
Hevin	d412b10d3e	Update README	2016-07-15 17:56:39 +08:00
Hevin	44345d9753	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-13 23:08:30 +08:00
Hevin	5f93fc3f49	Update API to don't depend support lib.	2016-07-13 23:07:01 +08:00
Hevin	673a402c51	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-07-13 22:23:37 +08:00
Hevin	09e0d62360	Update README	2016-07-13 22:03:35 +08:00
Hevin	b4830d4ef7	Remove dependency.	2016-07-13 16:34:40 +08:00
Hevin	2c3bf53792	Update npm version.	2016-07-12 14:57:58 +08:00
Hevin	78ebe0e787	Update plugin id.	2016-07-12 14:51:20 +08:00
Hevin	54f87adde2	Add API doc.	2016-07-12 14:09:48 +08:00
Hevin	c101552938	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-07-12 13:54:29 +08:00
Hevin	c918efb99a	Update version number.	2016-07-12 13:53:12 +08:00
Hevin	9be760e65e	Add API doc.	2016-07-12 13:47:19 +08:00
Hevin	cea1eb85fa	Add Android API.	2016-07-12 13:34:08 +08:00
E.B	f8c56b5aa1	iOS - update API 1.更新检查用户通知设置 API 的参数	2016-07-12 11:52:47 +08:00
E.B	0bb6838477	iOS - update new API 1.添加检测用户通知设置的 API	2016-07-12 11:16:58 +08:00
Hevin	c6b8a6f2f6	Update Plugin.xml.	2016-07-11 10:03:09 +08:00
Hevin	42fbe62d19	Merge branch 'dev' of https://github.com/jpush/jpush-phonegap-plugin into dev	2016-07-10 17:08:49 +08:00
Hevin	d3ea41f513	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-07-10 17:05:53 +08:00
Hevin	5ff7d14bec	Update Plugin name.	2016-07-10 17:05:05 +08:00
Hevin	1c41e96f42	Update README.	2016-07-08 13:26:39 +08:00
Hevin	48adf59ec8	Update README.	2016-07-07 17:54:48 +08:00
E.B	3369072687	iOS - update SDK 2.1.8 1.更新 iOS SDK 2.1.8	2016-07-01 10:34:49 +08:00
Hevin	8e7e957884	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-06-28 16:00:04 +08:00
Hevin	c615f8255e	Optimize installition & update Android SDK to 2.1.7	2016-06-28 15:57:34 +08:00
E.B	7ffec241fa	iOS - fix #151 1. fix #151	2016-06-27 10:59:26 +08:00
Hevin	de32f4a057	Format README	2016-06-27 10:40:03 +08:00
Hevin	1cd7ecf3e5	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-06-27 10:37:39 +08:00
Hevin	b01b4bf259	Add dependency & Update README	2016-06-27 10:34:16 +08:00
Hevin	f8efb4f010	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-06-27 10:29:39 +08:00
Hevin	870fc12c0d	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-06-23 13:23:13 +08:00
Hevin	dc2cdda00c	Update README Add QQ group badge.	2016-06-23 13:18:27 +08:00
Hevin	1c96487869	Update install script.	2016-06-17 17:44:42 +08:00
Hevin	8d24ce7c48	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-06-17 13:41:20 +08:00
Hevin	280846779d	Update Android SDK to 2.1.5	2016-06-17 13:39:23 +08:00
Hevin	1ba048ee1b	Update README	2016-06-12 16:25:11 +08:00
E.B	e4500dd513	iOS - update 1.拼写错误	2016-05-31 13:36:43 +08:00
Hevin	a511072101	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-05-30 18:01:17 +08:00
Hevin	851ff1f23b	Update version.	2016-05-30 18:00:47 +08:00
Hevin	5cf5bd39d1	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2016-05-30 17:58:41 +08:00
E.B	07bb05f337	Merge branch 'dev'	2016-05-30 17:34:32 +08:00
E.B	ceeb2fc7cf	iOS - fix #147 1.fix #147	2016-05-30 17:29:07 +08:00
E.B	1eccd58059	Merge branch 'dev'	2016-05-27 13:58:45 +08:00
E.B	a82382eddf	iOS - update 1.更新 iOS SDK v2.1.7 2.IDFA 默认关闭	2016-05-27 10:04:57 +08:00
Hevin	be6dbf4fe6	Merge remote-tracking branch 'refs/remotes/origin/dev'	2016-05-25 16:15:02 +08:00
Hevin	e898c7933c	Merge branch 'master' into dev	2016-05-18 14:19:12 +08:00
Hevin	bce5b4df68	fix warming when add and remove plugin.	2016-05-18 14:19:09 +08:00
Hevin	3810209ca6	Merge pull request #146 from withwind8/master add dependent plugin cordova-plugin-device	2016-05-13 13:39:04 +08:00
Hevin	39155bf63c	Merge branch 'dev'	2016-05-13 13:38:27 +08:00
Hevin	93989a7ad1	update README	2016-05-13 13:37:00 +08:00
Li Qing	8c6044b6a6	add dependent plugin cordova-plugin-device	2016-05-13 11:53:12 +08:00
Hevin	9c0c2c0bd1	Merge branch 'master' into dev	2016-05-13 11:31:07 +08:00
Hevin	380c09283d	update Android API Doc add Rich Push callback API.	2016-05-13 11:23:52 +08:00
Hevin	730b93d82a	update npm version	2016-05-13 11:04:19 +08:00
Hevin	39d65d61c8	Merge branch 'dev'	2016-05-13 10:57:56 +08:00
Hevin	4ed844e0c5	support rich push.	2016-05-13 10:49:36 +08:00
Hevin	1f2499a893	Merge branch 'master' into dev	2016-05-13 10:34:30 +08:00
Hevin	bca6853a4e	Merge branch 'dev'	2016-05-10 14:12:57 +08:00
Hevin	0015cd23e4	update README	2016-05-10 14:11:29 +08:00
Hevin	8b5efdcdcc	Merge branch 'master' into dev	2016-05-10 14:11:16 +08:00
Hevin	4bc24e66d4	Merge branch 'dev'	2016-04-28 09:27:32 +08:00
Hevin	53dcfa0087	update READEME 更新 cordova device 插件安装命令。	2016-04-28 09:25:42 +08:00
Hevin	c9755d4f64	Merge branch 'master' into dev	2016-04-28 09:24:01 +08:00
E.B	6409ce4934	Merge branch 'dev'	2016-04-27 10:37:30 +08:00
E.B	aa3a4a218c	iOS - update 1.更新目录 2.更新 README.md 3.重写 iOS_install.md	2016-04-26 14:43:52 +08:00
E.B	79fb3b76ca	iOS - update 1.更新 iOS sdk 2.更改启动 sdk 的方法 3.PushConfig.plist 添加 isIDFA 字段	2016-04-26 14:02:35 +08:00