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

README.md

@@ -30,9 +30,9 @@
 
 ## Usage
 ### API
-- [公共 API](/doc/Common_detail_api.md)
+- [Common](/doc/Common_detail_api.md)
-- [iOS API](/doc/iOS_API.md)
+- [iOS](/doc/iOS_API.md)
-- [Android API](/doc/Android_detail_api.md)
+- [Android](/doc/Android_detail_api.md)
 
 ### Demo
 插件项目中包含一个简单的 Demo。若想参考，可以在 */example* 文件夹内找到并拷贝以下文件:
@@ -53,8 +53,8 @@
 
 ### iOS
 #### PushConfig.plist 文件中的字段都是什么意思？
-- APP_KEY：应用标识。
+- Appkey：应用标识。
-- CHANNEL：渠道标识。
+- Channel：渠道标识。
 - IsProduction：是否生产环境。
 - IsIDFA：是否使用 IDFA 启动 SDK。
 

doc/Android_detail_api.md

@@ -157,6 +157,19 @@
 
 	window.plugins.jPushPlugin.clearAllNotification()
 
+### API - clearNotificationById
+根据通知 Id 清除通知（包括本地通知）。
+
+#### 接口定义
+
+    window.plugins.jPushPlugin.clearNotificationById(notificationId)
+
+#### 参数说明
+- notificationId：int，通知的 id。
+
+#### 代码示例
+
+    window.plugins.jPushPlugin.clearNotificationById(1)
 
 ## 设置允许推送时间
 

doc/Common_detail_api.md

@@ -17,11 +17,9 @@
 
 本功能是一个完全本地的状态操作，也就是说：停止推送服务的状态不会保存到服务器上。
 
-如果停止推送服务后，开发者 App 被重新安装，或者被清除数据，
+如果停止推送服务后，开发者 App 被重新安装，或者被清除数据，JPush SDK 会恢复正常的默认行为（因为保存在本地的状态数据被清除掉了）。
-JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数据被清除掉了）。
 
-本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，
+本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
-恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
 
 #### 接口定义
 
@@ -41,8 +39,7 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 
 + iOS 平台:
 
-	+ 不推荐调用，因为这个 API 只是让你的 DeviceToken 失效，在 设置－通知 中您的应用程序没有任何变化。
+	+ 不推荐调用，因为这个 API 只是让你的 DeviceToken 失效，在 设置－通知 中您的应用程序没有任何变化。**建议设置一个 UI 界面， 提醒用户在 设置－通知 中关闭推送服务**。
-    + 推荐：设置一个 UI 界面， 提醒用户在 设置－通知 中关闭推送服务。
 
 #### 接口定义
 
@@ -59,7 +56,7 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 
 + iOS 平台:
 
-	+ 重新去APNS注册。
+	+ 重新去 APNS 注册。
 
 #### 接口定义
 
@@ -116,14 +113,9 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 代码示例
 
- 	window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+     window.plugins.jPushPlugin.getRegistrationID(function(data) {
-	var onGetRegistradionID = function(data) {
+       console.log("JPushPlugin:registrationID is " + data)
-		try {
+     })
-			console.log("JPushPlugin:registrationID is " + data);		
-		} catch(exception) {
-			console.log(exception);
-		}
-	}
 
 ## 设置别名与标签
 
@@ -143,7 +135,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 系统不限定一个别名只能指定一个用户。如果一个别名被指定到了多个用户，当给指定这个别名发消息时，服务器端 API 会同时给这多个用户发送消息。
 
-举例：在一个用户要登录的游戏中，可能设置别名为 userid。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userid 调用服务器端 API 发通知到客户端提醒用户。
+举例：在一个用户要登录的游戏中，可能设置别名为 userId。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userId 调用服务器端 API 发通知到客户端提醒用户。
 
 **标签 Tag**:
 
@@ -181,18 +173,13 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果:
 
-	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
+	document.addEventListener("jpush.setTagsWithAlias", function(event) {
-    var onTagsWithAlias = function(event) {
+      console.log("onTagsWithAlias")
-    	try {
+      var result = "result code:" + event.resultCode + " "
-        	console.log("onTagsWithAlias");    
+      result += "tags:" + event.tags + " "
-           	var result = "result code:" + event.resultCode + " ";
+      result += "alias:" + event.alias + " "
-           	result += "tags:" + event.tags + " ";
+      $("#tagAliasResult").html(result)
-           	result += "alias:" + event.alias + " ";
+    }, false)
-           	$("#tagAliasResult").html(result);
-       	} catch(exception) {
-           console.log(exception);
-       	}
-   	}
 
 #### 错误码定义
 
@@ -219,19 +206,16 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.openNotification", onOpenNotification, false);
+        document.addEventListener("jpush.openNotification", function (event) {
-
+	      var alertContent
-- onOpenNotification 需要这样写：
-
-        var alertContent;
           if(device.platform == "Android") {
-            alertContent = event.alert;
+            alertContent = event.alert
           } else {
-            alertContent = event.aps.alert;
+            lertContent = event.aps.alert
           }
-        alert("open Notificaiton:" + alertContent);
+	    }, false)
 
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
 
 + Android:
 
@@ -273,19 +257,18 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.o
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+		  document.addEventListener("jpush.receiveNotification", function (event) {
-
+		    var alertContent
-- onReceiveNotification 需要这样写：
-
-	    var alertContent;
 	        if(device.platform == "Android") {
-	        alertContent = event.alert;
+	          alertContent = event.alert
 	        } else {
-	        alertContent = event.aps.alert;
+	          alertContent = event.aps.alert
 	        }
-	    alert("open Notificaiton:" + alertContent);
+	        alert("open Notificaiton:" + alertContent)
+		  }, false)
 	    
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
 
 + Android:
 
@@ -330,26 +313,16 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 
 - 在你需要接收通知的的 js 文件中加入:
 
-		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+	    document.addEventListener("jpush.receiveMessage", function (event) {
-
-- onReceiveMessage 需要这样写：
-
-        var onReceiveMessage = function(event) {
-            try{
 	      var message
           if(device.platform == "Android") {
             message = event.message;
           } else {
             message = event.content;
           }      
-                 $("#messageResult").html(message);
+	    }, false)
-            } catch(exception) {
-                console.log("JPushPlugin:onReceiveMessage-->" + exception);
-            }
-        }
 
-ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveMessage，
+> ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
-直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
 
 + Android:
 
