diff --git a/xplan-ios/Main/IM/Tool/CustomAttachmentDecoder.m b/xplan-ios/Main/IM/Tool/CustomAttachmentDecoder.m index 0b30b53d..2da32a2f 100644 --- a/xplan-ios/Main/IM/Tool/CustomAttachmentDecoder.m +++ b/xplan-ios/Main/IM/Tool/CustomAttachmentDecoder.m @@ -21,7 +21,7 @@ int second = [dict[@"second"] intValue]; NSDictionary *data = dict[@"data"]; if ([data isKindOfClass:[NSString class]]) { - data = [(NSString *)data model2dictionary]; + data = [self dictionaryWithJsonString:(NSString *)data]; } if ([data isKindOfClass:[NSDictionary class]]) { AttachmentModel *attachment = [[AttachmentModel alloc]init]; @@ -36,4 +36,35 @@ return attachment; } +//json格式字符串转字典: +- (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString { + + if (jsonString == nil) { + + return nil; + + } + + NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; + + NSError *err; + + NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData + + options:NSJSONReadingMutableContainers + + error:&err]; + + if(err) { + + NSLog(@"json解析失败:%@",err); + + return nil; + + } + + return dic; + +} + @end diff --git a/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageFilter.m b/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageFilter.m index c0293c52..5592adee 100644 --- a/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageFilter.m +++ b/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageFilter.m @@ -88,6 +88,10 @@ [NSSet setWithObjects: @(Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room), nil], + @(CustomMessageType_Tarot): + [NSSet setWithObjects: + @(Custom_Message_Sub_Tarot), + nil], @(CustomMessageType_Room_PK): [NSSet setWithObjects: @(Custom_Message_Sub_Room_PK_Manager_Up_Mic), diff --git a/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m b/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m index 6f5f4f7b..3a462cba 100644 --- a/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ b/xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m @@ -964,9 +964,9 @@ NSString *text = [NSString stringWithFormat:@" %@", attachment.data[@"drawMsgText"]]; [attribute appendAttributedString:[self createTextAttribute:text color:[ThemeColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; if ([attachment.data[@"drawGoldNum"] intValue] > 1) { - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%d",[attachment.data[@"drawGoldNum"] intValue]] color:[ThemeColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; + [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%d",[attachment.data[@"drawGoldNum"] intValue]] color:[ThemeColor messageNickColor] font:kRoomMessageDefalutFont]]; } - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@ ", attachment.data[@"chargeProdName"]] color:[ThemeColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; + [attribute appendAttributedString:[self createTextAttribute:@"钻石" color:[ThemeColor messageNickColor] font:kRoomMessageDefalutFont]]; } messageInfo.content = attribute; return messageInfo;