增加推送消息内容

guangyao · guangyao · commit c92d1642e747 · 2017-09-25T15:42:23.000+08:00
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m b/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m
@@ -363,29 +363,19 @@ - (void)stopPlay{
 //发送录音
 -(void)sendAudioMessage:(  NSString *)file duration:(  NSString *)duration{
     if (file) {
-        [[[NIMSDK sharedSDK] chatManager] sendMessage:[NIMMessageMaker msgWithAudio:file] toSession:_session error:nil];
+        [[[NIMSDK sharedSDK] chatManager] sendMessage:[NIMMessageMaker msgWithAudio:file andeSession:_session] toSession:_session error:nil];
     }
 }
 //发送文字消息
 -(void)sendMessage:(NSString *)mess andApnsMembers:(NSArray *)members{
-    NIMMessage *message = [[NIMMessage alloc] init];
-    message.text    = mess;
-    message.apnsContent = mess;
-    if (members.count) {
-        NIMMessageApnsMemberOption *apnsMemberOption = [[NIMMessageApnsMemberOption alloc]init];
-        apnsMemberOption.userIds = members;
-        apnsMemberOption.forcePush = YES;
-        apnsMemberOption.apnsContent = @"有人@了你";
-        message.apnsMemberOption = apnsMemberOption;
-    }
-    message.apnsContent = mess;
+    NIMMessage *message = [NIMMessageMaker msgWithText:mess andApnsMembers:members andeSession:_session];
     //发送消息
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
 }
 //发送图片
 -(void)sendImageMessages:(  NSString *)path  displayName:(  NSString *)displayName{
     UIImage *img = [[UIImage alloc]initWithContentsOfFile:path];
-    NIMMessage *message = [NIMMessageMaker msgWithImage:img];
+    NIMMessage *message = [NIMMessageMaker msgWithImage:img andeSession:_session];
 //    NIMMessage *message = [NIMMessageMaker msgWithImagePath:path];
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
 }
@@ -396,7 +386,7 @@ -(void)sendTextMessage:(  NSString *)path duration:(  NSString *)duration width:
     //    if (image) {
     //        message = [NIMMessageMaker msgWithImage:image];
     //    }else{
-    message = [NIMMessageMaker msgWithVideo:path];
+    message = [NIMMessageMaker msgWithVideo:path andeSession:_session];
     //    }
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
     
@@ -407,15 +397,15 @@ -(void)sendCustomMessage:(  NSString *)attachment config:(  NSString *)config{
     NIMMessage *message;
     NIMObject *obj = [NIMObject initNIMObject];
     obj.attachment =attachment;
-    message = [NIMMessageMaker msgWithCustom:obj];
+    message = [NIMMessageMaker msgWithCustom:obj andeSession:_session];
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
 }
 
 //发送地理位置消息
 -(void)sendLocationMessage:(  NSString *)latitude longitude:(  NSString *)longitude address:(  NSString *)address{
     NIMLocationObject *locaObj = [[NIMLocationObject alloc]initWithLatitude:[latitude doubleValue] longitude:[longitude doubleValue] title:address];
     NIMKitLocationPoint *locationPoint = [[NIMKitLocationPoint alloc]initWithLocationObject:locaObj];
-    NIMMessage *message = [NIMMessageMaker msgWithLocation:locationPoint];
+    NIMMessage *message = [NIMMessageMaker msgWithLocation:locationPoint andeSession:_session];
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
 }
 //发送自定义消息2
@@ -424,7 +414,7 @@ -(void)sendCustomMessage:(NSInteger )custType data:(NSDictionary *)dataDict{
     DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];
     obj.custType = custType;
     obj.dataDict = dataDict;
-    message = [NIMMessageMaker msgWithCustomAttachment:obj];
+    message = [NIMMessageMaker msgWithCustomAttachment:obj andeSession:_session];
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
 }
 
@@ -459,7 +449,7 @@ -(void)sendRedPacketOpenMessage:(NSString *)sendId hasRedPacket:(NSString *)hasR
     DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];
     obj.custType = CustomMessgeTypeRedPacketOpenMessage;
     obj.dataDict = dict;
