Merge branch 'dev'

check does `com.apple.Push` attribute exist in .pbxproj

.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

@@ -1,40 +1,48 @@
 # 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)
-[![QQ Group](https://img.shields.io/badge/QQ%20Group-413602425-red.svg)]()
-[![release](https://img.shields.io/badge/release-3.0.3-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-3.2.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)
 [![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)。
+极光官方支持的 cordova 推送插件。
 
-> 如需要短信验证码功能的插件，可关注 [JSMS Cordova Plugin](https://github.com/jpush/cordova-plugin-jsms)。
-
-> QQ 交流群：413602425。
+- 如需要 IM 功能的插件，可关注 [jmessage-phonegap-plugin](https://github.com/jpush/jmessage-phonegap-plugin)
+- 如需要短信验证码功能插件，可关注 [cordova-plugin-jsms](https://github.com/jpush/cordova-plugin-jsms)
+- 如需要统计分析功能插件，可关注 [cordova-plugin-janalytics](https://github.com/jpush/cordova-plugin-janalytics)
 
 ## Install
 
 - 通过 Cordova Plugins 安装，要求 Cordova CLI 5.0+：
 
+  ```shell
   cordova plugin add jpush-phonegap-plugin --variable APP_KEY=your_jpush_appkey
+  ```
 
 - 或直接通过 url 安装：
 
+  ```shell
   cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable APP_KEY=your_jpush_appkey
+  ```
 
 - 或下载到本地安装：
 
+  ```shell
   cordova plugin add Your_Plugin_Path  --variable APP_KEY=your_jpush_appkey
+  ```
 
+> 在使用 Xcode 8 调试 iOS 项目时，需要先在项目配置界面的 Capabilities 中打开 Push Notifications 开关。
 
 ## Usage
+
 ### API
+
 - [Common](/doc/Common_detail_api.md)
 - [iOS](/doc/iOS_API.md)
 - [Android](/doc/Android_detail_api.md)
 
 ### Demo
+
 插件项目中包含一个简单的 Demo。若想参考，可以在 */example* 文件夹内找到并拷贝以下文件:
 
     example/index.html -> www/index.html
@@ -42,16 +50,26 @@
     example/js/* -> www/js
 
 ### 关于 PhoneGap build 云服务
+
 该项目基于 Cordova 实现，目前无法使用 PhoneGap build 云服务进行打包，建议使用本地环境进行打包。
 
 ## FAQ
-> 如果遇到了疑问，请优先参考 Demo 和 API 文档。若还无法解决，可访问[极光社区](http://community.jiguang.cn/)或 [Issues](https://github.com/jpush/jpush-phonegap-plugin/issues) 提问。
+
+> 如果遇到了疑问，请优先参考 Demo 和 API 文档。若还无法解决，可到 [Issues](https://github.com/jpush/jpush-phonegap-plugin/issues) 提问。
 
 ### Android
+
 #### 在 Eclipse 中 import 工程之后出现：*Type CallbackContext cannot be resolved to a type*
+
 右键单击工程名 -> Build Path -> Config Build Path -> Projects -> 选中工程名称 -> CordovaLib -> 点击 add。
 
+#### 如何自定义通知声音？
+
+Android 因为各 Rom 的高度定制化，不像 iOS 一样能有一个统一的管理，如果在 Android 中想自定义通知铃声，推荐通过 JPush 推送自定义
+消息，之后在 `jpush.receiveMessage` 事件监听中通过 [Cordova Local-Notification Plugin](https://github.com/katzer/cordova-plugin-local-notifications) 触发通知，再配合 [Cordova Background Plugin](https://github.com/katzer/cordova-plugin-background-mode) 插件保证应用的后台运行。
+
 #### 关闭 App 后收不到通知
+
 Android 的推送通过长连接的方式实现，只有在连接保持的情况下才能收到通知。而有的第三方 ROM 会限制一般应用服务的自启动，也就是
 在退出应用后，应用的所有服务均被杀死，且无法自启动，所以就会收不到通知。
 
@@ -62,32 +80,48 @@ Android 的推送通过长连接的方式实现，只有在连接保持的情况
 或者自己实现应用保活，网上有很多相关文章（不推荐）。
 
 > 为什么 QQ、微信之类的应用退出后还能够收到通知？因为这些大厂应用，手机厂商默认都会加入自启动白名单中，也不会在应用退出后杀死它们的相关服务。
-如果你多加留意，就会发现非大厂的应用如果你一段时间不用都是收不到推送的。
+> 如果你多加留意，就会发现非大厂的应用如果你一段时间不用都是收不到推送的。
 
 ### iOS
+
+#### 打包时遇到 i386 打包失败怎么办？
+
+```shell
+cordova platform update ios
+```
+
+#### ionic 2 如何调用 API？
+
+[issue 179](https://github.com/jpush/jpush-phonegap-plugin/issues/179)
+
 #### PushConfig.plist 文件中的字段都是什么意思？
+
 - Appkey：应用标识。
 - Channel：渠道标识。
 - IsProduction：是否生产环境。
 - IsIDFA：是否使用 IDFA 启动 SDK。
 
 #### 刚集成完插件收不到推送怎么办？
+
 请首先按照正确方式再次配置证书、描述文件，具体可参考 [iOS 证书设置指南](https://docs.jiguang.cn/jpush/client/iOS/ios_cer_guide/)。
 
-#### iOS 集成插件白屏、或无法启动插件、或打包报错无法找到需要引入的文件怎么办?
+#### iOS 集成插件白屏、或无法启动插件、或打包报错无法找到需要引入的文件怎么办？
+
 按照以下步骤逐个尝试：
 
-- 升级至 Xcode 8
-- 先删除插件、再重装插件
-- 先使用 `cordova platform add ios`，后使用 `cordova plugin add`
+- 升级至最新版本 Xcode
+- 删除插件、再重装插件（先使用 `cordova platform add ios`，后使用 `cordova plugin add`）
 
 ## Support
-- QQ 群：413602425
+
+- QQ 群：413602425 / 524248013
 - [JPush 官网文档](https://docs.jiguang.cn/jpush/guideline/intro/)
 - [极光社区](http://community.jiguang.cn/)
 
 ## Contribute
+
 Please contribute! [Look at the issues](https://github.com/jpush/jpush-phonegap-plugin/issues).
 
 ## License
+
 MIT © [JiGuang](/license)

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
@@ -250,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)
@@ -45,7 +45,6 @@
 
     window.plugins.jPushPlugin.stopPush()
 
-
 ### API - resumePush
 
 恢复推送服务。调用了此 API 后:
@@ -72,7 +71,6 @@
 
 	+ 平台检查推送服务是否注册。
 
-
 #### 接口定义
 
     window.plugins.jPushPlugin.isPushStopped(callback)
@@ -91,6 +89,20 @@
 		 }
     })
 
+## 开启 Debug 模式
+### API - setDebugMode
+用于开启 Debug 模式，显示更多的日志信息。
+
+#### 接口定义
+
+		JPushPlugin.prototype.setDebugMode(isOpen)
+
+#### 参数说明
+- isOpen: true，开启 Debug 模式；false，关闭 Debug 模式，不显示错误信息之外的日志信息。
+
+#### 代码示例
+
+		window.plugins.jPushPlugin.setDebugMode(true)
 
 ## 获取 RegistrationID
 
@@ -149,9 +161,11 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 接口定义
 
-	JPushPlugin.prototype.setTagsWithAlias(tags, alias)
-	JPushPlugin.prototype.setTags(tags)
-	JPushPlugin.prototype.setAlias(alias)
+```js
+JPushPlugin.prototype.setTagsWithAlias(tags, alias, successCallback, errorCallback)
+JPushPlugin.prototype.setTags(tags, successCallback, errorCallback)
+JPushPlugin.prototype.setAlias(alias, successCallback, errorCallback)
+```
 
 #### 参数说明
 * tags:
@@ -169,17 +183,15 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
 	* 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。
 
-#### 返回值说明
+#### 代码示例
 
-函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果:
-
-	document.addEventListener("jpush.setTagsWithAlias", function(event) {
-      console.log("onTagsWithAlias")
-      var result = "result code:" + event.resultCode + " "
-      result += "tags:" + event.tags + " "
-      result += "alias:" + event.alias + " "
-      $("#tagAliasResult").html(result)
-    }, false)
+```js
+window.plugins.jPushPlugin.setTagsWithAlias([tag1, tag2], alias1, function () {
+  // success callback.
+}, function (errorMsg) {
+  // errorMsg 格式为 'errorCode: error message'.
+})
+```
 
 #### 错误码定义
 
@@ -211,7 +223,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
           if(device.platform == "Android") {
             alertContent = event.alert
           } else {
-            lertContent = event.aps.alert
+            alertContent = event.aps.alert
           }
 	    }, false)
 

doc/iOS_API.md

@@ -21,7 +21,6 @@
 - [监听事件统一说明](#监听事件统一说明)
 
 
-
 ## 延迟注册和启动推送通知服务
 
 本插件默认在 App 启动完成之后，立即「注册苹果通知服务」+「启动 JPush SDK」，其中：
@@ -45,7 +44,6 @@ window.plugins.jPushPlugin.startJPushSDK()
 ```
 
 
-
 ## 开始与停止推送服务
 
 ### API - init
@@ -87,8 +85,6 @@ window.plugins.jPushPlugin.init()
 window.plugins.jPushPlugin.resumePush()
 ```
 
-
-
 ### API - isPushStopped
 
 iOS平台，检查推送服务是否停止。
@@ -179,9 +175,9 @@ window.plugins.jPushPlugin.getRegistrationID(function(data) {
 #### 接口定义
 
 ```
-JPushPlugin.prototype.setTagsWithAlias(tags, alias)
-JPushPlugin.prototype.setTags(tags)
-JPushPlugin.prototype.setAlias(alias)
+JPushPlugin.prototype.setTagsWithAlias(tags, alias, successCallback, errorCallback)
+JPushPlugin.prototype.setTags(tags, successCallback)
+JPushPlugin.prototype.setAlias(alias, errorCallback)
 ```
 
 #### 参数说明
@@ -201,21 +197,6 @@ JPushPlugin.prototype.setAlias(alias)
   - 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
   - 限制：alias 命名长度限制为 40 字节（判断长度需采用 UTF-8 编码）。
 
-#### 返回值说明
-
-函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果。
-
-```js
-var onTagsWithAlias = function(event) {
-    console.log("onTagsWithAlias")
-    var result = "result code:"+event.resultCode + " "
-    result += "tags:" + event.tags + " "
-    result += "alias:" + event.alias + " "
-    $("#tagAliasResult").html(result)
-}
-document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false)
-```
-
 #### 错误码定义
 
 | Code | 描述                          | 详细解释                              |
@@ -406,7 +387,7 @@ JPush 封装 badge 功能，允许应用上传 badge 值至 JPush 服务器，
 
 ```js
 window.plugins.jPushPlugin.prototype.setBadge(value)
-window.plugins.jPushPlugin.prototype.reSetBadge()
+window.plugins.jPushPlugin.prototype.resetBadge()
 ```
 
 resetBadge 相当于 setBadge(0)。
@@ -423,7 +404,7 @@ value 取值范围：[0,99999]。
 
 ```js
 window.plugins.jPushPlugin.setBadge(5)
-window.plugins.jPushPlugin.reSetBadge()
+window.plugins.jPushPlugin.resetBadge()
 ```
 
 ### API - setApplicationIconBadgeNumber
@@ -438,7 +419,7 @@ window.plugins.jPushPlugin.prototype.setApplicationIconBadgeNumber(badge)
 
 #### 参数说明
 
-- badge: 整形，例如 0，1，2（当 badge 为 0 时，角标被清除）。
+- badge: 整型，例如 0，1，2（当 badge 为 0 时，角标被清除）。
 
 #### 代码示例
 
@@ -882,4 +863,3 @@ window.plugins.jPushPlugin.prototype.getUserNotificationSettings(callback)
 ##### jpush.receiveLocalNotification
 
 > [iOS 10 before 收到本地通知](#ios-10-before-收到本地通知)
-

example/index.html

@@ -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);
                 }

hooks/apns.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>aps-environment</key>
+		<string>development</string>
+	</dict>
+</plist>

hooks/common.js

@@ -0,0 +1,93 @@
+/*
+ * Author: Derek Chia <snipking@gmail.com>
+ * common functions for cordova plugin after hook
+ */
+const fs = require('fs');
+const path = require('path');
+
+module.exports.addAPNSinEntitlements = (entitlementPath, isProduction) => {
+    if( fs.existsSync(entitlementPath) ) {
+        fs.readFile(entitlementPath, "utf8", function(err, data) {
+            if (err) {
+                throw err;
+            }
+
+            console.log("Reading entitlements file asynchronously");
+
+            let toInsert = '<key>aps-environment</key>\n' +
+                           '\t\t<string>development</string>';
+            if(isProduction) {
+                toInsert = '<key>aps-environment</key>\n' +
+                           '\t\t<string>production</string>';
+            }
+
+            let re1 = new RegExp('<key>aps-environment<\/key>(.|[\r\n])*<string>.*<\/string>');
+            let matched = data.match(re1);
+            let result;
+            if (matched === null) {
+                if(data.match(/<\/dict>/g)) {
+                    result = data.replace(/<\/dict>/, '\t' + toInsert + '\n\t</dict>');
+                } else if(data.match(/<dict\/>/g)) {
+                    result = data.replace(/<dict\/>/, '\t<dict>\n\t\t' + toInsert + '\n\t</dict>');
+                }
+            } else {
+                result = data.replace(re1, toInsert);
+            }
+
+            // write result to entitlements file
+            fs.writeFile(entitlementPath, result, {"encoding": 'utf8'}, function(err) {
+                if (err) {
+                    throw err;
+                }
+                console.log(entitlementPath + " written successfully");
+            });
+        });
+    } else {
+        console.log("Entitlement File '" + entitlementPath + "' not found. Make sure your ios platform upper than 4.3.0");
+    }
+}
+
+module.exports.removeAPNSinEntitlements = (entitlementPath) => {
+    if( fs.existsSync(entitlementPath) ) {
+        fs.readFile(entitlementPath, "utf8", function(err, data) {
+            if (err) {
+                throw err;
+            }
+
+            console.log("Reading entitlements file asynchronously");
+
+            let re1 = new RegExp('<key>aps-environment<\/key>(.|[\r\n])*<string>.*<\/string>');
+            let matched = data.match(re1);
+            let result;
+            if (matched != null) {
+                result = data.replace(re1, "");
+            }
+
+            // write result to entitlements file
+            fs.writeFile(entitlementPath, result, {"encoding": 'utf8'}, function(err) {
+                if (err) {
+                    throw err;
+                }
+                console.log(entitlementPath + " written successfully");
+            });
+        });
+    } else {
+        console.log("Entitlement File '" + entitlementPath + "' not found. Make sure your ios platform upper than 4.3.0");
+    }
+}
+
+module.exports.getXcodeProjName = (searchPath) => {
+    if(searchPath == null || searchPath == undefined) {
+        searchPath = './';
+    }
+    let resultFolderName = null;
+    let folderNames = fs.readdirSync(searchPath).filter(file => fs.lstatSync(path.join(searchPath, file)).isDirectory());
+    let folderNamesReg = new RegExp('.*\.xcodeproj', 'g')  // get filder name like `*.xcodeproj`
+    for(let folderName of folderNames) {
+        if(folderName.match(folderNamesReg)) {
+            resultFolderName = folderName;
+            break;
+        }
+    }
+    return resultFolderName.substr(0, resultFolderName.length - 10);
+}

hooks/iosDisablePush.js

@@ -0,0 +1,66 @@
+/*
+ * Author: Derek Chia <snipking@gmail.com>
+ * Cordova plugin after hook to disable `Push Notification` capability for XCode 8
+ */
+
+const fs = require('fs');
+const path = require('path');
+let commonFuncs = require('./common');
+
+/**
+ * remove APNS env from cordova project Entitlements-Debug.plist and Entitlements-Release.plist
+ * This two file will work when xcode archive app
+ */
+let disablePushNotificationForCI = (basePath, xcodeprojName) => {
+    commonFuncs.removeAPNSinEntitlements(basePath + xcodeprojName + '/Entitlements-Debug.plist');
+    commonFuncs.removeAPNSinEntitlements(basePath + xcodeprojName + '/Entitlements-Release.plist');
+}
+
+/**
+ * remove APNS env to entitlement file; disable Push Notification capability in .pbxproj file
+ * This two file will work when xcode archive app
+ */
+let disablePushNotificationForXCode = (entitlementsPath, pbxprojPath) => {
+    /**
+     * remove APNS env to entitlement file
+     */
+    if( fs.existsSync(entitlementsPath) ) {
+        commonFuncs.removeAPNSinEntitlements(entitlementsPath);
+    }
+
+    /**
+     * disable Push Notification capability in .pbxproj file
+     * equally disable "Push Notification" switch in xcode
+     */
+    fs.readFile(pbxprojPath, "utf8", function(err, data) {
+        if (err) {
+            throw err;
+        }
+        console.log("Reading pbxproj file asynchronously");
+
+        // turn off Push Notification Capability
+        let re4rep = new RegExp('isa = PBXProject;(.|[\r\n])*TargetAttributes(.|[\r\n])*SystemCapabilities(.|[\r\n])*com\.apple\.Push = {(.|[\r\n])*enabled = [01]');
+        let parts = re4rep.exec(data);
+        if(parts !== null && parts !== undefined && parts.length > 0) {
+            result = data.replace(re4rep, parts[0].substr(0, parts[0].length - 1) + '0');
+        
+            // write result to project.pbxproj
+            fs.writeFile(pbxprojPath, result, {"encoding": 'utf8'}, function(err) {
+                if (err) {
+                    throw err;
+                }
+                console.log(pbxprojPath + " written successfully");
+            });
+        }
+    });
+}
+
+let basePath = './platforms/ios/';
+let buildType = 'dev';
+let xcodeprojName = commonFuncs.getXcodeProjName(basePath);
+let pbxprojPath = basePath + xcodeprojName + '.xcodeproj/project.pbxproj';
+let entitlementsPath = basePath + xcodeprojName + '/' + xcodeprojName + '.entitlements';
+
+disablePushNotificationForCI(basePath, xcodeprojName);
+
+disablePushNotificationForXCode(entitlementsPath, pbxprojPath);

hooks/iosEnablePush.js

@@ -0,0 +1,172 @@
+/*
+ * Author: Derek Chia <snipking@gmail.com>
+ * Cordova plugin after hook to enable `Push Notification` capability for XCode 8
+ */
+
+const fs = require('fs');
+const path = require('path');
+let commonFuncs = require('./common');
+
+/**
+ * add APNS env to cordova project Entitlements-Debug.plist and Entitlements-Release.plist
+ * This two file will work when xcode archive app
+ */
+let enablePushNotificationForCI = (basePath, xcodeprojName) => {
+    commonFuncs.addAPNSinEntitlements(basePath + xcodeprojName + '/Entitlements-Debug.plist', false);
+    commonFuncs.addAPNSinEntitlements(basePath + xcodeprojName + '/Entitlements-Release.plist', true);
+}
+
+/**
+ * add APNS env to entitlement file; enable Push Notification capability in .pbxproj file
+ * This two file will work when xcode archive app
+ */
+let enablePushNotificationForXCode = (entitlementsPath, pbxprojPath, cordovaBuildConfig) => {
+    console.log('will enable push notification capability for XCode');
+    let needAddEntitlementToPbxproj = false;
+    /**
+     * add APNS env to entitlement file
+     * without this file will cause a worning in xcode
+     */
+    if( fs.existsSync(entitlementsPath) ) {
+        commonFuncs.addAPNSinEntitlements(entitlementsPath, false);
+    } else {
+        // copy default entitlements file
+        fs.readFile(__dirname + '/apns.entitlements', 'utf8', function(err, data) {
+            if (err) {
+                throw err;
+            }
+
+            fs.writeFileSync(entitlementsPath, data);
+            console.log(entitlementsPath + " written successfully");
+        });
+
+        needAddEntitlementToPbxproj = true;
+    }
+
+    /**
+     * enable Push Notification capability in .pbxproj file
+     * equally enable "Push Notification" switch in xcode
+     */
+    fs.readFile(pbxprojPath, "utf8", function(err, data) {
+        if (err) {
+            throw err;
+        }
+        console.log("Reading pbxproj file asynchronously");
+
+        // add Push Notification Capability
+        let re1 = new RegExp('isa = PBXProject;(.|[\r\n])*TargetAttributes', 'g');
+        let re1rep = new RegExp('isa = PBXProject;(.|[\r\n])*attributes = {', 'g');
+        let re2 = new RegExp('(?:isa = PBXProject;(.|[\r\n])*TargetAttributes(.|[\r\n])*)SystemCapabilities', 'g');
+        let re2rep = new RegExp('isa = PBXProject;(.|[\r\n])*TargetAttributes = {', 'g');
+        let re3 = new RegExp('(?:isa = PBXProject;(.|[\r\n])*TargetAttributes(.|[\r\n])*SystemCapabilities(.|[\r\n])*)com\.apple\.Push', 'g');
+        let re3rep = new RegExp('isa = PBXProject;(.|[\r\n])*TargetAttributes(.|[\r\n])*SystemCapabilities = {', 'g');
+        let re4rep = new RegExp('isa = PBXProject;(.|[\r\n])*TargetAttributes(.|[\r\n])*SystemCapabilities(.|[\r\n])*com\.apple\.Push = {(.|[\r\n])*enabled = [01]');
+
+        let matched = data.match(re1);
+        let result;
+        if (matched === null) {
+            console.log('re1 not match, no TargetAttributes');
+            result = data.replace(re1rep,   'isa = PBXProject;\n' +
+                                            '\t\t\tattributes = {\n' +
+                                            '\t\t\t\tTargetAttributes = {\n' +
+                                            '\t\t\t\t\t1D6058900D05DD3D006BFB54 = {\n' +
+                                            '\t\t\t\t\t\tDevelopmentTeam = ' + cordovaBuildConfig.ios.release.developmentTeam + ';\n' +
+                                            '\t\t\t\t\t\tSystemCapabilities = {\n' +
+                                            '\t\t\t\t\t\t\tcom.apple.Push = {\n' +
+                                            '\t\t\t\t\t\t\t\tenabled = 1;\n' +
+                                            '\t\t\t\t\t\t\t};\n' +
+                                            '\t\t\t\t\t\t};\n' +
+                                            '\t\t\t\t\t};\n' +
+                                            '\t\t\t\t};');
+        } else {
+            matched = data.match(re2);
+            if(matched === null) {
+                console.log('re2 not match, nothing under TargetAttributes');
+                let parts = re2rep.exec(data);
+                result = data.replace(re2rep, parts[0] + '\n' + '\t\t\t\t\t1D6058900D05DD3D006BFB54 = {\n' +
+                                                                '\t\t\t\t\t\tDevelopmentTeam = ' + cordovaBuildConfig.ios.release.developmentTeam + ';\n' +
+                                                                '\t\t\t\t\t\tSystemCapabilities = {\n' +
+                                                                '\t\t\t\t\t\t\tcom.apple.Push = {\n' +
+                                                                '\t\t\t\t\t\t\t\tenabled = 1;\n' +
+                                                                '\t\t\t\t\t\t\t};\n' +
+                                                                '\t\t\t\t\t\t};\n' +
+                                                                '\t\t\t\t\t};');
+            } else {
+                matched = data.match(re3);
+                if(matched === null) {
+                    console.log('re3 not match, no com.apple.Push defined');
+                    let parts = re3rep.exec(data);
+                    result = data.replace(re3rep, parts[0] + '\n' + '\t\t\t\t\t\t\tcom.apple.Push = {\n' +
+                                                                    '\t\t\t\t\t\t\t\tenabled = 1;\n' +
+                                                                    '\t\t\t\t\t\t\t};');
+                } else {
+                    console.log('just enable com.apple.Push');
+                    let parts = re4rep.exec(data);
+                    result = data.replace(re4rep, parts[0].substr(0, parts[0].length - 1) + '1');
+                }
+            }
+        }
+
+        // add entitlements
+        if (needAddEntitlementToPbxproj) {
+
+            let pathArray = entitlementsPath.split("/");
+            let entitlementsFileName = pathArray[pathArray.length - 1];
+            let projectFolderName = pathArray[pathArray.length - 2];
+
+            result = result.replace(new RegExp('\\/\\* Begin PBXFileReference section \\*\\/'),  '/* Begin PBXFileReference section */\n' +
+                                                                        '\t\tD7BB385F1E4DB54800345BF4 /* ' + entitlementsFileName + ' */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = "' + entitlementsFileName + '"; path = "' + projectFolderName + '/' + entitlementsFileName + '"; sourceTree = "<group>"; };');
+            result = result.replace(new RegExp('\\/\\* CustomTemplate \\*\\/.*\n.*isa = PBXGroup;.*\n.*children = \\('), '/* CustomTemplate */ = {\n' +
+                            '\t\t\tisa = PBXGroup;\n' +
+                            '\t\t\tchildren = (\n' +
+                            '\t\t\t\tD7BB385F1E4DB54800345BF4 /* ' + entitlementsFileName + ' */,');
+            let re5rep = new RegExp('\\/\\* Debug \\*\\/.*\n.*isa = XCBuildConfiguration;.*\n.*\n.*buildSettings = {');
+            let parts = result.match(re5rep);
+            result = result.replace(re5rep, parts + '\n\t\t\t\tCODE_SIGN_ENTITLEMENTS = "' + projectFolderName + '/' + entitlementsFileName + '";');
+
+            let re6rep = new RegExp('\\/\\* Release \\*\\/.*\n.*isa = XCBuildConfiguration;.*\n.*\n.*buildSettings = {');
+            parts = result.match(re6rep);
+            result = result.replace(re6rep, parts + '\n\t\t\t\tCODE_SIGN_ENTITLEMENTS = "' + projectFolderName + '/' + entitlementsFileName + '";');
+        }
+
+        // write result to project.pbxproj
+        fs.writeFile(pbxprojPath, result, {"encoding": 'utf8'}, function(err) {
+            if (err) {
+                throw err;
+            }
+            console.log(pbxprojPath + " written successfully");
+        });
+    });
+}
+
+module.exports = (context) => {
+    let basePath = './platforms/ios/';
+    let buildType = 'dev';
+    let xcodeprojName = commonFuncs.getXcodeProjName(basePath);
+    let pbxprojPath = basePath + xcodeprojName + '.xcodeproj/project.pbxproj';
+    let entitlementsPath = basePath + xcodeprojName + '/' + xcodeprojName + '.entitlements';
+
+    let cordovaBuildConfigPath = './build.json'
+    let cordovaBuildConfig = null;
+    let willEnablePushNotificationForXCode = true;
+    try { // try to read ios developmentTeam from build.json
+        cordovaBuildConfig = JSON.parse(fs.readFileSync(cordovaBuildConfigPath, "utf8"));
+        if(cordovaBuildConfig.ios.release.developmentTeam === null && cordovaBuildConfig.ios.release.developmentTeam === undefined) {
+            throw 'no valid developmentTeam found in build.json';
+        }
+    } catch(e) {
+        console.log("Do not detected 'build.json' or ios.release.developmentTeam not avaliable in 'build.json' \n" +
+                "Will not enable XCode Push Notification Capability. \n" +
+                "Will only enable Push Notification for CI by add config to '" + basePath + xcodeprojName + "/Entitlements-Debug.plist' and '" + basePath + xcodeprojName + "/Entitlements-Release.plist' \n" +
+                "Please add 'build.json' to cordova project root folder to make after hook fully functional. \n" +
+                "Reference [1]https://cordova.apache.org/docs/en/latest/reference/cordova-cli/#cordova-build-command \n" +
+                "Reference [2]https://cordova.apache.org/docs/en/latest/guide/platforms/ios/#signing-an-app");
+        willEnablePushNotificationForXCode = false;
+    }
+
+    enablePushNotificationForCI(basePath, xcodeprojName);
+
+    if(willEnablePushNotificationForXCode) {
+        enablePushNotificationForXCode(entitlementsPath, pbxprojPath, cordovaBuildConfig);
+    }
+}

package.json

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

plugin.xml

@@ -2,9 +2,9 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="jpush-phonegap-plugin"
-  version="3.0.3">
+  version="3.2.3">
 
-    <name>JPush Plugin</name>
+    <name>JPush</name>
     <description>JPush for cordova plugin</description>
     <author>JPush</author>
     <keywords>JPush,push</keywords>
@@ -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" />
@@ -37,8 +38,7 @@
         <source-file src="src/ios/Plugins/AppDelegate+JPush.m" />
 
         <header-file src="src/ios/lib/JPUSHService.h" />
-        <source-file src="src/ios/lib/jpush-ios-3.0.1.a" framework="true" />
-        <source-file src="src/ios/lib/jcore-ios-1.1.0.a" framework="true" />
+        <source-file src="src/ios/lib/jpush-ios-3.0.6.a" framework="true" />
         <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />
@@ -57,12 +57,16 @@
         <config-file target="*JPushConfig.plist" parent="Appkey">
             <string>$APP_KEY</string>
         </config-file>
+
+        <!-- <hook type="after_platform_add" src="hooks/iosEnablePush.js" />
+        <hook type="after_plugin_install" src="hooks/iosEnablePush.js" />
+        <hook type="before_plugin_uninstall" src="hooks/iosDisablePush.js" /> -->
     </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>
 
@@ -111,7 +115,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" />
@@ -122,10 +127,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>
@@ -136,6 +142,7 @@
                 <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>
 
@@ -151,7 +158,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  显示通知栏 -->
@@ -172,29 +181,31 @@
                     <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="$APP_KEY" />
         </config-file>
 
-        <source-file src="src/android/libs/jpush-android_v3.0.1.jar" target-dir="libs" />
-        <source-file src="src/android/libs/jcore-android_v1.1.0.jar" target-dir="libs" />
-        <source-file src="src/android/libs/armeabi/libjcore110.so" target-dir="libs/armeabi" />
-        <source-file src="src/android/libs/armeabi-v7a/libjcore110.so" target-dir="libs/armeabi-v7a" />
-        <source-file src="src/android/libs/arm64-v8a/libjcore110.so" target-dir="libs/arm64-v8a" />
-        <source-file src="src/android/libs/x86/libjcore110.so" target-dir="libs/x86" />
-        <source-file src="src/android/libs/x86_64/libjcore110.so" target-dir="libs/x86_64" />
+        <source-file src="src/android/libs/jpush-android_v3.0.6.jar" target-dir="libs" />
 
-        <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/MyReceiver.java" target-dir="src/cn/jiguang/cordova/push" />
+        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jiguang/cordova/push" />
 
-        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml" target-dir="res/drawable" />
-        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml" target-dir="res/drawable" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml"
+          target-dir="res/drawable" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml"
+          target-dir="res/drawable" />
 
-        <source-file src="src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png" target-dir="res/drawable-hdpi" />
-        <source-file src="src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png" target-dir="res/drawable-hdpi" />
+        <source-file src="src/android/res/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" />

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,11 @@ public class JPushPlugin extends CordovaPlugin {
         }
     }
 
+    void getConnectionState(JSONArray data, CallbackContext callback) {
+        boolean isConnected = JPushInterface.getConnectionState(cordovaActivity.getApplicationContext());
+        callback.success(String.valueOf(isConnected));
+    }
+
     /**
      *   自定义通知行为，声音、震动、呼吸灯等。
      */
@@ -479,6 +504,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);
@@ -617,7 +643,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();
@@ -632,5 +657,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/ios/Plugins/AppDelegate+JPush.m

@@ -28,29 +28,27 @@
     return [self init_plus];
 }
 
-NSDictionary *_launchOptions;
+-(void)fireOpenNotification:(NSTimer*)timer{
+    if (SharedJPushPlugin) {
+        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[timer.userInfo toJsonString]];
+        [timer invalidate];
+    }
+}
 
+NSDictionary *_launchOptions;
 -(void)applicationDidLaunch:(NSNotification *)notification{
 
+
     if (notification) {
         if (notification.userInfo) {
             NSDictionary *userInfo1 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
             if (userInfo1.count > 0) {
-                [NSTimer scheduledTimerWithTimeInterval:0.1 repeats:YES block:^(NSTimer * _Nonnull timer) {
-                    if (SharedJPushPlugin) {
-                        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo1 toJsonString]];
-                        [timer invalidate];
-                    }
-                }];
+                [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.1 repeats:YES block:^(NSTimer * _Nonnull timer) {
-                    if (SharedJPushPlugin) {
-                        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo2 toJsonString]];
-                        [timer invalidate];
-                    }
-                }];
+                [NSTimer scheduledTimerWithTimeInterval:0.01 target:self selector:@selector(fireOpenNotification:) userInfo:userInfo2 repeats:YES];
             }
         }
         [JPUSHService setDebugMode];
@@ -64,7 +62,6 @@ NSDictionary *_launchOptions;
         if (![delay boolValue]) {
             [self startJPushSDK];
         }
-
     }
 }
 
@@ -122,7 +119,9 @@ NSDictionary *_launchOptions;
             break;
     }
     [JPushPlugin fireDocumentEvent:eventName jsString:[userInfo toJsonString]];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(30 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
       completionHandler(UIBackgroundFetchResultNewData);
+    });
 }
 
 -(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{

src/ios/Plugins/JPushPlugin.m

@@ -99,24 +99,48 @@
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
     NSString *alias = [command argumentAtIndex:0];
     NSArray  *tags  = [command argumentAtIndex:1];
+
     [JPUSHService setTags:[NSSet setWithArray:tags]
                     alias:alias
-         callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
-                   object:self];
+    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];
+        }
+        [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+    }];
 }
 
 -(void)setTags:(CDVInvokedUrlCommand*)command{
     NSArray *tags = command.arguments;
     [JPUSHService setTags:[NSSet setWithArray:tags]
-         callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
-                   object:self];
+                    alias:nil
+    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];
+        }
+        [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+    }];
 }
 
 -(void)setAlias:(CDVInvokedUrlCommand*)command{
     NSString *alias = [command argumentAtIndex:0];
-    [JPUSHService setAlias:alias
-          callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
-                    object:self];
+    [JPUSHService setTags:nil
+                    alias:alias
+    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];
+        }
+        [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+    }];
 }
 
 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