@@ -370,7 +343,6 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 			 "extras":{"key":"不填写没有"}
 		}
 
-
 ## 判断系统设置中是否允许当前应用推送
 ### API - getUserNotificationSettings
 判断系统设置中是否允许当前应用推送。
@@ -392,5 +364,4 @@ ps：点击通知后传递的 json object 保存在 window.plugins.jPushPlugin.r
 			// 系统设置中已关闭应用推送。
 		} else if(result > 0) {
 			// 系统设置中打开了应用推送。
-		}
+		})
-	});

doc/iOS_API.md

@@ -21,7 +21,7 @@
 
 ### API - init
 
-调用此 API,用来开启 JPush SDK 提供的推送服务。
+调用此 API，用来开启 JPush SDK 提供的推送服务。
 
 开发者 App 可以通过调用停止推送服务 API 来停止极光推送服务，当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
 
@@ -37,7 +37,6 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 
 	window.plugins.jPushPlugin.init()
 
-
 ### API - stopPush
 
 - 不推荐调用，因为这个 API 只是让你的 DeviceToken 失效，在 设置－通知 中您的应用程序没有任何变化。
@@ -47,7 +46,6 @@ JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数
 
   window.plugins.jPushPlugin.stopPush()
 
-
 ### API - resumePush
 
 恢复推送服务。调用了此 API 后，iOS平台，重新去APNS注册。
@@ -65,21 +63,19 @@ iOS平台，检查推送服务是否停止。
 
 	window.plugins.jPushPlugin.isPushStopped(callback)
 
-
 #### 参数说明
 
 - callback 回调函数，用来通知 JPush 的推送服务是否开启。
 
 #### 代码示例
-	window.plugins.jPushPlugin.isPushStopped(callback)
+
-	var callback = function(data) {
+    window.plugins.jPushPlugin.isPushStopped(function(data) {
 		  if(data > 0) {
 		    // 已关闭
 		  } else {
 		    // 已开启
 		  }
-	}
+	  })
-
 
 ## 获取 RegistrationID
 
@@ -102,14 +98,9 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### 调用示例
 
- 	window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+ 	  window.plugins.jPushPlugin.getRegistrationID(function(data) {
-	var onGetRegistradionID = function(data) {
+		  console.log("JPushPlugin:registrationID is " + data)
-		try {
+	  })
-			console.log("JPushPlugin:registrationID is " + data);
-		} catch(exception) {
-			console.log(exception);
-		}
-	}
 
 ## 别名与标签
 
@@ -167,18 +158,14 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 函数本身无返回值，但需要注册 `jpush.setTagsWithAlias` 事件来监听设置结果。
 
-	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
     var onTagsWithAlias = function(event) {
-	    try {
+	    console.log("onTagsWithAlias")
-	       console.log("onTagsWithAlias");    
+	    var result = "result code:"+event.resultCode + " "
-	       var result = "result code:"+event.resultCode + " ";
+	    result += "tags:" + event.tags + " "
-	       result += "tags:" + event.tags + " ";
+	    result += "alias:" + event.alias + " "
-	       result += "alias:" + event.alias + " ";
+	    $("#tagAliasResult").html(result)
-	       $("#tagAliasResult").html(result);
-	    } catch(exception) {
-	       console.log(exception)
-	    }
     }
+    document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false)
 
 #### 错误码定义
 
@@ -207,14 +194,14 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 - 在你需要接收通知的的 js 文件中加入:
 
-  	document.addEventListener("jpush.openNotification", onOpenNotification, false);
+  	document.addEventListener("jpush.openNotification", onOpenNotification, false)
 
 - onOpenNotification 需要这样写：
 
   	var onOpenNotification = function(event) {
-  		var alertContent;
+  		var alertContent
-  		alertContent = event.aps.alert;
+  		alertContent = event.aps.alert
-  		alert("open Notificaiton:" + alertContent);
+  		alert("open Notificaiton:" + alertContent)
   	}
 
 - event 举例:
@@ -240,14 +227,14 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 - 在你需要接收通知的的 js 文件中加入:
 
-  	document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+  	document.addEventListener("jpush.receiveNotification", onReceiveNotification, false)
 
 - onReceiveNotification 需要这样写：
 
   	var onReceiveNotification = function(event) {
-  		var alertContent;
+  		var alertContent
-  		alertContent = event.aps.alert;
+  		alertContent = event.aps.alert
-  		alert("open Notificaiton:" + alertContent);
+  		alert("open Notificaiton:" + alertContent)
   	}
 
 - event 举例
@@ -267,20 +254,20 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 
 #### event - jpush.backgroundNotification
 
-应用程序处于后台时收到推送会触发该事件，可以在后台执行一段代码。具体配置参考 [iOS 7 Background Remote Notification](http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification)
+应用程序处于后台时收到推送会触发该事件，可以在后台执行一段代码。具体配置参考 [iOS 7 Background Remote Notification](https://docs.jiguang.cn/jpush/client/iOS/ios_new_fetures/#ios-7-background-remote-notification)
 
 #### 代码示例
 
 - 在你需要接收通知的的 js 文件中加入:
 
-  	document.addEventListener("jpush.backgroundNotification", onBackgroundNotification, false);
+  	document.addEventListener("jpush.backgroundNotification", onBackgroundNotification, false)
 
 - onBackgroundNotification 需要这样写：
 
   	var onBackgroundNotification = function(event) {
-  		var alertContent;
+  		var alertContent
-  		alertContent = event.aps.alert;
+  		alertContent = event.aps.alert
-  		alert("open Notificaiton:" + alertContent);
+  		alert("open Notificaiton:" + alertContent)
   	}
 
 + event 举例
@@ -296,49 +283,29 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
   		"_j_msgid":154604475
   	}
 
-#### API - receiveMessageIniOSCallback
-
-用于 iOS 收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
-不推荐使用回调函数
-
-##### 接口定义
-
-	JPushPlugin.prototype.receiveMessageIniOSCallback(data)
-
-##### 参数说明
-
-- data: 是一个 js 字符串使用如下代码解析，js 具体 key 根据应用内消息来确定:
-
-  var bToObj = JSON.parse(data);
-
-
 ## 获取自定义消息内容
 
-
 ### event - jpush.receiveMessage
 
 收到应用内消息时触发这个事件, 推荐使用事件的方式传递，但同时保留了 receiveMessageIniOSCallback 的回调函数，兼容以前的代码。
 
