diff --git a/xplan-ios/Main/Message/View/Session/MessageCell.m b/xplan-ios/Main/Message/View/Session/MessageCell.m index cb1cfe24..7e4dc4fe 100644 --- a/xplan-ios/Main/Message/View/Session/MessageCell.m +++ b/xplan-ios/Main/Message/View/Session/MessageCell.m @@ -273,10 +273,12 @@ } - (BOOL)messageShowAvatar:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Chat_Risk_Alert) { - return YES; + if (message.messageType == NIMMessageTypeCustom) { + NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; + AttachmentModel *attachment = (AttachmentModel *)obj.attachment; + if (attachment.first == CustomMessageType_Chat_Risk_Alert) { + return YES; + } } return NO; } diff --git a/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m b/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m index 256d1a45..8c6493a7 100644 --- a/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m +++ b/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m @@ -40,7 +40,7 @@ [Api monentsTopicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSArray * array = [MonentsTopicModel modelsWithArray:data.data[@"records"]]; [[self getView] monentsTopicListSuccess:array]; - }] uid:uid page:pageStr pageSize:pageSizeStr worldTypeId:@"0"]; + }] uid:uid page:pageStr pageSize:pageSizeStr worldTypeId:@"1"]; } /// 动态点赞 diff --git a/xplan-ios/Main/Monents/View/SubViews/XPMonentsContentView.m b/xplan-ios/Main/Monents/View/SubViews/XPMonentsContentView.m index 03f59766..6f5c0f98 100644 --- a/xplan-ios/Main/Monents/View/SubViews/XPMonentsContentView.m +++ b/xplan-ios/Main/Monents/View/SubViews/XPMonentsContentView.m @@ -81,8 +81,8 @@ #pragma mark - Event Response - (void)didClickFoldButton:(UIButton *)sender { - self.monentsInfo.isFold = sender.selected; sender.selected = !sender.selected; + self.monentsInfo.isFold = !sender.selected; if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsContentView:didClickFold:)]) { [self.delegate xPMonentsContentView:self didClickFold:self.monentsInfo]; } diff --git a/xplan-ios/Main/Monents/View/XPMonentsRecommendViewController.m b/xplan-ios/Main/Monents/View/XPMonentsRecommendViewController.m index f3c0e99e..3f5a25cb 100644 --- a/xplan-ios/Main/Monents/View/XPMonentsRecommendViewController.m +++ b/xplan-ios/Main/Monents/View/XPMonentsRecommendViewController.m @@ -91,7 +91,7 @@ - (void)headerRefresh { self.page = 1; [self.presenter getMonentsRecommendList:self.page pageSize:20 state:0]; - [self.presenter getMonentsTopicList:self.page pageSize:8]; + [self.presenter getMonentsTopicList:self.page pageSize:20]; } - (void)footerRefresh {