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

Author: xhp

NIM.js

@@ -156,9 +156,9 @@ export default class NIM{
      */
     static playLocacl(name,type){
         if(Platform.OS === 'ios'){
-            return RNNeteaseIm.playLocacl(name,type);
+            return RNNeteaseIm.playLocal(name,type);
         }
-        return RNNeteaseIm.playLocacl("assets://"+name,type);
+        return RNNeteaseIm.playLocal("assets://"+name,type);
     }
     /**
      * 停止播放录音

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -26,6 +26,7 @@ @interface ConversationViewController ()<NIMMediaManagerDelegate,NIMMediaManager
     NSMutableArray *_sessionArr;
 
 }
+@property (nonatomic,strong) AVAudioPlayer *player; //播放提示音
 
 @end
 
@@ -34,6 +35,7 @@ @implementation ConversationViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    
 }
 
 +(instancetype)initWithConversationViewController{
@@ -46,6 +48,15 @@ +(instancetype)initWithConversationViewController{
     return conVC;
 }
 
+- (instancetype)init {
+    self = [super init];
+    if(self) {
+        NSURL *url = [[NSBundle mainBundle] URLForResource:@"message" withExtension:@"wav"];
+        _player = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:nil];
+    }
+    return self;
+}
+
 -(void)startSession:(NSString *)sessionID withType:(NSString *)type{
     _sessionID = sessionID;
     _type = type;
@@ -509,8 +520,10 @@ - (void)onRecvMessages:(NSArray *)messages
                                                   completion:nil];
         //标记已读消息
         [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:_session];
+        [self.player stop];
+        [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error:nil];
+        [self.player play];
     }
-    
 }
 
 

ios/RNNeteaseIm/RNNeteaseIm/NIMModel.m

@@ -54,7 +54,9 @@ -(void)setNotiArr:(NSMutableArray *)notiArr{
         self.myBlock(5, notiArr);
 }
 -(void)setTeamArr:(NSMutableArray *)teamArr{
-    self.myBlock(4, teamArr);
+    if (teamArr.count) {
+        self.myBlock(4, teamArr);
+    }
 }
 //未读条数
 -(void)setUnreadCount:(NSInteger)unreadCount{

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.h

@@ -18,4 +18,5 @@ typedef void(^ERROR)(NSString *error);
 //获取最近聊天列表回调
 -(void)getRecentContactListsuccess:(SUCCESS)suc andError:(ERROR)err;
 -(void)addDelegate;
+- (void)getResouces;
 @end

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

@@ -38,6 +38,7 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
 }
+
 //监听网络
 #pragma mark - NIMLoginManagerDelegate
 - (void)onLogin:(NIMLoginStep)step{

ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m

@@ -219,20 +219,30 @@ - (dispatch_queue_t)methodQueue
 }
 //开启/关闭群组消息提醒
 RCT_EXPORT_METHOD(setTeamNotify:(nonnull NSString *)teamId needNotify:(nonnull NSString *)needNotify resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
+    __weak typeof(self)weakSelf = self;
     [[TeamViewController initWithTeamViewController]muteTeam:teamId mute:needNotify Succ:^(id param) {
         resolve(param);
+        [weakSelf updateMessageList];
     } Err:^(id erro) {
         reject(@"-1",erro,nil);
     }];
 }
 //好友消息提醒开关
 RCT_EXPORT_METHOD(setMessageNotify:(nonnull NSString *)contactId needNotify:(nonnull NSString *)needNotify resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
+    __weak typeof(self)weakSelf = self;
     [[ConversationViewController initWithConversationViewController]muteMessage:contactId mute:needNotify Succ:^(id param) {
         resolve(param);
+        [weakSelf updateMessageList];
     } Err:^(id erro) {
         reject(@"-1",erro,nil);
     }];
 }
+//刷新最近会话列表
+- (void)updateMessageList{
+    [[NIMViewController initWithController]getResouces];
+    NSLog(@"---updateMessageList");
+}
+
 //解散群
 RCT_EXPORT_METHOD(dismissTeam:(nonnull NSString *)teamId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
     [[TeamViewController initWithTeamViewController] dismissTeam:teamId Succ:^(id param) {
@@ -398,7 +408,7 @@ - (dispatch_queue_t)methodQueue
     [[ConversationViewController initWithConversationViewController]play:filepath];
 }
 //播放本地资源录音
-RCT_EXPORT_METHOD(playLocacl:(nonnull NSString *)name type:(nonnull NSString *)type){
+RCT_EXPORT_METHOD(playLocal:(nonnull NSString *)name type:(nonnull NSString *)type){
     NSString *path = [[NSBundle mainBundle] pathForResource:name ofType:type];
     [[ConversationViewController initWithConversationViewController]play:path];
 }
@@ -479,8 +489,7 @@ - (dispatch_queue_t)methodQueue
 
     NSString *allSize = [NSString stringWithFormat:@"%f",docSize+libSize+tmpNimSize+tmpPickSize];
     NSLog(@"allSize:%@   documentPath:%@",allSize,documentPath);
-    NSArray *events = @[allSize];
-    resolve(events);
+    resolve(allSize);
 }
 
 //清除数据缓存

ios/RNNeteaseIm/RNNeteaseIm/RNNotificationCenter.m

@@ -81,7 +81,8 @@ - (void)playMessageAudioTip
 
 - (void)checkMessageAt:(NSArray *)messages
 {
-   }
+   
+}
 
 #pragma mark - NIMSystemNotificationManagerDelegate
 - (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification{//接收自定义通知