-
 #### 代码示例
 
 - 在你需要接收通知的的 js 文件中加入:
 
-  	document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+  	document.addEventListener("jpush.receiveMessage", onReceiveMessage, false)
 
 - onReceiveMessage 需要这样写：
 
   	var onReceiveMessage = function(event) {
-  		try{
+  		try {
-  			var message;
+  			var message = event.content
-  			message = event.content;      
+  			$("#messageResult").html(message)
-  			$("#messageResult").html(message);
+  		} catch(exception) {
-  		}catch(exception) {
   			console.log("JPushPlugin:onReceiveMessage-->" + exception);
   		}
   	}
 
-
 - event 举例:
 
   	{
@@ -352,8 +319,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 ## 设置Badge
 ### API - setBadge, resetBadge
 
- JPush 封装 badge 功能，允许应用上传 badge 值至 JPush 服务器，
+JPush 封装 badge 功能，允许应用上传 badge 值至 JPush 服务器，由 JPush 后台帮助管理每个用户所对应的推送 badge 值，简化了设置推送 badge 的操作。
- 由 JPush 后台帮助管理每个用户所对应的推送 badge 值，简化了设置推送 badge 的操作。
 （本接口不会直接改变应用本地的角标值. 要修改本地 badege 值，使用 setApplicationIconBadgeNumber）
 
 实际应用中，开发者可以直接对 badge 值做增减操作，无需自己维护用户与 badge 值之间的对应关系。
@@ -362,7 +328,7 @@ JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
 	window.plugins.jPushPlugin.prototype.setBadge(value)
 	window.plugins.jPushPlugin.prototype.reSetBadge()
 
-resetBadge相当于setBadge(0)。
+resetBadge 相当于 setBadge(0)。
 
 #### 参数说明
 value 取值范围：[0,99999]。
@@ -372,8 +338,8 @@ value 取值范围：[0,99999]。
 
 #### 代码示例
 
-	window.plugins.jPushPlugin.setBadge(5);
+	window.plugins.jPushPlugin.setBadge(5)
-	window.plugins.jPushPlugin.reSetBadge();
+	window.plugins.jPushPlugin.reSetBadge()
 
 ### API - setApplicationIconBadgeNumber
 
@@ -389,7 +355,7 @@ value 取值范围：[0,99999]。
 
 #### 代码示例
 
-	window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
+	window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0)
 
 ### API - getApplicationIconBadgeNumber
 
@@ -406,8 +372,8 @@ value 取值范围：[0,99999]。
 #### 代码示例
 
 	window.plugins.jPushPlugin.getApplicationIconBadgeNumber(function(data) {
-	     console.log(data);               
+	  console.log(data)
-	});
+	})
 
 
 ## 本地通知
@@ -446,7 +412,7 @@ value 取值范围：[0,99999]。
 
 #### 代码示例
 
-        window.plugins.jPushPlugin.deleteLocalNotificationWithIdentifierKeyInIOS("identifier");
+    window.plugins.jPushPlugin.deleteLocalNotificationWithIdentifierKeyInIOS("identifier")
 
 ### API - clearAllLocalNotifications
 
@@ -458,7 +424,7 @@ value 取值范围：[0,99999]。
 
 #### 代码示例
 
-    window.plugins.jPushPlugin.clearAllLocalNotifications();
+    window.plugins.jPushPlugin.clearAllLocalNotifications()
 
 
 ## 页面的统计
@@ -630,7 +596,7 @@ iPhone 6s 及以后设备且 iOS 9 以后系统支持 3d-touch。
 #### 接口定义
 
 ```
-window.plugins.jPushPlugin.prototype.addNotificationActions(actions, categoryId);
+window.plugins.jPushPlugin.prototype.addNotificationActions(actions, categoryId)
 ```
 
 #### 参数说明
@@ -694,7 +660,7 @@ window.plugins.jPushPlugin.prototype.addNotificationActions(actions, categoryId)
 #### 接口定义
 
 ```
-window.plugins.jPushPlugin.prototype.getUserNotificationSettings(callback);
+window.plugins.jPushPlugin.prototype.getUserNotificationSettings(callback)
 ```
 
 #### 返回值
@@ -718,4 +684,3 @@ window.plugins.jPushPlugin.prototype.getUserNotificationSettings(callback);
     -  UNAlertStyleNone = 0
     -  UNAlertStyleBanner = 1
     -  UNAlertStyleAlert = 2
-

doc/iOS_install.md

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

plugin.xml

@@ -32,11 +32,11 @@
 
         <header-file src="src/ios/Plugins/JPushPlugin.h" />
         <source-file src="src/ios/Plugins/JPushPlugin.m" />
-
+        <header-file src="src/ios/Plugins/JPushDefine.h" />
-        <header-file src="src/ios/lib/JPUSHService.h" />
-        <source-file src="src/ios/lib/jpush-ios-2.1.9.a" framework="true" />
         <header-file src="src/ios/Plugins/AppDelegate+JPush.h" />
         <source-file src="src/ios/Plugins/AppDelegate+JPush.m" />
+        <header-file src="src/ios/lib/JPUSHService.h" />
+        <source-file src="src/ios/lib/jpush-ios-2.2.0.a" framework="true" />
         <resource-file src="src/ios/PushConfig.plist" />
         <framework src="CFNetwork.framework" weak="true" />
         <framework src="CoreFoundation.framework" weak="true" />
@@ -49,9 +49,10 @@
         <framework src="libz.tbd" weak="true" />
         <framework src="AdSupport.framework" weak="true" />
         <framework src="UserNotifications.framework" weak="true" />
+        <framework src="libresolv.tbd" weak="true" />
 
 
-        <config-file target="*PushConfig.plist" parent="APP_KEY">
+        <config-file target="*PushConfig.plist" parent="Appkey">
             <string>$API_KEY</string>
         </config-file>
     </platform>

src/ios/Plugins/AppDelegate+JPush.h

@@ -2,7 +2,7 @@
 //  AppDelegate+JPush.h
 //  delegateExtention
 //
-//  Created by 张庆贺 on 15/8/3.
+//  Created by pikacode@qq.com on 15/8/3.
 //  Copyright (c) 2015年 JPush. All rights reserved.
 //
 
@@ -11,5 +11,5 @@
 #import "JPUSHService.h"
 
 @interface AppDelegate (JPush) <JPUSHRegisterDelegate>