-    message = [NIMMessageMaker msgWithCustomAttachment:obj];
+    message = [NIMMessageMaker msgWithCustomAttachment:obj andeSession:_session];
     NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
     message.timestamp = timestamp;
     if(![sendId isEqualToString:strMyId]){
@@ -653,7 +643,7 @@ - (void)recordAudio:(NSString *)filePath didBeganWithError:(NSError *)error {
 - (void)recordAudio:(NSString *)filePath didCompletedWithError:(NSError *)error {
     if(!error) {
         if ([self recordFileCanBeSend:filePath]) {
-            [[[NIMSDK sharedSDK] chatManager] sendMessage:[NIMMessageMaker msgWithAudio:filePath] toSession:_session error:nil];
+            [[[NIMSDK sharedSDK] chatManager] sendMessage:[NIMMessageMaker msgWithAudio:filePath andeSession:_session] toSession:_session error:nil];
         }else{
             [self showRecordFileNotSendReason];
         }
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m b/ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m
@@ -27,14 +27,44 @@ - (instancetype)init{
 
 - (void)clickObserveNotification:(NSNotification *)noti{
     NSDictionary *dict = noti.object;
-    NSDictionary *param = [dict objectForKey:@"dict"];
-    if ([[dict objectForKey:@"type"] isEqualToString:@"launch"]) {
-        [_bridge.eventDispatcher sendDeviceEventWithName:@"observeLaunchPushEvent" body:param];
-    }else{
-        [_bridge.eventDispatcher sendDeviceEventWithName:@"observeBackgroundPushEvent" body:param];
+    NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:[dict objectForKey:@"dict"]];
+    NSString *strDict = [param objectForKey:@"sessionBody"];
+    if ([strDict length]) {
+        NSDictionary *dataDict = [self dictChangeFromJson:strDict];
+        NSMutableDictionary *mutaDict = [NSMutableDictionary dictionaryWithDictionary:dataDict];
+        NSString *strType = [mutaDict objectForKey:@"sessionType"];
+        NSString *strSessionId = [mutaDict objectForKey:@"sessionId"];
+        NSString *strSessionName = @"";
+        if ([strType isEqualToString:@"0"]) {//点对点
+            NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:strSessionId];
+            if ([user.alias length]) {
+                strSessionName = user.alias;
+            }else{
+                NIMUserInfo *userInfo = user.userInfo;
+                strSessionName = userInfo.nickName;
+            }
+        }else{//群主
+            NIMTeam *team = [[[NIMSDK sharedSDK] teamManager]teamById:strSessionId];
+            strSessionName = team.teamName;
+        }
+        [mutaDict setObject:strSessionName forKey:@"sessionName"];
+        [param setObject:mutaDict forKey:@"sessionBody"];
+        if ([[dict objectForKey:@"type"] isEqualToString:@"launch"]) {
+            [_bridge.eventDispatcher sendDeviceEventWithName:@"observeLaunchPushEvent" body:param];
+        }else{
+            [_bridge.eventDispatcher sendDeviceEventWithName:@"observeBackgroundPushEvent" body:param];
+        }
     }
+
 }
 
+- (NSDictionary *)dictChangeFromJson:(NSString *)strJson{
+    NSData* data = [strJson dataUsingEncoding:NSUTF8StringEncoding];
+    __autoreleasing NSError* error = nil;
+    id result = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error];
+    if (error != nil) return nil;
+    return result;
+}
 
 @synthesize bridge = _bridge;
 - (dispatch_queue_t)methodQueue
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/RNNotificationCenter.m b/ios/RNNeteaseIm/RNNeteaseIm/RNNotificationCenter.m
@@ -147,7 +147,7 @@ - (void)saveTheRedPacketOpenMsg:(NSDictionary *)dict andTime:(NSTimeInterval)tim
     DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];
     obj.custType = CustomMessgeTypeRedPacketOpenMessage;
     obj.dataDict = datatDict;
-    message = [NIMMessageMaker msgWithCustomAttachment:obj];
+    message = [NIMMessageMaker msgWithCustomAttachment:obj andeSession:session];
     message.timestamp = timestamp;
     [[NIMSDK sharedSDK].conversationManager saveMessage:message forSession:session completion:nil];
 }
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/Util/NIMMessageMaker.h b/ios/RNNeteaseIm/RNNeteaseIm/Util/NIMMessageMaker.h
@@ -13,19 +13,20 @@
 
 @interface NIMMessageMaker : NSObject
 
-+ (NIMMessage*)msgWithText:(NSString*)text;
++ (NIMMessage*)msgWithText:(NSString*)text andApnsMembers:(NSArray *)members andeSession:(NIMSession *)session;
 
-+ (NIMMessage *)msgWithAudio:(NSString *)filePath;
++ (NIMMessage *)msgWithAudio:(NSString *)filePath andeSession:(NIMSession *)session;
 
-+ (NIMMessage *)msgWithImage:(UIImage *)image;
++ (NIMMessage *)msgWithImage:(UIImage *)image andeSession:(NIMSession *)session;
 
-+ (NIMMessage *)msgWithImagePath:(NSString *)path;
++ (NIMMessage *)msgWithImagePath:(NSString *)path andeSession:(NIMSession *)session;
 
-+ (NIMMessage *)msgWithVideo:(NSString *)filePath;
++ (NIMMessage *)msgWithVideo:(NSString *)filePath andeSession:(NIMSession *)session;
 
-+ (NIMMessage *)msgWithLocation:(NIMKitLocationPoint*)locationPoint;
++ (NIMMessage *)msgWithLocation:(NIMKitLocationPoint*)locationPoint andeSession:(NIMSession *)session;
 
-+ (NIMMessage*)msgWithCustom:(NIMObject *)attachment;
++ (NIMMessage*)msgWithCustom:(NIMObject *)attachment andeSession:(NIMSession *)session;
+
++ (NIMMessage*)msgWithCustomAttachment:(DWCustomAttachment *)attachment andeSession:(NIMSession *)session;
 
-+ (NIMMessage*)msgWithCustomAttachment:(DWCustomAttachment *)attachment;
 @end
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/Util/NIMMessageMaker.m b/ios/RNNeteaseIm/RNNeteaseIm/Util/NIMMessageMaker.m
@@ -12,32 +12,45 @@
 
 @implementation NIMMessageMaker
 
-+ (NIMMessage*)msgWithText:(NSString*)text
++ (NIMMessage*)msgWithText:(NSString*)text andApnsMembers:(NSArray *)members andeSession:(NIMSession *)session
 {
-    NIMMessage *textMessage = [[NIMMessage alloc] init];
-    textMessage.text        = text;
-    return textMessage;
+    
+    NIMMessage *message = [[NIMMessage alloc] init];
+    message.text    = text;
+    message.apnsContent = text;
+    if (members.count) {
+        NIMMessageApnsMemberOption *apnsMemberOption = [[NIMMessageApnsMemberOption alloc]init];
+        apnsMemberOption.userIds = members;
+        apnsMemberOption.forcePush = YES;
+        apnsMemberOption.apnsContent = @"有人@了你";
+        message.apnsMemberOption = apnsMemberOption;
+    }
+    message.apnsContent = text;
+    [NIMMessageMaker setupMessagePushBody:message andSession:session];
+    return message;
 }
 
-+ (NIMMessage*)msgWithAudio:(NSString*)filePath
++ (NIMMessage*)msgWithAudio:(NSString*)filePath andeSession:(NIMSession *)session
 {
     NIMAudioObject *audioObject = [[NIMAudioObject alloc] initWithSourcePath:filePath];
     NIMMessage *message = [[NIMMessage alloc] init];
     message.messageObject = audioObject;
     message.text = @"发来了一段语音";
+    [NIMMessageMaker setupMessagePushBody:message andSession:session];
     return message;
 }
-+ (NIMMessage*)msgWithCustom:(NIMObject *)attachment
++ (NIMMessage*)msgWithCustom:(NIMObject *)attachment andeSession:(NIMSession *)session
 {
     
     NIMMessage *message               = [[NIMMessage alloc] init];
     NIMCustomObject *customObject     = [[NIMCustomObject alloc] init];
     customObject.attachment           = attachment;
     message.messageObject             = customObject;
     message.apnsContent = @"发来了一条未知消息";
+    [NIMMessageMaker setupMessagePushBody:message andSession:session];
     return message;
 }
-+ (NIMMessage*)msgWithCustomAttachment:(DWCustomAttachment *)attachment
++ (NIMMessage*)msgWithCustomAttachment:(DWCustomAttachment *)attachment andeSession:(NIMSession *)session
 {
     
     NIMMessage *message               = [[NIMMessage alloc] init];
@@ -71,10 +84,11 @@ + (NIMMessage*)msgWithCustomAttachment:(DWCustomAttachment *)attachment
             break;
     }
     message.apnsContent = text;
+    [NIMMessageMaker setupMessagePushBody:message andSession:session];
     return message;
 }
 
