Fix红包提醒

Author: guangyao

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -444,8 +444,10 @@ -(void)sendRedPacketOpenMessage:(NSString *)sendId hasRedPacket:(NSString *)hasR
     message.timestamp = timestamp;
     if(![sendId isEqualToString:strMyId]){
         NSDictionary *dataDict = @{@"type":@"2",@"data":@{@"dict":dict,@"timestamp":[NSString stringWithFormat:@"%f",timestamp],@"sessionId":_session.sessionId,@"sessionType":[NSString stringWithFormat:@"%zd",_session.sessionType]}};
+        
+        NSString *content = [self jsonStringWithDictionary:dataDict];
         NIMSession *redSession = [NIMSession session:sendId type:NIMSessionTypeP2P];
-        NIMCustomSystemNotification *notifi = [[NIMCustomSystemNotification alloc]initWithContent:@""];
+        NIMCustomSystemNotification *notifi = [[NIMCustomSystemNotification alloc]initWithContent:content];
         notifi.sendToOnlineUsersOnly = NO;
         NIMCustomSystemNotificationSetting *setting = [[NIMCustomSystemNotificationSetting alloc]init];
         setting.shouldBeCounted = NO;
@@ -455,8 +457,23 @@ -(void)sendRedPacketOpenMessage:(NSString *)sendId hasRedPacket:(NSString *)hasR
         [[NIMSDK sharedSDK].systemNotificationManager sendCustomNotification:notifi toSession:redSession completion:nil];//发送自定义通知
     }
     [[NIMSDK sharedSDK].conversationManager saveMessage:message forSession:_session completion:nil];
+    
 }
 
+// dict字典转json字符串
+- (NSString *)jsonStringWithDictionary:(NSDictionary *)dict
+{
+    if (dict && 0 != dict.count)
+    {
+        NSError *error = nil;
+        // NSJSONWritingOptions 是"NSJSONWritingPrettyPrinted"的话有换位符\n；是"0"的话没有换位符\n。
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dict options:0 error:&error];
+        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+        return jsonString;
+    }
+    
+    return nil;
+}
 
 
 //设置好友消息提醒
@@ -520,7 +537,10 @@ - (void)onRecvMessages:(NSArray *)messages
                                                   completion:nil];
         //标记已读消息
         [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:_session];
-        [self playTipsMusicWithMessage:message];
+        
+        if (![message.from isEqualToString:[NIMSDK sharedSDK].loginManager.currentAccount]) {
+            [self playTipsMusicWithMessage:message];
+        }
     }
 }
 

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

@@ -302,7 +302,7 @@ - (NSString *)messageContent:(NIMMessage*)lastMessage{
         default:
             text = @"[未知消息]";
     }
-    if (lastMessage.session.sessionType == NIMSessionTypeP2P || lastMessage.messageType == NIMMessageTypeTip || lastMessage.messageType == NIMMessageTypeCustom) {
+    if ((lastMessage.session.sessionType == NIMSessionTypeP2P) || (lastMessage.messageType == NIMMessageTypeTip)||([lastMessage.from isEqualToString:[NIMSDK sharedSDK].loginManager.currentAccount]) ) {
         return text;
     }else{
         NSString *nickName = [NIMKitUtil showNick:lastMessage.from inSession:lastMessage.session];

ios/RNNeteaseIm/RNNeteaseIm/RNNotificationCenter.m

@@ -87,7 +87,8 @@ - (void)checkMessageAt:(NSArray *)messages
 #pragma mark - NIMSystemNotificationManagerDelegate
 - (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification{//接收自定义通知
 //    NSString *content = notification.content;
-    NSDictionary *notiDict = notification.apnsPayload;
+    NSDictionary *notiDict = [self jsonDictWithString:notification.content];
+    NSTimeInterval timestamp = notification.timestamp;
     if (notiDict){
         NSInteger notiType = [[notiDict objectForKey:@"type"] integerValue];
         switch (notiType) {
@@ -96,7 +97,7 @@ - (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notific
                 break;
             case 2://拆红包消息
             {
-                [self saveTheRedPacketOpenMsg:[notiDict objectForKey:@"data"]];
+                [self saveTheRedPacketOpenMsg:[notiDict objectForKey:@"data"] andTime:timestamp];
             }
                 break;
 
@@ -106,9 +107,9 @@ - (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notific
     }
 }
 //保存拆红包消息到本地
-- (void)saveTheRedPacketOpenMsg:(NSDictionary *)dict{
+- (void)saveTheRedPacketOpenMsg:(NSDictionary *)dict andTime:(NSTimeInterval)times{
     NSDictionary *datatDict = [dict objectForKey:@"dict"];
-    NSTimeInterval timestamp = [[dict objectForKey:@"timestamp"] doubleValue];
+    NSTimeInterval timestamp = times;
     NSString *sessionId = [dict objectForKey:@"sessionId"];
     NSInteger sessionType = [[dict objectForKey:@"sessionType"] integerValue];
     if (sessionType == NIMSessionTypeP2P) {//点对点
@@ -124,4 +125,22 @@ - (void)saveTheRedPacketOpenMsg:(NSDictionary *)dict{
     [[NIMSDK sharedSDK].conversationManager saveMessage:message forSession:session completion:nil];
 }
 
+// json字符串转dict字典
+- (NSDictionary *)jsonDictWithString:(NSString *)string
+{
+    if (string && 0 != string.length)
+    {
+        NSError *error;
+        NSData *jsonData = [string dataUsingEncoding:NSUTF8StringEncoding];
+        NSDictionary *jsonDict = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:&error];
+        if (error)
+        {
+            NSLog(@"json解析失败：%@", error);
+            return nil;
+        }
+        return jsonDict;
+    }
+    return nil;
+}
+
 @end