--(void)registerForIos10RemoteNotification;
+-(void)registerForRemoteNotification;
 @end

src/ios/Plugins/AppDelegate+JPush.m

@@ -2,7 +2,7 @@
 //  AppDelegate+JPush.m
 //  delegateExtention
 //
-//  Created by 张庆贺 on 15/8/3.
+//  Created by pikacode@qq.com on 15/8/3.
 //  Copyright (c) 2015年 JPush. All rights reserved.
 //
 
@@ -11,19 +11,16 @@
 #import <objc/runtime.h>
 #import <AdSupport/AdSupport.h>
 #import <UserNotifications/UserNotifications.h>
-
+#import "JPushDefine.h"
-
 
 @implementation AppDelegate (JPush)
 
 +(void)load{
-
+    Method origin1;
-    Method origin;
+    Method swizzle1;
-    Method swizzle;
+    origin1  = class_getInstanceMethod([self class],@selector(init));
-
+    swizzle1 = class_getInstanceMethod([self class], @selector(init_plus));
-    origin=class_getInstanceMethod([self class],@selector(init));
+    method_exchangeImplementations(origin1, swizzle1);
-    swizzle=class_getInstanceMethod([self class], @selector(init_plus));
-    method_exchangeImplementations(origin, swizzle);
 }
 
 -(instancetype)init_plus{
@@ -31,10 +28,45 @@
     return [self init_plus];
 }
 
+
+
 -(void)applicationDidLaunch:(NSNotification *)notification{
     if (notification) {
-        [self registerForIos10RemoteNotification];
+        if (notification.userInfo) {
-        [JPushPlugin setLaunchOptions:notification.userInfo];
+            NSDictionary *userInfo1 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+            if (userInfo1.count > 0) {
+                [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo1 toJsonString]];
+            }
+            NSDictionary *userInfo2 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey];
+            if (userInfo2.count > 0) {
+                [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenLocalNotification jsString:[userInfo1 toJsonString]];
+            }
+        }
+        [JPUSHService setDebugMode];
+        [self registerForRemoteNotification];
+        [JPushPlugin setupJPushSDK:notification.userInfo];
+    }
+}
+
+-(void)registerForRemoteNotification{
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) {
+#ifdef NSFoundationVersionNumber_iOS_9_x_Max
+        JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init];
+        entity.types = UNAuthorizationOptionAlert|UNAuthorizationOptionBadge|UNAuthorizationOptionSound;
+        [JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
+#endif
+    }else if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+        //可以添加自定义categories
+        [JPUSHService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
+                                                          UIUserNotificationTypeSound |
+                                                          UIUserNotificationTypeAlert)
+                                              categories:nil];
+    } else if([[UIDevice currentDevice].systemVersion floatValue] < 8.0){
+        //categories 必须为nil
+        [JPUSHService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+                                                          UIRemoteNotificationTypeSound |
+                                                          UIRemoteNotificationTypeAlert)
+                                              categories:nil];
     }
 }
 
@@ -44,17 +76,48 @@
 
 -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
     [JPUSHService handleRemoteNotification:userInfo];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
+
+    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
 }
 
 -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
     [JPUSHService handleRemoteNotification:userInfo];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
+    NSString *eventName;
+    switch ([UIApplication sharedApplication].applicationState) {
+        case UIApplicationStateInactive:
+            eventName = JPushDocumentEvent_OpenNotification;
+            break;
+        case UIApplicationStateActive:
+            eventName = JPushDocumentEvent_ReceiveNotification;
+            break;
+        case UIApplicationStateBackground:
+            eventName = JPushDocumentEvent_BackgoundNotification;
+            break;
+        default:
+            break;
+    }
+    [SharedJPushPlugin jpushFireDocumentEvent:eventName jsString:[userInfo toJsonString]];
     completionHandler(UIBackgroundFetchResultNewData);
 }
 
+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:notification.request.content.userInfo];
+    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
+    completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert);
+}
+
+-(void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:response.notification.request.content.userInfo];
+    @try {
+        [userInfo setValue:[response valueForKey:@"userText"] forKey:@"userText"];
+    } @catch (NSException *exception) { }
+    [userInfo setValue:response.actionIdentifier forKey:@"actionIdentifier"];
+    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo toJsonString]];
+    completionHandler();
+}
+
 - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
-    [JPUSHService showLocalNotificationAtFront:notification identifierKey:nil];
+    //    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveLocalNotification object:notification.userInfo];
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {
@@ -66,36 +129,4 @@
     //  [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
 }
 
--(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{
-
-    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:notification.request.content.userInfo];
-
-    [userInfo setValue:kJPushPluginiOS10ForegroundReceiveNotification forKey:@"JPushNotificationType"];
-
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginiOS10ForegroundReceiveNotification object:userInfo];
-
-    completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert);
-}
-
--(void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{
-    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:response.notification.request.content.userInfo];
-    @try {
-        [userInfo setValue:[response valueForKey:@"userText"] forKey:@"userText"];
-    } @catch (NSException *exception) { }
-    [userInfo setValue:response.actionIdentifier forKey:@"actionIdentifier"];
-    [userInfo setValue:kJPushPluginiOS10ClickNotification forKey:@"JPushNotificationType"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginiOS10ClickNotification object:userInfo];
-    completionHandler();
-}
-
--(void)registerForIos10RemoteNotification{
-    if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) {
-#ifdef NSFoundationVersionNumber_iOS_9_x_Max
-        JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init];
-        entity.types = UNAuthorizationOptionAlert|UNAuthorizationOptionBadge|UNAuthorizationOptionSound;
-        [JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
-#endif
-    }
-}
-
 @end

src/ios/Plugins/JPushDefine.h

@@ -0,0 +1,31 @@
+//
+//  ConstantDef.h
+//  jmessage
+//
+//  Created by pikacode@qq.com on 16/1/19.
+//
+//
+
+#ifndef ConstantDef_h
+#define ConstantDef_h
+
+
+
+#endif /* ConstantDef_h */
+
+#define WEAK_SELF(weakSelf)  __weak __typeof(&*self)weakSelf = self;
+
+static NSString *const JPushConfig_Appkey       = @"Appkey";
+static NSString *const JPushConfig_Channel      = @"Channel";
+static NSString *const JPushConfig_IsProduction = @"IsProduction";
+static NSString *const JPushConfig_IsIDFA       = @"IsIDFA";
+static NSString *const JPushConfig_FileName     = @"PushConfig";
+
+static NSString *const JPushDocumentEvent_ReceiveNotification   = @"receiveNotification";
+static NSString *const JPushDocumentEvent_OpenNotification      = @"openNotification";
+static NSString *const JPushDocumentEvent_BackgoundNotification = @"backgoundNotification";
+static NSString *const JPushDocumentEvent_SetTagsWithAlias      = @"setTagsWithAlias";
+static NSString *const JPushDocumentEvent_ReceiveMessage        = @"receiveMessage";
+static NSString *const JPushDocumentEvent_OpenLocalNotification        = @"openLocalNotification";
+
+