-+ (NIMMessage*)msgWithVideo:(NSString*)filePath
++ (NIMMessage*)msgWithVideo:(NSString*)filePath andeSession:(NIMSession *)session
 {
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
@@ -84,18 +98,19 @@ + (NIMMessage*)msgWithVideo:(NSString*)filePath
     NIMMessage *message = [[NIMMessage alloc] init];
     message.messageObject = videoObject;
     message.apnsContent = @"发来了一段视频";
+    [NIMMessageMaker setupMessagePushBody:message andSession:session];
     return message;
 }
-+ (NIMMessage*)msgWithImage:(UIImage*)image
++ (NIMMessage*)msgWithImage:(UIImage*)image andeSession:(NIMSession *)session
 {
     NIMImageObject *imageObject = [[NIMImageObject alloc] initWithImage:image];
     NIMImageOption *option  = [[NIMImageOption alloc] init];
     option.compressQuality  = 0.7;
     imageObject.option      = option;
-    return [NIMMessageMaker generateImageMessage:imageObject];
+    return [NIMMessageMaker generateImageMessage:imageObject andeSession:session];
 }
 
-+ (NIMMessage *)msgWithImagePath:(NSString*)path
++ (NIMMessage *)msgWithImagePath:(NSString*)path andeSession:(NIMSession *)session
 {
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
@@ -105,10 +120,10 @@ + (NIMMessage *)msgWithImagePath:(NSString*)path
     NIMMessage *message     = [[NIMMessage alloc] init];
     message.messageObject   = imageObject;
     message.apnsContent = @"发来了一张图片";
-    return [NIMMessageMaker generateImageMessage:imageObject];
+    return [NIMMessageMaker generateImageMessage:imageObject  andeSession:session];
 }
 
