From 821434bd7c8e65f90d4887ef2ae1008a62d4b71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Mon, 21 Oct 2019 21:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.7.0=20DE?= =?UTF-8?q?V=EF=BC=8820191021-0955=EF=BC=89=E5=89=8D=E7=AB=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=B1=87=E6=80=BB=EF=BC=885=EF=BC=8C10=EF=BC=89https:?= =?UTF-8?q?//gitlab.ghzs.com/pm/halo-app-issues/issues/673?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/MessageDetailAdapter.java | 6 +- .../qa/comment/NewCommentAdapter.kt | 64 +++++++++++-------- .../main/res/layout/fragment_game_upload.xml | 2 +- 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 846fe1875e..c09cd6425c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -357,7 +357,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { if (commentEntity == null) { return; } - + TextHelper.highlightTextThatIsWrappedInsideWrapperByDefault(holder.commentContentTv, commentEntity.getContent()); ArticleCommentParent parent = commentEntity.getParent(); if (parent != null && !TextUtils.isEmpty(parent.getUser().getName())) { @@ -407,6 +407,10 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { CommentUtils.showReportDialog(finalCommentEntity, mContext, true, mOnCommentCallBackListener, null, "资讯文章详情-评论详情")); + holder.commentContentTv.setOnClickListener(v -> + CommentUtils.showReportDialog(finalCommentEntity, + mContext, true, + mOnCommentCallBackListener, null, "资讯文章详情-评论详情")); holder.commentUserNameTv.setOnClickListener(v -> DirectUtils.directToHomeActivity(mContext, finalCommentEntity.getUser().getId(), mEntrance, "文章-评论详情")); holder.commentUserIconDv.setOnClickListener(v -> DirectUtils.directToHomeActivity(mContext, finalCommentEntity.getUser().getId(), mEntrance, "文章-评论详情")); diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt index 778fa9c166..fe445ef838 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt @@ -99,35 +99,11 @@ class NewCommentAdapter(context: Context, } holder.itemView.setOnClickListener { - when (mViewModel.commentType) { - CommentType.ANSWER, - CommentType.ANSWER_CONVERSATION -> { - CommentHelper.showAnswerCommentOptions(mContext, - commentEntity, - mIsShowingConversation, - mViewModel.answerId, - mCommentCallBackListener) - } + operatePop(commentEntity) + } - CommentType.COMMUNITY_ARTICLE, - CommentType.COMMUNITY_ARTICLE_CONVERSATION -> { - CommentHelper.showCommunityArticleCommentOptions(mContext, - commentEntity, - mIsShowingConversation, - mViewModel.articleId, - mViewModel.communityId, - mCommentCallBackListener) - } - - CommentType.VIDEO, - CommentType.VIDEO_CONVERSATION -> { - CommentHelper.showVideoCommentOptions(mContext, - commentEntity, - mIsShowingConversation, - mViewModel.videoId, - mCommentCallBackListener) - } - } + holder.commentContentTv.setOnClickListener { + operatePop(commentEntity) } val path = when (mViewModel.commentType) { CommentType.ANSWER, @@ -149,6 +125,38 @@ class NewCommentAdapter(context: Context, } } + private fun operatePop(commentEntity: CommentEntity) { + when (mViewModel.commentType) { + CommentType.ANSWER, + CommentType.ANSWER_CONVERSATION -> { + CommentHelper.showAnswerCommentOptions(mContext, + commentEntity, + mIsShowingConversation, + mViewModel.answerId, + mCommentCallBackListener) + } + + CommentType.COMMUNITY_ARTICLE, + CommentType.COMMUNITY_ARTICLE_CONVERSATION -> { + CommentHelper.showCommunityArticleCommentOptions(mContext, + commentEntity, + mIsShowingConversation, + mViewModel.articleId, + mViewModel.communityId, + mCommentCallBackListener) + } + + CommentType.VIDEO, + CommentType.VIDEO_CONVERSATION -> { + CommentHelper.showVideoCommentOptions(mContext, + commentEntity, + mIsShowingConversation, + mViewModel.videoId, + mCommentCallBackListener) + } + } + } + private fun initFooterViewHolder(holder: FooterViewHolder) { if (mIsNetworkError) { holder.loading.visibility = View.GONE diff --git a/app/src/main/res/layout/fragment_game_upload.xml b/app/src/main/res/layout/fragment_game_upload.xml index f63a058824..67f321a623 100644 --- a/app/src/main/res/layout/fragment_game_upload.xml +++ b/app/src/main/res/layout/fragment_game_upload.xml @@ -149,7 +149,7 @@ android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:layout_marginBottom="20dp" - android:layout_marginTop="120dp"/> + android:layout_marginTop="10dp"/>