0.6.3 版本新版首页不显示新闻号，直播号，家园入口，音频播放

niudaojian
1 parent 651c8f1d
Showing 4 changed files with 64 additions and 30 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
CNLiveNewIMAManagerKit/Classes/PublicHeader/IMAConstant.h
CNLiveNewIMAManagerKit/Classes/TIMCategory/IMAConversation+ShowAPIs.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.6.1'
+  s.version          = '0.6.3'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 #s.description      = <<-DESC
@@ -122,8 +122,15 @@
             TIMConversation *conversation = (TIMConversation * )conversationId;
-            //如果是未知的 后台消息，直接 跳出循环ƒ
+            //判断后台创建的号,是否需要显示在会话列表上
             if ([conversation.getReceiver hasPrefix:@"sys"]) {
+                
+                //新版首页,新闻号,直播号 不需要显示在会话列表上
+                if (NewHomePage && ([conversation.getReceiver isEqualToString:CNWithNews]|| [conversation.getReceiver isEqualToString:CNWithLive])) {
+                    NSLog(@"不需要显示在会话列表上");
+                    continue;
+                }
+                
                 if ([conversation.getReceiver isEqualToString:CNLifeHaoUserId]
                     ||  [conversation.getReceiver isEqualToString:CNFirendMomentVideoUploadFinishUserId]
                     || [conversation.getReceiver isEqualToString:CNWithdrawMessage]
@@ -136,12 +143,13 @@
                     || [conversation.getReceiver isEqualToString:CNWithRepastVerify]
                     || [conversation.getReceiver isEqualToString:CNWithService])
                 {
-                    NSLog(@"已知后台消息");
+                    NSLog(@"需要显示在会话列表上");
                 }else{
-                    NSLog(@"未知后台消息不添加到会话列表");
+                    NSLog(@"不需要显示在会话列表上");
                     continue;
                 }
             }
+            
             if ([conversation.getReceiver hasPrefix:@"admin"]) continue;
             __block IMAConversation *conv = nil;
@@ -207,6 +215,10 @@
 //                [_conversationList insertObject:familyGroupConversation atIndex:0];
 //            }
+            if (NewHomePage) {
+                break;
+            }
+            
             /**创建家园会话并插入会话列表第一个位置*/
             CNCreateFamilyGroupConversation *familyGroupConversation = [[CNCreateFamilyGroupConversation alloc] init];
             [_conversationList insertObject:familyGroupConversation atIndex:0];
@@ -663,39 +675,52 @@
     switch (mp.platformType) {
         case IMPlatformTypeC:
         {
-            /**是否有创建亲情群入口，默认有，如果被删了，就不存在了*/
-            BOOL hasCreateFamily = YES;
-
-            NSString *deletedCreateFamily = [[NSUserDefaults standardUserDefaults] objectForKey:CNDeletedCreateFamily];
-            if ([deletedCreateFamily isEqualToString:@"1"]) {
-                //首页会话已经删除情亲群入口
-                hasCreateFamily = NO;
+            if (NewHomePage) {
+               
+                if (!mp.isConnected)
+                {
+                    //没联网
+                    return 1 + _toIndex;
+                }
+                
             }
-            
-            if (!mp.isConnected && self.isPlay)
+            else
             {
-                if (hasCreateFamily) {
-                    //没联网&听见中国在播放&有情亲群
-                    return 3 + _toIndex;
+                /**是否有创建亲情群入口，默认有，如果被删了，就不存在了*/
+                BOOL hasCreateFamily = YES;
+
+                NSString *deletedCreateFamily = [[NSUserDefaults standardUserDefaults] objectForKey:CNDeletedCreateFamily];
+                if ([deletedCreateFamily isEqualToString:@"1"]) {
+                    //首页会话已经删除情亲群入口
+                    hasCreateFamily = NO;
                 }
-                //没联网&听见中国在播放
-                return 2 + _toIndex;
-            }
-            if (!mp.isConnected || self.isPlay) {
-                if (hasCreateFamily) {
-                    //听见中国或者网络其中一个 & 有情亲群
+                if (!mp.isConnected && self.isPlay)
+                {
+                    if (hasCreateFamily) {
+                        //没联网&听见中国在播放&有情亲群
+                        return 3 + _toIndex;
+                    }
+                    //没联网&听见中国在播放
                     return 2 + _toIndex;
                 }
-                //听见中国或者网络其中一个
-                return 1 + _toIndex;
+                if (!mp.isConnected || self.isPlay) {
+                    
+                    if (hasCreateFamily) {
+                        //听见中国或者网络其中一个 & 有情亲群
+                        return 2 + _toIndex;
+                    }
+                    //听见中国或者网络其中一个
+                    return 1 + _toIndex;
+                    
+                }
+                if (hasCreateFamily) {
+                    //联网 & 有情亲群
+                    return 1 + _toIndex;
+                }
             }
-            if (hasCreateFamily) {
-                //联网 & 有情亲群
-                return 1 + _toIndex;
-            }
         }
             break;
         case IMPlatformTypeB:
@@ -1538,6 +1563,15 @@
             isBreak = YES;
             return isBreak;
         }
+        
+        //新版首页会话列表上不显示新闻号,直播号
+        if (NewHomePage && ([conv.getReceiver isEqualToString:CNWithNews]|| [conv.getReceiver isEqualToString:CNWithLive])) {
+            NSLog(@"不需要显示在会话列表上");
+            [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_UpdateHomePageHeaderNotification object:[conv getReceiver]];
+            isBreak = YES;
+            return isBreak;
+        }
+        
         if ([[conv getReceiver] isEqualToString:CNWithSubscri] || [[conv getReceiver] isEqualToString:CNFirendMomentUserId] || [[conv getReceiver] isEqualToString:CNDarenHaoUserId])
         {
             //订阅号 和 朋友圈 不添加到会话列表里
@@ -104,7 +104,7 @@ static NSString *const CNWithSubscri                  = @&quot;sys_subscribe&quot;;
 static NSString *const CNWithNews                     = @"sys_news";
 //直播号
 static NSString *const CNWithLive                     = @"sys_live";
-//轻松一刻
+//视频号
 static NSString *const CNWithVideo                    = @"sys_video";
 //服务号
 static NSString *const CNWithService                  = @"sys_service";
@@ -108,7 +108,7 @@
             }
             else if ([recerive isEqualToString:CNWithVideo])
             {
-                return @"轻松一刻";
+                return @"视频号";
             }
             else if ([recerive isEqualToString:CNWithRepastPay])
             {