Commit a00658b49984cd1fb14e45508881a2fbebe6d21c
1 parent
7ece66af
0.6.8 过滤生活号,生活圈,订阅号
Showing
3 changed files
with
13 additions
and
3 deletions
CNLiveNewIMAManagerKit.podspec
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | 8 | ||
| 9 | Pod::Spec.new do |s| | 9 | Pod::Spec.new do |s| |
| 10 | s.name = 'CNLiveNewIMAManagerKit' | 10 | s.name = 'CNLiveNewIMAManagerKit' |
| 11 | - s.version = '0.6.7' | 11 | + s.version = '0.6.8' |
| 12 | s.summary = 'A short description of CNLiveNewIMAManagerKit.' | 12 | s.summary = 'A short description of CNLiveNewIMAManagerKit.' |
| 13 | 13 | ||
| 14 | #s.description = <<-DESC | 14 | #s.description = <<-DESC |
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
| @@ -1567,12 +1567,22 @@ | @@ -1567,12 +1567,22 @@ | ||
| 1567 | } | 1567 | } |
| 1568 | 1568 | ||
| 1569 | //新版首页会话列表上不显示新闻号,直播号 | 1569 | //新版首页会话列表上不显示新闻号,直播号 |
| 1570 | - if (NewHomePage && ([conv.getReceiver isEqualToString:CNWithNews]|| [conv.getReceiver isEqualToString:CNWithLive])) { | 1570 | + if (NewHomePage && ([conv.getReceiver isEqualToString:CNWithNews] |
| 1571 | + || [conv.getReceiver isEqualToString:CNWithLive] | ||
| 1572 | + || [conv.getReceiver isEqualToString:CNWithSubscri] | ||
| 1573 | + || [conv.getReceiver isEqualToString:CNFirendMomentUserId] | ||
| 1574 | + || [conv.getReceiver isEqualToString:CNDarenHaoUserId] | ||
| 1575 | + || [conv.getReceiver isEqualToString:CNLifeHaoUserId] | ||
| 1576 | + )) { | ||
| 1571 | NSLog(@"不需要显示在会话列表上"); | 1577 | NSLog(@"不需要显示在会话列表上"); |
| 1572 | [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_UpdateHomePageHeaderNotification object:[conv getReceiver]]; | 1578 | [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_UpdateHomePageHeaderNotification object:[conv getReceiver]]; |
| 1573 | isBreak = YES; | 1579 | isBreak = YES; |
| 1574 | return isBreak; | 1580 | return isBreak; |
| 1575 | } | 1581 | } |
| 1582 | + else | ||
| 1583 | + { | ||
| 1584 | + | ||
| 1585 | + } | ||
| 1576 | 1586 | ||
| 1577 | if ([[conv getReceiver] isEqualToString:CNWithSubscri] || [[conv getReceiver] isEqualToString:CNFirendMomentUserId] || [[conv getReceiver] isEqualToString:CNDarenHaoUserId]) | 1587 | if ([[conv getReceiver] isEqualToString:CNWithSubscri] || [[conv getReceiver] isEqualToString:CNFirendMomentUserId] || [[conv getReceiver] isEqualToString:CNDarenHaoUserId]) |
| 1578 | { | 1588 | { |
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
| @@ -1261,7 +1261,7 @@ | @@ -1261,7 +1261,7 @@ | ||
| 1261 | if (attSize.height < minH) { | 1261 | if (attSize.height < minH) { |
| 1262 | attSize.height = minH; | 1262 | attSize.height = minH; |
| 1263 | } | 1263 | } |
| 1264 | - attSize = CGSizeMake(attSize.width, attSize.height + 5); | 1264 | + attSize = CGSizeMake(attSize.width, attSize.height + 10); |
| 1265 | //设置内容的size | 1265 | //设置内容的size |
| 1266 | packMsg.showContentSizeInChat = attSize; | 1266 | packMsg.showContentSizeInChat = attSize; |
| 1267 | return attSize.height; | 1267 | return attSize.height; |