src/ios/Plugins/JPushPlugin.h

@@ -2,23 +2,16 @@
 //  PushTalkPlugin.h
 //  PushTalk
 //
-//  Created by zhangqinghe on 13-12-13.
+//  Created by pikacode@qq.com on 13-12-13.
 //
 //
 
 #import <Cordova/CDV.h>
 
-#define kJPushPluginReceiveNotification @"JPushPluginReceiveNofication"
-#define kJPushPluginiOS10ForegroundReceiveNotification @"kJPushPluginiOS10ForegroundReceiveNotification"
-#define kJPushPluginiOS10ClickNotification @"kJPushPluginiOS10ClickNotification"
-
-
 @interface JPushPlugin : CDVPlugin{
 
 }
 
-+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions;
-
 //以下为js中可调用接口
 //设置标签、别名
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command;
@@ -77,4 +70,22 @@
  *  jpush.backgroundNotification 后台收到推送
  */
 
+# pragma mark - private
+
+-(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString;
+
++(void)setupJPushSDK:(NSDictionary*)userInfo;
+
 @end
+
+static JPushPlugin *SharedJPushPlugin;
+
+@interface NSDictionary (JPush)
+-(NSString*)toJsonString;
+@end
+
+@interface NSString (JPush)
+-(NSDictionary*)toDictionary;
+@end
+
+

src/ios/Plugins/JPushPlugin.m

@@ -2,7 +2,7 @@
 //  PushTalkPlugin.m
 //  PushTalk
 //
-//  Created by zhangqinghe on 13-12-13.
+//  Created by pikacode@qq.com on 13-12-13.
 //
 //
 
@@ -12,15 +12,7 @@
 #import <AdSupport/AdSupport.h>
 #import <UserNotifications/UserNotifications.h>
 #import "AppDelegate+JPush.h"
-
+#import "JPushDefine.h"
-static NSString *const JP_APP_KEY = @"APP_KEY";
-static NSString *const JP_APP_CHANNEL = @"CHANNEL";
-static NSString *const JP_APP_ISPRODUCTION = @"IsProduction";
-static NSString *const JP_APP_ISIDFA = @"IsIDFA";
-static NSString *const JPushConfigFileName = @"PushConfig";
-static NSDictionary *_launchOptions = nil;
-
-#define WEAK_SELF(weakSelf)  __weak __typeof(&*self)weakSelf = self;
 
 @implementation NSDictionary (JPush)
 -(NSString*)toJsonString{
@@ -52,16 +44,11 @@ static NSDictionary *_launchOptions = nil;
 }
 
 -(void)resumePush:(CDVInvokedUrlCommand*)command{
-    [JPushPlugin registerForRemoteNotification];
+    [(AppDelegate*)[UIApplication sharedApplication].delegate registerForRemoteNotification];
 }
 
 -(void)isPushStopped:(CDVInvokedUrlCommand*)command{
-    NSNumber *result;
+    NSNumber *result = [[UIApplication sharedApplication] isRegisteredForRemoteNotifications] ? @(0) : @(1);
-    if ([[UIApplication sharedApplication] isRegisteredForRemoteNotifications]) {
-        result = @(0);
-    }else{
-        result = @(1);
-    }
     [self handleResultWithValue:result command:command];
 }
 
@@ -69,12 +56,11 @@ static NSDictionary *_launchOptions = nil;
     //do nithng,because Cordova plugin use lazy load mode.
 }
 
-
 #ifdef __CORDOVA_4_0_0
 
 - (void)pluginInitialize {
     NSLog(@"### pluginInitialize ");
-    [self initNotifications];
+    SharedJPushPlugin = self;
 }
 
 #else
@@ -82,62 +68,21 @@ static NSDictionary *_launchOptions = nil;
 - (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
     NSLog(@"### initWithWebView ");
     if (self=[super initWithWebView:theWebView]) {
-        [self initNotifications];
     }
     return self;
 }
 
-
 #endif
 
