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

Author: xhp

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -530,7 +530,9 @@ - (void)onRecvRevokeMessageNotification:(NIMRevokeMessageNotification *)notifica
     setting.shouldBeCounted = NO;
     tipMessage.setting = setting;
     tipMessage.timestamp = notification.timestamp;
-    
+    NIMMessage *deleMess = notification.message;
+    NSDictionary *deleteDict = @{@"_id":deleMess.messageId};
+    [NIMModel initShareMD].deleteMessDict = deleteDict;
     // saveMessage 方法执行成功后会触发 onRecvMessages: 回调，但是这个回调上来的 NIMMessage 时间为服务器时间，和界面上的时间有一定出入，所以要提前先在界面上插入一个和被删消息的界面时间相符的 Tip, 当触发 onRecvMessages: 回调时，组件判断这条消息已经被插入过了，就会忽略掉。
     [[NIMSDK sharedSDK].conversationManager saveMessage:tipMessage
                                              forSession:notification.session
@@ -932,9 +934,9 @@ -(void)revokeMessage:(NSString *)messageId success:(Success)succe{
             NSString * tip = [self tipOnMessageRevoked:currentmessage];
             NIMMessage *tipMessage = [self msgWithTip:tip];
             tipMessage.timestamp = currentmessage.timestamp;
-            
             // saveMessage 方法执行成功后会触发 onRecvMessages: 回调，但是这个回调上来的 NIMMessage 时间为服务器时间，和界面上的时间有一定出入，所以要提前先在界面上插入一个和被删消息的界面时间相符的 Tip, 当触发 onRecvMessages: 回调时，组件判断这条消息已经被插入过了，就会忽略掉。
             [[NIMSDK sharedSDK].conversationManager saveMessage:tipMessage forSession:_session completion:nil];
+            
         }
     }];
 

ios/RNNeteaseIm/RNNeteaseIm/NIMModel.h

@@ -28,5 +28,6 @@ typedef void(^onSuccess)(NSInteger index,id param);
 @property(nonatomic,strong)NSString *receipt;
 @property(nonatomic,strong)NSMutableArray *bankList;
 @property(nonatomic,strong)NSDictionary *audioDic;
+@property (strong, nonatomic) NSDictionary *deleteMessDict;//撤销时删除的消息ID
 - (void)insertMessages:(NSArray *)messages;
 @end

ios/RNNeteaseIm/RNNeteaseIm/NIMModel.m

@@ -95,4 +95,9 @@ -(void)setAudioDic:(NSDictionary *)audioDic{
 
     self.myBlock(14, audioDic);
 }
+
+- (void)setDeleteMessDict:(NSDictionary *)deleteMessDict{
+    self.myBlock(15, deleteMessDict);
+}
+
 @end

ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m

@@ -510,6 +510,10 @@ -(void)setSendState{
                 //录音进度 分贝
                 [_bridge.eventDispatcher sendDeviceEventWithName:@"observeAudioRecord" body:param];
                 break;
+            case 15:
+                //删除撤销消息通知
+                [_bridge.eventDispatcher sendDeviceEventWithName:@"observeDeleteMessage" body:param];
+                break;
             default:
                 break;
         }