@@ -259,9 +283,15 @@
     }
     UNNotificationCategory *category;
     if (dimiss) {
-        category = [UNNotificationCategory categoryWithIdentifier:categoryId actions:actions intentIdentifiers:@[] options:UNNotificationCategoryOptionCustomDismissAction];
+        category = [UNNotificationCategory categoryWithIdentifier:categoryId
+                                                          actions:actions
+                                                intentIdentifiers:@[]
+                                                          options:UNNotificationCategoryOptionCustomDismissAction];
     } else {
-        category = [UNNotificationCategory categoryWithIdentifier:categoryId actions:actions intentIdentifiers:@[] options:UNNotificationCategoryOptionNone];
+        category = [UNNotificationCategory categoryWithIdentifier:categoryId
+                                                          actions:actions
+                                                intentIdentifiers:@[]
+                                                          options:UNNotificationCategoryOptionNone];
     }
     [[UNUserNotificationCenter currentNotificationCenter] setNotificationCategories:[NSSet setWithObject:category]];
 }
@@ -318,16 +348,17 @@
 
 #pragma mark 设置标签及别名回调
 -(void)tagsWithAliasCallback:(int)resultCode tags:(NSSet *)tags alias:(NSString *)alias {
-    NSDictionary *dict = @{@"resultCode":[NSNumber numberWithInt:resultCode],
-                           @"tags"      :tags  == nil ? [NSNull null] : [tags allObjects],
-                           @"alias"     :alias == nil ? [NSNull null] : alias
-                           };
-    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_SetTagsWithAlias jsString:[dict toJsonString]];
+    if (resultCode == 0) {  // Success
+
+    } else {
+
+    }
 }
 
 - (void)networkDidReceiveMessage:(NSNotification *)notification {
     if (notification && notification.userInfo) {
-        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveMessage jsString:[notification.userInfo  toJsonString]];
+        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveMessage
+                              jsString:[notification.userInfo toJsonString]];
     }
 }
 

src/ios/lib/JPUSHService.h

@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 3.0.1
+#define JPUSH_VERSION_NUMBER 3.0.5
 
 #import <Foundation/Foundation.h>
 
@@ -456,7 +456,7 @@ callbackSelector:(SEL)cbSelector
  *
  * SDK 默认开启的日志级别为: Info. 只显示必要的信息, 不打印调试日志.
  *
- * 调用本接口可打开日志级别为: Debug, 打印调试日志.
+ * 请在SDK启动后调用本接口，调用本接口可打开日志级别为: Debug, 打印调试日志.
  */
 + (void)setDebugMode;
 

www/JPushPlugin.js

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