Merge pull request #674 from jpush/dev

更新版本号到2.5.9

Author: wicked-tc130

ios/RCTJPushModule/RCTJPushModule.m

@@ -360,7 +360,17 @@ -(NSDictionary *)convertApnsMessage:(NSNotification *)data{
     NSNotificationName notificationName = data.name;
     NSDictionary *objectData = data.object;
     NSString *notificationType = ([notificationName isEqualToString:J_APNS_NOTIFICATION_OPENED_EVENT])?NOTIFICATION_OPENED:NOTIFICATION_ARRIVED;
-    NSDictionary *apnsData =  objectData[@"aps"][@"alert"];
+    id alertData =  objectData[@"aps"][@"alert"];
+    NSString *title = @"";
+    NSString *content = @"";
+    
+    if([alertData isKindOfClass:[NSString class]]){
+       content = alertData;
+    }else if([alertData isKindOfClass:[NSDictionary class]]){
+        title = alertData[@"title"]?alertData[@"title"]:@"";
+        content = alertData[@"body"]?alertData[@"body"]:@"";
+    }
+    
     NSDictionary *responseData;
     NSMutableDictionary * copyData = [[NSMutableDictionary alloc] initWithDictionary:objectData];
     if (copyData[@"_j_business"]) {
@@ -372,11 +382,6 @@ -(NSDictionary *)convertApnsMessage:(NSNotification *)data{
     [copyData removeObjectForKey:@"_j_msgid"];
     if (copyData[@"aps"]) {
         [copyData removeObjectForKey:@"aps"];
-    }
-    @try {
-        
-    } @catch (NSException *exception) {
-       
     }
     NSMutableDictionary * extrasData = [[NSMutableDictionary alloc] init];
 
@@ -387,11 +392,12 @@ -(NSDictionary *)convertApnsMessage:(NSNotification *)data{
         NSString *value = [copyData objectForKey:key];
         [extrasData setObject:value forKey:key];
     };
+   
     if (extrasData.count > 0) {
-        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],TITLE:apnsData[@"title"],CONTENT:apnsData[@"body"],EXTRAS:extrasData,NOTIFICATION_TYPE:notificationType};
+        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],TITLE:title,CONTENT:content,EXTRAS:extrasData,NOTIFICATION_TYPE:notificationType};
     }
     else {
-        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],TITLE:apnsData[@"title"],CONTENT:apnsData[@"body"],NOTIFICATION_TYPE:notificationType};
+        responseData = @{MESSAGE_ID:objectData[@"_j_msgid"],TITLE:title,CONTENT:content,NOTIFICATION_TYPE:notificationType};
     }
     return responseData;
 }

package.json

@@ -14,7 +14,7 @@
     ]
   ],
   "_from": "..",
-  "_id": "[email protected].8",
+  "_id": "[email protected].9",
   "_inCache": true,
   "_installable": true,
   "_location": "/jpush-react-native",
@@ -103,5 +103,5 @@
       "ios/"
     ]
   },
-  "version": "2.5.8"
+  "version": "2.5.9"
 }