Merge pull request #468 from jpush/dev

Dev

Author: huangminlinux

example/App.js

@@ -222,6 +222,10 @@ export default class App extends Component {
         if (resultCode === 0) {
         }
       })
+
+      if (Platform.OS === 'ios') {
+        JPushModule.setupPush()
+      }
     }
 
     JPushModule.addReceiveCustomMsgListener(map => {

ios/RCTJPushModule/RCTJPushModule.m

@@ -320,7 +320,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
   self.asyCallback = callback;
   [JPUSHService setTags:tagSet completion:^(NSInteger iResCode, NSSet *iTags, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"tags": [iTags allObjects] ?: @[]}]);
+      callback(@[@{@"tags": [iTags allObjects] ?: @[],
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -336,7 +338,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
   self.asyCallback = callback;
   [JPUSHService setAlias:alias completion:^(NSInteger iResCode, NSString *iAlias, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"alias": iAlias ?: @""}]);
+      callback(@[@{@"alias": iAlias ?: @"",
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -352,7 +356,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
   }
   [JPUSHService addTags:tagSet completion:^(NSInteger iResCode, NSSet *iTags, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"tags": [iTags allObjects] ?: @[]}]);
+      callback(@[@{@"tags": [iTags allObjects] ?: @[],
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -368,7 +374,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
   }
   [JPUSHService deleteTags:tagSet completion:^(NSInteger iResCode, NSSet *iTags, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"tags": [iTags allObjects] ?: @[]}]);
+      callback(@[@{@"tags": [iTags allObjects] ?: @[],
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -378,7 +386,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
 RCT_EXPORT_METHOD( cleanTags:(RCTResponseSenderBlock)callback) {
   [JPUSHService cleanTags:^(NSInteger iResCode, NSSet *iTags, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"tags": [iTags allObjects] ?: @[]}]);
+      callback(@[@{@"tags": [iTags allObjects] ?: @[],
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -388,7 +398,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
 RCT_EXPORT_METHOD( getAllTags:(RCTResponseSenderBlock)callback) {
   [JPUSHService getAllTags:^(NSInteger iResCode, NSSet *iTags, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"tags": [iTags allObjects] ?: @[]}]);
+      callback(@[@{@"tags": [iTags allObjects] ?: @[],
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -399,7 +411,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
                            callback:(RCTResponseSenderBlock)callback) {
   [JPUSHService validTag:tag completion:^(NSInteger iResCode, NSSet *iTags, NSInteger seq, BOOL isBind) {
     if (iResCode == 0) {
-      callback(@[@{@"isBind": @(isBind)}]);
+      callback(@[@{@"isBind": @(isBind),
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -409,7 +423,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
 RCT_EXPORT_METHOD(deleteAlias:(RCTResponseSenderBlock)callback) {
   [JPUSHService deleteAlias:^(NSInteger iResCode, NSString *iAlias, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"alias": iAlias ?: @""}]);
+      callback(@[@{@"alias": iAlias ?: @"",
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }
@@ -419,7 +435,9 @@ - (void)didRegistRemoteNotification:(NSString *)token {
 RCT_EXPORT_METHOD(getAlias:(RCTResponseSenderBlock)callback) {
   [JPUSHService getAlias:^(NSInteger iResCode, NSString *iAlias, NSInteger seq) {
     if (iResCode == 0) {
-      callback(@[@{@"alias": iAlias ?: @""}]);
+      callback(@[@{@"alias": iAlias ?: @"",
+                   @"errorCode": @(0)
+                   }]);
     } else {
       callback(@[@{@"errorCode": @(iResCode)}]);
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jpush-react-native",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "description": "a jpush plugin for react native application",
   "main": "index.js",
   "scripts": {