@@ -54,7 +54,6 @@ @implementation RCTJPushModule
5454
5555- (id )init
5656{
57- NSLog (@" xxx init" );
5857 self = [super init ];
5958 NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter ];
6059
@@ -403,7 +402,6 @@ -(NSDictionary *)convertApnsMessage:(id)data
403402 title = alertData[@" title" ]?alertData[@" title" ]:@" " ;
404403 content = alertData[@" body" ]?alertData[@" body" ]:@" " ;
405404 }
406-
407405 NSDictionary *responseData;
408406 NSMutableDictionary * copyData = [[NSMutableDictionary alloc ] initWithDictionary: objectData];
409407 if (copyData[@" _j_business" ]) {
@@ -425,12 +423,12 @@ -(NSDictionary *)convertApnsMessage:(id)data
425423 NSString *value = [copyData objectForKey: key];
426424 [extrasData setObject: value forKey: key];
427425 };
428-
426+ NSString *messageID = objectData[ @" _j_msgid " ]?objectData[ @" _j_msgid " ]: @" " ;
429427 if (extrasData.count > 0 ) {
430- responseData = @{MESSAGE_ID:objectData[ @" _j_msgid " ] ,TITLE:title,CONTENT:content,EXTRAS:extrasData,NOTIFICATION_EVENT_TYPE:notificationEventType};
428+ responseData = @{MESSAGE_ID:messageID ,TITLE:title,CONTENT:content,EXTRAS:extrasData,NOTIFICATION_EVENT_TYPE:notificationEventType};
431429 }
432430 else {
433- responseData = @{MESSAGE_ID:objectData[ @" _j_msgid " ] ,TITLE:title,CONTENT:content,NOTIFICATION_EVENT_TYPE:notificationEventType};
431+ responseData = @{MESSAGE_ID:messageID ,TITLE:title,CONTENT:content,NOTIFICATION_EVENT_TYPE:notificationEventType};
434432 }
435433 return responseData;
436434}
@@ -439,10 +437,13 @@ -(NSDictionary *)convertCustomMessage:(NSNotification *)data
439437{
440438 NSDictionary *objectData = data.object ;
441439 NSDictionary *responseData;
440+ NSString *messageID = objectData[@" _j_msgid" ]?objectData[@" _j_msgid" ]:@" " ;
441+ NSString *title = objectData[@" title" ]?objectData[@" title" ]:@" " ;
442+ NSString *content = objectData[@" content" ]?objectData[@" content" ]:@" " ;
442443 if (objectData[@" extras" ]){
443- responseData = @{MESSAGE_ID:objectData[ @" _j_msgid " ], CONTENT:objectData[ @" content" ] ,EXTRAS:objectData[@" extras" ]};
444+ responseData = @{MESSAGE_ID:messageID,TITLE:title, CONTENT:content,EXTRAS:objectData[@" extras" ]};
444445 }else {
445- responseData = @{MESSAGE_ID:objectData[ @" _j_msgid " ], CONTENT:objectData[ @" content" ] };
446+ responseData = @{MESSAGE_ID:messageID,TITLE:title, CONTENT:content};
446447 }
447448 return responseData;
448449}
0 commit comments