--(void)initNotifications {
+-(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{
-    NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
-    [defaultCenter addObserver:self
-                      selector:@selector(networkDidReceiveMessage:)
-                          name:kJPFNetworkDidReceiveMessageNotification
-                        object:nil];
-
-    [defaultCenter addObserver:self
-                      selector:@selector(networkDidReceiveNotification:)
-                          name:kJPushPluginReceiveNotification
-                        object:nil];
-
-    [defaultCenter addObserver:self
-                      selector:@selector(networkDidReceiveNotification:)
-                          name:kJPushPluginiOS10ForegroundReceiveNotification
-                        object:nil];
-
-    [defaultCenter addObserver:self
-                      selector:@selector(networkDidReceiveNotification:)
-                          name:kJPushPluginiOS10ClickNotification
-                        object:nil];
-
-
-    if (_launchOptions) {
-        NSDictionary *userInfo = [_launchOptions valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
-        if ([userInfo count] >0) {
     dispatch_async(dispatch_get_main_queue(), ^{
-                [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",[userInfo toJsonString]]];
+        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
     });
-        }
-
-    }
 }
 
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
-    NSArray  *arguments = command.arguments;
+    NSString *alias = [command argumentAtIndex:0];
-    NSString *alias;
+    NSArray  *tags  = [command argumentAtIndex:1];
-    NSArray  *tags;
-    if (!arguments || [arguments count] < 2) {
-        NSLog(@"#### setTagsWithAlias param is less");
-        return ;
-    }else{
-        alias = arguments[0];
-        tags  = arguments[1];
-    }
-
-    NSLog(@"#### setTagsWithAlias alias is %@, tags is %@",alias,tags);
-
     [JPUSHService setTags:[NSSet setWithArray:tags]
                     alias:alias
          callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
@@ -145,77 +90,43 @@ static NSDictionary *_launchOptions = nil;
 }
 
 -(void)setTags:(CDVInvokedUrlCommand *)command{
-
     NSArray *tags = command.arguments;
-
-    NSLog(@"#### setTags %@",tags);
-
     [JPUSHService setTags:[NSSet setWithArray:tags]
          callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
                    object:self];
-
 }
 
 -(void)setAlias:(CDVInvokedUrlCommand *)command{
-
+    NSString *alias = [command argumentAtIndex:0];
-    NSLog(@"#### setAlias %@",command.arguments);
+    [JPUSHService setAlias:alias
-    [JPUSHService setAlias:command.arguments[0]
           callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
                     object:self];
 }
 
 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
     NSString* registrationID = [JPUSHService registrationID];
-    NSLog(@"### getRegistrationID %@",registrationID);
     [self handleResultWithValue:registrationID command:command];
 }
 
 -(void)startLogPageView:(CDVInvokedUrlCommand*)command{
-    NSArray *arguments = command.arguments;
+    NSString * pageName = [command argumentAtIndex:0];
-    if (!arguments || [arguments count] < 1) {
-        NSLog(@"startLogPageView argument  error");
-        return ;
-    }
-    NSString * pageName = arguments[0];
-    if (pageName) {
     [JPUSHService startLogPageView:pageName];
-    }
 }
 
 -(void)stopLogPageView:(CDVInvokedUrlCommand*)command{
-    NSArray *arguments = command.arguments;
+    NSString * pageName = [command argumentAtIndex:0];
-    if (!arguments || [arguments count] < 1) {
-        NSLog(@"stopLogPageView argument  error");
-        return ;
-    }
-    NSString * pageName = arguments[0];
-    if (pageName) {
     [JPUSHService stopLogPageView:pageName];
-    }
-
 }
 
 -(void)beginLogPageView:(CDVInvokedUrlCommand*)command{
-    NSArray *arguments = command.arguments;
+    NSString *pageName = [command argumentAtIndex:0];
-    if (!arguments || [arguments count] < 2) {
+    NSNumber *duration = [command argumentAtIndex:1];
-        NSLog(@"beginLogPageView argument  error");
+    [JPUSHService beginLogPageView:pageName duration:duration.intValue];
-        return ;
-    }
-    NSString * pageName = arguments[0];
-    int duration = [arguments[0] intValue];
-    if (pageName) {
-        [JPUSHService beginLogPageView:pageName duration:duration];
-    }
 }
 
 -(void)setBadge:(CDVInvokedUrlCommand*)command{
-    NSArray *argument = command.arguments;
+    NSNumber *badge = [command argumentAtIndex:0];
-    if ([argument count] < 1) {
+    [JPUSHService setBadge:badge.intValue];
-        NSLog(@"setBadge argument error!");
-        return;
-    }
-    NSNumber *badge = argument[0];
-    [JPUSHService setBadge:[badge intValue]];
 }
 
 -(void)resetBadge:(CDVInvokedUrlCommand*)command{
@@ -223,14 +134,8 @@ static NSDictionary *_launchOptions = nil;
 }
 
 -(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command{
-    //
+    NSNumber *badge = [command argumentAtIndex:0];
-    NSArray *argument = command.arguments;
+    [UIApplication sharedApplication].applicationIconBadgeNumber = badge.intValue;
-    if ([argument count] < 1) {
-        NSLog(@"setBadge argument error!");
-        return;
-    }
-    NSNumber *badge = [argument objectAtIndex:0];
-    [UIApplication sharedApplication].applicationIconBadgeNumber = [badge intValue];
 }
 
 -(void)getApplicationIconBadgeNumber:(CDVInvokedUrlCommand *)command {
@@ -252,32 +157,31 @@ static NSDictionary *_launchOptions = nil;
 }
 
 -(void)setLocalNotification:(CDVInvokedUrlCommand*)command{
-    NSArray      *arguments = command.arguments;
+    NSLog(@"ios 10 after please use UNNotificationRequest to set local notification, see apple doc to learn more");
-    NSDate       *date      = arguments[0] == [NSNull null] ? nil : [NSDate dateWithTimeIntervalSinceNow:[((NSString*)arguments[0]) intValue]];
+
-    NSString     *alertBody = arguments[1] == [NSNull null] ? nil : (NSString*)arguments[1];
+    NSDate       *date  = [NSDate dateWithTimeIntervalSinceNow:[[command argumentAtIndex:0] intValue]];
-    int           badge     = arguments[2] == [NSNull null] ? 0   : [(NSString*)arguments[2] intValue];
+    NSString     *alert = [command argumentAtIndex:1];
-    NSString     *idKey     = arguments[3] == [NSNull null] ? nil : (NSString*)arguments[3];
+    NSNumber     *badge = [command argumentAtIndex:2];
-    NSDictionary *dict      = arguments[4] == [NSNull null] ? nil : (NSDictionary*)arguments[4];
+    NSString     *idKey = [command argumentAtIndex:3];
-    [JPUSHService setLocalNotification:date alertBody:alertBody badge:badge alertAction:nil identifierKey:idKey userInfo:dict soundName:nil];
+    NSDictionary *dict  = [command argumentAtIndex:4];
+    [JPUSHService setLocalNotification:date alertBody:alert badge:badge alertAction:nil identifierKey:idKey userInfo:dict soundName:nil];
 }
 
 -(void)deleteLocalNotificationWithIdentifierKey:(CDVInvokedUrlCommand*)command{
     NSString *identifier = [command argumentAtIndex:0];
-    if ([UIDevice currentDevice].systemVersion.floatValue >= 10.0) {
     JPushNotificationIdentifier *jpid = [JPushNotificationIdentifier new];
     jpid.identifiers = @[identifier];
     [JPUSHService removeNotification:jpid];
-    }else{
-        [JPUSHService deleteLocalNotificationWithIdentifierKey:identifier];
-    }
 }
 
 -(void)clearAllLocalNotifications:(CDVInvokedUrlCommand*)command{
-    [JPUSHService clearAllLocalNotifications];
+    [JPUSHService removeNotification:nil];
 }
 
 -(void)setLocation:(CDVInvokedUrlCommand*)command{
-    [JPUSHService setLatitude:[((NSString*)command.arguments[0]) doubleValue] longitude:[((NSString*)command.arguments[1]) doubleValue]];
+    NSNumber *latitude  = [command argumentAtIndex:0];
+    NSNumber *longitude = [command argumentAtIndex:1];
+    [JPUSHService setLatitude:latitude.doubleValue longitude:longitude.doubleValue];
 }
 
 -(void)getUserNotificationSettings:(CDVInvokedUrlCommand*)command{
@@ -347,54 +251,29 @@ static NSDictionary *_launchOptions = nil;
 }
 
 #pragma mark - 内部方法
-+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{
-    _launchOptions = theLaunchOptions;
 
-    [JPUSHService setDebugMode];
++(void)setupJPushSDK:(NSDictionary*)userInfo{
-
+    NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfig_FileName ofType:@"plist"];
-    [JPushPlugin registerForRemoteNotification];
-
-    //read appkey and channel from PushConfig.plist
-    NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfigFileName ofType:@"plist"];
     if (plistPath == nil) {
         NSLog(@"error: PushConfig.plist not found");
         assert(0);
     }
 
     NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
-    NSString * appkey       = [plistData valueForKey:JP_APP_KEY];
+    NSString *appkey       = [plistData valueForKey:JPushConfig_Appkey];
-    NSString * channel      = [plistData valueForKey:JP_APP_CHANNEL];
+    NSString *channel      = [plistData valueForKey:JPushConfig_Channel];
-    NSNumber * isProduction = [plistData valueForKey:JP_APP_ISPRODUCTION];
+    NSNumber *isProduction = [plistData valueForKey:JPushConfig_IsProduction];
-    NSNumber *isIDFA        = [plistData valueForKey:JP_APP_ISIDFA];
+    NSNumber *isIDFA       = [plistData valueForKey:JPushConfig_IsIDFA];
 
     NSString *advertisingId = nil;
     if(isIDFA){
         advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
     }
-    [JPUSHService setupWithOption:_launchOptions
+    [JPUSHService setupWithOption:userInfo
                            appKey:appkey
                           channel:channel
                  apsForProduction:[isProduction boolValue]
             advertisingIdentifier:advertisingId];
-
-}
-
-+(void)registerForRemoteNotification{
-    [(AppDelegate*)[UIApplication sharedApplication].delegate registerForIos10RemoteNotification];
-
-    if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
-        //可以添加自定义categories
-        [JPUSHService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
-                                                          UIUserNotificationTypeSound |
-                                                          UIUserNotificationTypeAlert)
-                                              categories:nil];
-    } else if([[UIDevice currentDevice].systemVersion floatValue] < 8.0){
-        //categories 必须为nil
-        [JPUSHService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
-                                                          UIRemoteNotificationTypeSound |
-                                                          UIRemoteNotificationTypeAlert)
-                                              categories:nil];
-    }
 }
 
 #pragma mark 将参数返回给js
@@ -427,58 +306,13 @@ static NSDictionary *_launchOptions = nil;
                            @"tags"      :tags  == nil ? [NSNull null] : [tags allObjects],
                            @"alias"     :alias == nil ? [NSNull null] : alias
                            };
-    dispatch_async(dispatch_get_main_queue(), ^{
+    [self jpushFireDocumentEvent:JPushDocumentEvent_SetTagsWithAlias jsString:[dict toJsonString]];
-        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.setTagsWithAlias',%@)",[dict toJsonString]]];
-    });
 }
 
 - (void)networkDidReceiveMessage:(NSNotification *)notification {
-    if (notification) {
+    if (notification && notification.userInfo) {
-        dispatch_async(dispatch_get_main_queue(), ^{
+        [self jpushFireDocumentEvent:JPushDocumentEvent_ReceiveMessage jsString:[notification.userInfo  toJsonString]];
-
-            [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveMessage',%@)",[notification.userInfo toJsonString]]];
-
-            [self.commandDelegate evalJs:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",[notification.userInfo toJsonString]]];
-
-        });
     }
 }
 
--(void)networkDidReceiveNotification:(NSNotification *)notification{
-
-    NSError  *error;
-    NSDictionary *userInfo = [notification object];
-
-    NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
-    NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
-
-    switch ([UIApplication sharedApplication].applicationState) {
-        case UIApplicationStateActive:{
-            //前台收到
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveNotification',%@)",jsonString]];
-            });
-            break;
-        }
-        case UIApplicationStateInactive:{
-            //后台点击
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",jsonString]];
-            });
-            break;
-        }
-        case UIApplicationStateBackground:{
-            //后台收到
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.backgoundNotification',%@)",jsonString]];
-            });
-            break;
-        }
-        default:
-            //do nothing
-            break;
-    }
-    
-}
-
 @end