-+ (NIMMessage *)generateImageMessage:(NIMImageObject *)imageObject
++ (NIMMessage *)generateImageMessage:(NIMImageObject *)imageObject andeSession:(NIMSession *)session
 {
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
@@ -117,19 +132,33 @@ + (NIMMessage *)generateImageMessage:(NIMImageObject *)imageObject
     NIMMessage *message     = [[NIMMessage alloc] init];
     message.messageObject   = imageObject;
     message.apnsContent = @"发来了一张图片";
+    [NIMMessageMaker setupMessagePushBody:message andSession:session];
     return message;
 }
 
 
-+ (NIMMessage*)msgWithLocation:(NIMKitLocationPoint *)locationPoint{
++ (NIMMessage*)msgWithLocation:(NIMKitLocationPoint *)locationPoint andeSession:(NIMSession *)session{
     NIMLocationObject *locationObject = [[NIMLocationObject alloc] initWithLatitude:locationPoint.coordinate.latitude
                                                                           longitude:locationPoint.coordinate.longitude
                                                                               title:locationPoint.title];
     NIMMessage *message               = [[NIMMessage alloc] init];
     message.messageObject             = locationObject;
     message.apnsContent = @"发来了一条位置信息";
+    [NIMMessageMaker setupMessagePushBody:message andSession:session];
     return message;
 }
 
++ (void)setupMessagePushBody:(NIMMessage *)message andSession:(NIMSession *)session{
+    NSMutableDictionary *payload = [NSMutableDictionary dictionary];
+    NSString *strSessionID = @"";
+    if (session.sessionType == NIMSessionTypeP2P) {//点对点
+        strSessionID = [NIMSDK sharedSDK].loginManager.currentAccount;
+    }else{
+        strSessionID = [NSString stringWithFormat:@"%@",session.sessionId];
+    }
+    NSString *strSessionType = [NSString stringWithFormat:@"%zd",session.sessionType];
+    [payload setObject:@{@"sessionId":strSessionID,@"sessionType":strSessionType} forKey:@"sessionBody"];
+    message.apnsPayload = payload;
+}
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ - (void)saveTheRedPacketOpenMsg:(NSDictionary *)dict andTime:(NSTimeInterval)tim`
`147`	`147`	`DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];`
`148`	`148`	`obj.custType = CustomMessgeTypeRedPacketOpenMessage;`
`149`	`149`	`obj.dataDict = datatDict;`
`150`		`- message = [NIMMessageMaker msgWithCustomAttachment:obj];`
	`150`	`+ message = [NIMMessageMaker msgWithCustomAttachment:obj andeSession:session];`
`151`	`151`	`message.timestamp = timestamp;`
`152`	`152`	`[[NIMSDK sharedSDK].conversationManager saveMessage:message forSession:session completion:nil];`
`153`	`153`	`}`