2.2.5

Author: JoshLipan

documents/api.md

@@ -3,6 +3,7 @@
 * [Common API](#common-api)
   * [getRegistrationID](#getregistrationid)
   * [stopPush](#stoppush)
+  * [resumePush](#resumepush)
   * [setAlias](#setalias)
   * [addTags](#addtags)
   * [deleteTags](#deletetags)
@@ -24,7 +25,6 @@
   * [网络成功登陆事件](#network-did-login-event)
 * [Android Only API](#android-only-api)
   * [initPush](#initpush)
-  * [resumePush](#resumepush)
   * [crashLogOFF](#crashlogoff)
   * [crashLogON](#crashlogno)
   * [notifyJSDidLoad](#notifyjsdidload)
@@ -61,6 +61,20 @@ Android 和 iOS 通用 API。
 JPushModule.stopPush();
 ```
 
+* #### resumePush
+
+  恢复推送。建议在 `MainActivity` 的 `onResume` 中调用：
+
+  ```
+  // android native java
+  JPushInterface.onResume(this);
+  ```
+
+  ```
+  // iOS - javascirpt
+  JPushModule.resumePush();
+  ```
+  
 #### setAlias
 
 * setAlias(alias, successCallback)
@@ -359,14 +373,6 @@ JPushModule.getLaunchAppNotification( notification => {
   JPushInterface.init(this);
   ```
 
-* #### resumePush
-
-  恢复推送。建议在 `MainActivity` 的 `onResume` 中调用：
-
-  ```
-  JPushInterface.onResume(this);
-  ```
-
 * #### crashLogOFF
 
   停止上报崩溃日志

documents/api_en.md

@@ -3,6 +3,7 @@
 * [Common API](#common-api)
   * [getRegistrationID](#getregistrationid)
   * [stopPush](#stoppush)
+  * [resumePush](#resumepush)
   * [setAlias](#setalias)
   * [addTags](#addtags)
   * [setTags](#settags)
@@ -24,7 +25,6 @@
   * [Network Did Login Event](#network-did-login-event)
 * [Android Only API](#android-only-api)
   * [initPush](#initpush)
-  * [resumePush](#resumepush)
   * [crashLogOFF](#crashlogoff)
   * [crashLogON](#crashlogon)
   * [notifyJSDidLoad](#notifyjsdidload)
@@ -61,6 +61,20 @@ Stop push.
 JPushModule.stopPush();
 ```
 
+* #### resumePush
+
+  Resume push. Suggest invokes in `MainActivity` 's `onResume` method：
+
+  ```
+  // android native java
+  JPushInterface.onResume(this);
+  ```
+
+  ```
+  // iOS - javascirpt
+  JPushModule.resumePush();
+  ```
+
 #### setAlias
 
 set device's application alias, you can push notificaiton with alias, every device can only have one alias.
@@ -330,14 +344,6 @@ JPushModule.getLaunchAppNotification( notification => {
   JPushInterface.init(this);
   ```
 
-* #### resumePush
-
-  Resume push. Suggest invokes in `MainActivity` 's `onResume` method：
-
-  ```
-  JPushInterface.onResume(this);
-  ```
-
 * #### crashLogOFF
 
   Stop upload crash log.

ios/RCTJPushModule/RCTJPushModule.m

@@ -745,10 +745,12 @@ - (void)didRegistRemoteNotification:(NSString *)token {
  * - 通过本 API 把当前客户端(当前这个用户的) 的实际 badge 设置到服务器端保存起来;
  * - 调用服务器端 API 发 APNs 时(通常这个调用是批量针对大量用户),
  *   使用 "+1" 的语义, 来表达需要基于目标用户实际的 badge 值(保存的) +1 来下发通知时带上新的 badge 值;
+ *
+ * setBadge(-1): 支持清空icon的badge而不清空通知栏消息
  */
 RCT_EXPORT_METHOD(setBadge:(NSInteger)value callback:(RCTResponseSenderBlock)callback) {// ->Bool
   [[UIApplication sharedApplication] setApplicationIconBadgeNumber:value];
-  NSNumber *badgeNumber = [NSNumber numberWithBool:[JPUSHService setBadge: value]];
+  NSNumber *badgeNumber = [NSNumber numberWithBool:[JPUSHService setBadge: value > 0 ? value : 0]];
   callback(@[badgeNumber]);
 }