From 93bbfda4229609eee5274554aec16dd55185cdf3 Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Fri, 26 Aug 2022 20:56:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E9=80=9A=E7=9F=A5view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xplan-ios/Main/IM/Model/AttachmentModel.h | 9 +++++++++ .../Content/MessageContentMonentsAutoView.m | 4 ++-- .../Main/Message/View/Session/MessageCell.m | 19 ++++++++++++++----- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/xplan-ios/Main/IM/Model/AttachmentModel.h b/xplan-ios/Main/IM/Model/AttachmentModel.h index 73fd8d05..f7d4e606 100644 --- a/xplan-ios/Main/IM/Model/AttachmentModel.h +++ b/xplan-ios/Main/IM/Model/AttachmentModel.h @@ -36,6 +36,8 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) { CustomMessageType_Update_RoomInfo = 20, ///应用内分享 CustomMessageType_Application_Share = 22, + ///系统通知，自定义布局消息（带确认、取消） + CustomMessageType_Message_Handle = 23, ///用户升级 CustomMessageType_User_UpGrade = 24, ///糖果树 @@ -195,6 +197,13 @@ typedef NS_ENUM(NSInteger, CustomMessageSubApplicationShare) { Custom_Message_Sub_Application_Share_Room = 221, }; + +///first = CustomMessageType_Applica +typedef NS_ENUM(NSInteger, CustomMessageSubMessageHandle) { + Custom_Message_Sub_Message_Handle_Content = 231, //文本 + Custom_Message_Sub_Message_Handle_Bussiness = 232, //业务 +}; + ///first = CustomMessageType_User_UpGrade typedef NS_ENUM(NSInteger, CustomMessageSubUserUpgrade) { ///用户等级 diff --git a/xplan-ios/Main/Message/View/Session/Content/MessageContentMonentsAutoView.m b/xplan-ios/Main/Message/View/Session/Content/MessageContentMonentsAutoView.m index cf33e84c..9f0d220b 100644 --- a/xplan-ios/Main/Message/View/Session/Content/MessageContentMonentsAutoView.m +++ b/xplan-ios/Main/Message/View/Session/Content/MessageContentMonentsAutoView.m @@ -23,7 +23,7 @@ @implementation MessageContentMonentsAutoView + (CGFloat)measureHeight:(NIMMessage *)message { - return (CONTENT_PADDING_V_TOTAL + 144); + return (CONTENT_PADDING_V_TOTAL + 120); } - (void)initSubViews { @@ -38,7 +38,7 @@ - (void)initSubViewConstraints { [super initSubViewConstraints]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(200, 144)); + make.size.mas_equalTo(CGSizeMake(250, 120)); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/xplan-ios/Main/Message/View/Session/MessageCell.m b/xplan-ios/Main/Message/View/Session/MessageCell.m index db683b75..cb1cfe24 100644 --- a/xplan-ios/Main/Message/View/Session/MessageCell.m +++ b/xplan-ios/Main/Message/View/Session/MessageCell.m @@ -260,9 +260,11 @@ return @"MessageContentRiskAlertView"; }else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Share) { return @"MessageContentMonentsView"; - }else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Approved) { + }else if(attachment.first == CustomMessageType_Monents && (attachment.second == Custom_Message_Sub_Monents_Approved | attachment.second == Custom_Message_Sub_Monents_Ban_Delete)) { return @"MessageContentMonentsAutoView"; - } else { + } else if(attachment.first == CustomMessageType_Message_Handle && attachment.second == Custom_Message_Sub_Message_Handle_Content) { + return @"MessageContentMonentsAutoView"; + }else { return @"MessageContentOpenLiveView"; } } else { @@ -305,7 +307,9 @@ return [MessageContentRiskAlertView measureHeight:message]; } else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Share) { return [MessageContentMonentsView measureHeight:message]; - } else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Approved) { + } else if(attachment.first == CustomMessageType_Monents && (attachment.second == Custom_Message_Sub_Monents_Approved | attachment.second == Custom_Message_Sub_Monents_Ban_Delete)) { + return [MessageContentMonentsAutoView measureHeight:message]; + }else if(attachment.first == CustomMessageType_Message_Handle && attachment.second == Custom_Message_Sub_Message_Handle_Content) { return [MessageContentMonentsAutoView measureHeight:message]; } else { return [MessageContentUnSupportView measureHeight:message]; @@ -372,12 +376,17 @@ return self.messageContent; } return [[MessageContentMonentsView alloc] init]; - }else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Approved) { + }else if(attachment.first == CustomMessageType_Monents && (attachment.second == Custom_Message_Sub_Monents_Approved | attachment.second == Custom_Message_Sub_Monents_Ban_Delete)) { if ([self.messageContent isKindOfClass:[MessageContentMonentsAutoView class]]) { return self.messageContent; } return [[MessageContentMonentsAutoView alloc] init]; - }else { + }else if(attachment.first == CustomMessageType_Message_Handle && attachment.second == Custom_Message_Sub_Message_Handle_Content) { + if ([self.messageContent isKindOfClass:[MessageContentMonentsAutoView class]]) { + return self.messageContent; + } + return [[MessageContentMonentsAutoView alloc] init]; + } else { if ([self.messageContent isKindOfClass:[MessageContentUnSupportView class]]) { return self.messageContent; }