Merge branch 'master' of github.com:reactnativecomponent/react-native-netease-im

Author: xhp

ios/RNNeteaseIm/RNNeteaseIm/ContactViewController.m

@@ -335,8 +335,12 @@ -(void)adduserId:(NSString *)userId andVerifyType:(NSString *)strType andMag:(NS
 - (void)sendCustomNotificationContent:(NSString *)content andSessionID:(NSString *)sessionID andApnsContent:(NSString *)strApns AndData:(NSDictionary *)dict{
     NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeP2P];
     NIMCustomSystemNotification *notifi = [[NIMCustomSystemNotification alloc]initWithContent:content];
+    NIMCustomSystemNotificationSetting *setting = [[NIMCustomSystemNotificationSetting alloc]init];
+    setting.apnsEnabled = YES;
     notifi.apnsContent = strApns;
     notifi.apnsPayload = dict;
+    notifi.sendToOnlineUsersOnly = NO;
+    notifi.setting = setting;
     [[NIMSDK sharedSDK].systemNotificationManager sendCustomNotification:notifi toSession:session completion:nil];//发送自定义通知
 }
 

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -424,8 +424,26 @@ - (void)sendBankTransferMessage:(NSString *)amount comments:(NSString *)comments
 -(void)sendRedPacketOpenMessage:(NSString *)sendId hasRedPacket:(NSString *)hasRedPacket serialNo:(NSString *)serialNo{
     NSString *strMyId = [NIMSDK sharedSDK].loginManager.currentAccount;
     NSDictionary *dict = @{@"sendId":sendId,@"openId":strMyId,@"hasRedPacket":hasRedPacket,@"serialNo":serialNo};
-    [self sendCustomMessage:CustomMessgeTypeRedPacketOpenMessage data:dict];
-
+    NIMMessage *message;
+    DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];
+    obj.custType = CustomMessgeTypeRedPacketOpenMessage;
+    obj.dataDict = dict;
+    message = [NIMMessageMaker msgWithCustomAttachment:obj];
+    NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
+    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]}};
+        NIMSession *redSession = [NIMSession session:sendId type:NIMSessionTypeP2P];
+        NIMCustomSystemNotification *notifi = [[NIMCustomSystemNotification alloc]initWithContent:@""];
+        notifi.sendToOnlineUsersOnly = NO;
+        NIMCustomSystemNotificationSetting *setting = [[NIMCustomSystemNotificationSetting alloc]init];
+        setting.shouldBeCounted = NO;
+        setting.apnsEnabled = NO;
+        notifi.setting = setting;
+        notifi.apnsPayload = dataDict;
+        [[NIMSDK sharedSDK].systemNotificationManager sendCustomNotification:notifi toSession:redSession completion:nil];//发送自定义通知
+    }
+    [[NIMSDK sharedSDK].conversationManager saveMessage:message forSession:_session completion:nil];
 }
 
 

ios/RNNeteaseIm/RNNeteaseIm/RNNotificationCenter.m

@@ -9,6 +9,7 @@
 #import "RNNotificationCenter.h"
 #import <AVFoundation/AVFoundation.h>
 #import "NSDictionary+NTESJson.h"
+#import "NIMMessageMaker.h"
 @interface RNNotificationCenter () <NIMSystemNotificationManagerDelegate,NIMChatManagerDelegate>
 @property (nonatomic,strong) AVAudioPlayer *player; //播放提示音
 @end
@@ -84,15 +85,39 @@ - (void)checkMessageAt:(NSArray *)messages
 
 #pragma mark - NIMSystemNotificationManagerDelegate
 - (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification{//接收自定义通知
-    
-    NSString *content = notification.content;
+//    NSString *content = notification.content;
     NSDictionary *notiDict = notification.apnsPayload;
     if (notiDict){
-        if ([[notiDict objectForKey:@"type"] integerValue]==1) {//加好友
-            
+        NSInteger notiType = [[notiDict objectForKey:@"type"] integerValue];
+        switch (notiType) {
+            case 1://加好友
+                
+                break;
+            case 2://拆红包消息
+            {
+                [self saveTheRedPacketOpenMsg:[notiDict objectForKey:@"data"]];
+            }
+                break;
+                
+            default:
+                break;
         }
     }
 }
-
+//保存拆红包消息到本地
+- (void)saveTheRedPacketOpenMsg:(NSDictionary *)dict{
+    NSDictionary *datatDict = [dict objectForKey:@"dict"];
+    NSTimeInterval timestamp = [[dict objectForKey:@"timestamp"] doubleValue];
+    NSString *sessionId = [dict objectForKey:@"sessionId"];
+    NSInteger sessionType = [[dict objectForKey:@"sessionType"] integerValue];
+    NIMSession *session = [NIMSession session:sessionId type:sessionType];
+    NIMMessage *message;
+    DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];
+    obj.custType = CustomMessgeTypeRedPacketOpenMessage;
+    obj.dataDict = datatDict;
+    message = [NIMMessageMaker msgWithCustomAttachment:obj];
+    message.timestamp = timestamp;
+    [[NIMSDK sharedSDK].conversationManager saveMessage:message forSession:session completion:nil];
+}
 
 @end