0.7.5 版本

niudaojian
1 parent e8878d4a
Showing 4 changed files with 22 additions and 6 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.h
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
CNLiveNewIMAManagerKit/Classes/Playform/IMAPlatform+AppConfig.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.7.4'
+  s.version          = '0.7.5'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 #s.description      = <<-DESC
@@ -119,8 +119,9 @@ typedef void (^IMAConversationChangedCompletion)(IMAConversationChangedNotifyIte
 - (void)updateConversationWith:(IMAUser *)user;
 /// zx 异步获取当前最新的所有未读数(去除所有大号的未读数)
-/// @param complete 完成回调
-- (void)getExceptSysUnReadCount:(void(^)(NSInteger count))complete;
+/// @param complete  回调 count 是未读数,
+///                  groupNotPushUnreadCount 未群聊开启免打扰时,统计的群的未读消息数
+- (void)getExceptSysUnReadCount:(void(^)(NSInteger count, NSInteger groupNotPushUnreadCount))complete;
 /// 是否是自定义消息
 /// @param elem TIMElem
@@ -1707,10 +1707,16 @@
 {
 }
-- (void)getExceptSysUnReadCount:(void (^)(NSInteger))complete
+/// zx 异步获取当前最新的所有未读数(去除所有大号的未读数)
+/// @param complete 回调 count 是未读数,
+///                  groupNotPushUnreadCount 未群聊开启免打扰时,统计的群的未读消息数
+- (void)getExceptSysUnReadCount:(void (^)(NSInteger count, NSInteger groupNotPushUnreadCount))complete
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         __block NSInteger unReadCount = 0;
+        ///群聊如果设置了消息免打扰,记录下群聊免打扰未读数
+        __block NSInteger groupNotPushUnreadCount = 0;
+        
         NSArray *conversationArray = _conversationList.safeArray.copy;
         for (int i = 0; i < conversationArray.count; i ++) {
             IMAConversation *conv = [conversationArray objectAtIndex:i];
@@ -1740,6 +1746,10 @@
                            if ([conv.receiveMessageOpt isEqualToString:@"接收消息"]) {
                                 unReadCount += [conv unReadCount];
                             }
+                           else{
+                               groupNotPushUnreadCount += [conv unReadCount];
+                           }
+                                
                         }
                         else
                         {
@@ -1747,6 +1757,9 @@
                             if ([[group receiveMessageOpt] isEqualToString:@"接收消息"]) {
                                 unReadCount += [conv unReadCount];
                             }
+                            else{
+                                groupNotPushUnreadCount += [conv unReadCount];
+                            }
                         }
                     }
@@ -1762,7 +1775,7 @@
         }
         [IMAPlatform sharedInstance].conversationMgr.unReadMessageCount = unReadCount;
         if (complete) {
-            complete(unReadCount);
+            complete(unReadCount, groupNotPushUnreadCount);
         }
     });
@@ -25,7 +25,8 @@
     // 将相关的配置缓存至本地
     [[IMAPlatform sharedInstance] saveToLocal];
-    [[IMAPlatform sharedInstance].conversationMgr getExceptSysUnReadCount:^(NSInteger count) {
+    [[IMAPlatform sharedInstance].conversationMgr getExceptSysUnReadCount:^(NSInteger count, NSInteger groupNotPushUnreadCount) {
+        
         dispatch_async(dispatch_get_main_queue(), ^{
             NSUInteger unReadCount = count;
             if (unReadCount > 999) unReadCount = 999;
@@ -42,6 +43,7 @@
                     DebugLog(@"Fail: %d->%@", code, err);
                 }];
         });
+        
     }];
 }