src/ios/PushConfig.plist

@@ -2,9 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>APP_KEY</key>
+	<key>Appkey</key>
 	<string></string>
-	<key>CHANNEL</key>
+	<key>Channel</key>
 	<string>Subscription</string>
 	<key>IsProduction</key>
 	<false/>

src/ios/lib/JPUSHService.h

@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 2.1.9
+#define JPUSH_VERSION_NUMBER 2.2.0
 
 #import <Foundation/Foundation.h>
 

www/JPushPlugin.js

@@ -7,10 +7,10 @@ JPushPlugin.prototype.openNotification = {}
 JPushPlugin.prototype.receiveNotification = {}
 
 JPushPlugin.prototype.isPlatformIOS = function () {
-  var isPlatformIOS = device.platform == 'iPhone'
+  var isPlatformIOS = device.platform == 'iPhone' ||
-    || device.platform == 'iPad'
+    device.platform == 'iPad' ||
-    || device.platform == 'iPod touch'
+    device.platform == 'iPod touch' ||
-    || device.platform == 'iOS'
+    device.platform == 'iOS'
   return isPlatformIOS
 }
 
@@ -26,41 +26,30 @@ JPushPlugin.prototype.call_native = function (name, args, callback) {
 // public methods
 JPushPlugin.prototype.init = function () {
   if (this.isPlatformIOS()) {
-    var data = []
+    this.call_native('initial', [], null)
-    this.call_native('initial', data, null)
   } else {
-    data = []
+    this.call_native('init', [], null)
-    this.call_native('init', data, null)
   }
 }
 
 JPushPlugin.prototype.getRegistrationID = function (callback) {
-  try {
+  this.call_native('getRegistrationID', [], callback)
-    var data = []
-    this.call_native('getRegistrationID', [data], callback)
-  } catch(exception) {
-    console.log(exception)
-  }
 }
 
 JPushPlugin.prototype.stopPush = function () {
-  data = []
+  this.call_native('stopPush', [], null)
-  this.call_native('stopPush', data, null)
 }
 
 JPushPlugin.prototype.resumePush = function () {
-  data = []
+  this.call_native('resumePush', [], null)
-  this.call_native('resumePush', data, null)
 }
 
 JPushPlugin.prototype.isPushStopped = function (callback) {
-  data = []
+  this.call_native('isPushStopped', [], callback)
-  this.call_native('isPushStopped', data, callback)
 }
 
 // iOS methods
 JPushPlugin.prototype.setTagsWithAlias = function (tags, alias) {
-  try {
   if (tags == null) {
     this.setAlias(alias)
     return
@@ -72,107 +61,68 @@ JPushPlugin.prototype.setTagsWithAlias = function (tags, alias) {
   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 {
+    this.call_native('resetBadge', [], null)
-      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', [], null)
-    this.call_native('setDebugModeFromIos', [data], null)
   }
 }
 
 JPushPlugin.prototype.setLogOFF = function () {
   if (this.isPlatformIOS()) {
-    var data = []
+    this.call_native('setLogOFF', [], null)
-    this.call_native('setLogOFF', [data], null)
   }
 }
 
 JPushPlugin.prototype.setCrashLogON = function () {
   if (this.isPlatformIOS()) {
-    var data = []
+    this.call_native('crashLogON', [], null)
-    this.call_native('crashLogON', [data], null)
   }
 }
 
 JPushPlugin.prototype.addLocalNotificationForIOS = function (delayTime, content,
   badge, notificationID, extras) {
   if (this.isPlatformIOS()) {
-    var data = [delayTime, content, badge, notificationID, extras]
+    this.call_native('setLocalNotification', [delayTime, content, badge, notificationID, extras], null)
-    this.call_native('setLocalNotification', data, null)
   }
 }
 
-JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function (
+JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function (identifierKey) {
-  identifierKey) {
   if (this.isPlatformIOS()) {
-    var data = [identifierKey]
+    this.call_native('deleteLocalNotificationWithIdentifierKey', [identifierKey], null)
-    this.call_native('deleteLocalNotificationWithIdentifierKey', data, null)
   }
 }
 
 JPushPlugin.prototype.clearAllLocalNotifications = function () {
   if (this.isPlatformIOS()) {
-    var data = []
+    this.call_native('clearAllLocalNotifications', [], null)
-    this.call_native('clearAllLocalNotifications', data, null)
   }
 }
 
 JPushPlugin.prototype.setLocation = function (latitude, longitude) {
   if (this.isPlatformIOS()) {
-    var data = [latitude, longitude]
+    this.call_native('setLocation', [latitude, longitude], null)
-    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)
   }
 }
 
@@ -239,61 +189,45 @@ JPushPlugin.prototype.setDebugMode = function (mode) {
 
 JPushPlugin.prototype.setBasicPushNotificationBuilder = function () {
   if (device.platform == 'Android') {
-    data = []
+    this.call_native('setBasicPushNotificationBuilder', [], null)
-    this.call_native('setBasicPushNotificationBuilder', data, null)
   }
 }
 
 JPushPlugin.prototype.setCustomPushNotificationBuilder = function () {
   if (device.platform == 'Android') {
-    data = []
+    this.call_native('setCustomPushNotificationBuilder', [], null)
-    this.call_native('setCustomPushNotificationBuilder', data, null)
   }
 }
 
 JPushPlugin.prototype.receiveMessageInAndroidCallback = function (data) {
-  try {
   data = JSON.stringify(data)
   console.log('JPushPlugin:receiveMessageInAndroidCallback: ' + data)
   this.receiveMessage = JSON.parse(data)
   cordova.fireDocumentEvent('jpush.receiveMessage', this.receiveMessage)
-  } catch(exception) {
-    console.log('JPushPlugin:pushCallback ' + exception)
-  }
 }
 
 JPushPlugin.prototype.openNotificationInAndroidCallback = function (data) {
-  try {
   data = JSON.stringify(data)
   console.log('JPushPlugin:openNotificationInAndroidCallback: ' + data)
   this.openNotification = JSON.parse(data)
   cordova.fireDocumentEvent('jpush.openNotification', this.openNotification)
-  } catch(exception) {
-    console.log(exception)
-  }
 }
 
 JPushPlugin.prototype.receiveNotificationInAndroidCallback = function (data) {
-  try {
   data = JSON.stringify(data)
   console.log('JPushPlugin:receiveNotificationInAndroidCallback: ' + data)
   this.receiveNotification = JSON.parse(data)
   cordova.fireDocumentEvent('jpush.receiveNotification', this.receiveNotification)
-  } catch(exception) {
-    console.log(exception)
-  }
 }
 
 JPushPlugin.prototype.clearAllNotification = function () {
   if (device.platform == 'Android') {
-    data = []
+    this.call_native('clearAllNotification', [], null)
-    this.call_native('clearAllNotification', data, null)
   }
 }
 
 JPushPlugin.prototype.clearNotificationById = function (notificationId) {
   if (device.platform == 'Android') {
-    data = []
     this.call_native('clearNotificationById', [notificationId], null)
   }
 }
@@ -313,8 +247,7 @@ JPushPlugin.prototype.setDebugMode = function (mode) {
 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', [builderId, content, title, notificationID, broadcastTime, extras], null)
-    this.call_native('addLocalNotification', data, null)
   }
 }
 
@@ -326,8 +259,7 @@ JPushPlugin.prototype.removeLocalNotification = function (notificationID) {
 
 JPushPlugin.prototype.clearLocalNotifications = function () {
   if (device.platform == 'Android') {
-    data = []
+    this.call_native('clearLocalNotifications', [], null)
-    this.call_native('clearLocalNotifications', data, null)
   }
 }
 
@@ -348,9 +280,9 @@ JPushPlugin.prototype.setStatisticsOpen = function (mode) {
 }
 
 /**
-* 用于在 Android 6.0 及以上系统，申请一些权限
+ * 用于在 Android 6.0 及以上系统，申请一些权限
-* 具体可看：http://docs.jpush.io/client/android_api/#android-60
+ * 具体可看：http://docs.jpush.io/client/android_api/#android-60
-*/
+ */
 JPushPlugin.prototype.requestPermission = function () {
   if (device.platform == 'Android') {
     this.call_native('requestPermission', [], null)