Commit 8b9cd574da0a8fc5e4885614b0421630e22f9986

Authored by daojian
1 parent 275bdcb6

0.2.9 版本,解决群聊收到群系统消息,发生崩溃

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.2.8' 11 + s.version = '0.2.9'
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
@@ -1383,7 +1383,7 @@ @@ -1383,7 +1383,7 @@
1383 } 1383 }
1384 1384
1385 /**处理会话列表上没有此会话,但是用户进入了聊天界面*/ 1385 /**处理会话列表上没有此会话,但是用户进入了聊天界面*/
1386 - if (!updateSucc && _chattingConversation) { 1386 + if (!updateSucc && _chattingConversation && !isSystemMsg) {
1387 [_chattingConversation onReceiveNewMessage:imamsg]; 1387 [_chattingConversation onReceiveNewMessage:imamsg];
1388 } 1388 }
1389 1389
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
@@ -1153,8 +1153,7 @@ @@ -1153,8 +1153,7 @@
1153 1153
1154 - (CGSize)sizeInWidth:(CGFloat)width atMsg:(IMAMsg *)packMsg 1154 - (CGSize)sizeInWidth:(CGFloat)width atMsg:(IMAMsg *)packMsg
1155 { 1155 {
1156 - TIMGroupTipsElem *elem = (TIMGroupTipsElem *)self;  
1157 - CGSize size = [[elem tipText] textSizeIn:CGSizeMake(KScreenWidth-60, HUGE_VAL) font:UIFontCNMake(12)]; 1156 + CGSize size = [[self showDescriptionOf:packMsg] textSizeIn:CGSizeMake(KScreenWidth-60, HUGE_VAL) font:UIFontCNMake(12)];
1158 return size; 1157 return size;
1159 } 1158 }
1160 1159