|
@@ -67,7 +67,7 @@
|
|
|
SLSocketMessage *msgModel = [SLSocketMessage mj_objectWithKeyValues:[resultDic objectForKey:@"Data"]];
|
|
|
if ([self.friendModel.userId isEqualToString:msgModel.AIId]) {
|
|
|
NSString *str = [self replaceHasPrefix:@"\n" str:msgModel.Message];
|
|
|
- MessageModel *model = [MessageModel initWithSendText:str isReceive:YES showMike:msgModel.ChatType showText:!msgModel.ChatType isMike:msgModel.ChatType];
|
|
|
+ MessageModel *model = [MessageModel initWithSendText:str isReceive:YES showMike:msgModel.MessageType showText:!msgModel.MessageType isMike:msgModel.MessageType];
|
|
|
[self.chatServiceView.messageView appendRequestMessage:model];
|
|
|
}else {
|
|
|
[[SLMessageManager SharedInstance] saveSocketChatMessageWith:resultDic];
|
|
@@ -159,8 +159,14 @@
|
|
|
addIdx = idx;
|
|
|
}
|
|
|
if (addIdx != 0 && idx > addIdx) {
|
|
|
- MessageModel *model = [MessageModel initWithSendText:obj.message isReceive:obj.interactMode showMike:NO showText:YES isMike:NO];
|
|
|
- [marr addObject:model];
|
|
|
+ if (obj.interactMode) {
|
|
|
+ MessageModel *model = [MessageModel initWithSendText:obj.message isReceive:obj.interactMode showMike:NO showText:YES isMike:NO];
|
|
|
+ [marr addObject:model];
|
|
|
+ }else {
|
|
|
+ MessageModel *model = [MessageModel initWithSendText:obj.message isReceive:obj.interactMode showMike:obj.messageType showText:!obj.messageType isMike:obj.messageType];
|
|
|
+ [marr addObject:model];
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}];
|
|
|
if (marr.count != chatModels.count) {
|