From 224092b30a6b6da78994d058cf52f3e98459dfbd Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Thu, 29 Mar 2018 18:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=98=E5=8A=A8=E4=BF=AE=E6=94=B9=E5=9B=9E=E7=AD=94?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/CommentUtils.java | 6 +++--- .../java/com/gh/gamecenter/CommentDetailActivity.java | 3 ++- .../java/com/gh/gamecenter/ask/AnswerCommentAdapter.java | 9 +++++---- .../com/gh/gamecenter/ask/AnswerCommentFragment.java | 3 +++ .../java/com/gh/gamecenter/ask/AnswerDetailFragment.java | 2 +- .../com/gh/gamecenter/ask/entity/AnswerDetailEntity.kt | 5 +++++ .../main/java/com/gh/gamecenter/ask/entity/Questions.kt | 5 ----- .../ask/viewmodel/AnswerCommentConversationFragment.java | 4 ++-- .../main/java/com/gh/gamecenter/entity/CommentEntity.kt | 3 +++ .../java/com/gh/gamecenter/entity/CommentParentEntity.kt | 6 ++++++ 10 files changed, 30 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index d077dc59c6..b84bde8064 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -152,7 +152,7 @@ public class CommentUtils { } public static void showAnswerCommentOptions(final CommentEntity commentEntity, final Context context, - final OnCommentCallBackListener listener, final String id, boolean showConversation) { + final OnCommentCallBackListener listener, final String id, boolean showConversation, String answerId) { final Dialog dialog = new Dialog(context); @@ -170,7 +170,7 @@ public class CommentUtils { dialogType.add("复制"); dialogType.add("举报"); - if (commentEntity.getParent() != null && showConversation) { + if (commentEntity.getParentUser() != null && showConversation) { dialogType.add("查看对话"); } @@ -209,7 +209,7 @@ public class CommentUtils { break; case "查看对话": - context.startActivity(CommentDetailActivity.getAnswerCommentIntent(context, commentEntity.getId())); + context.startActivity(CommentDetailActivity.getAnswerCommentIntent(context, commentEntity.getId(), answerId)); break; } }); diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index 4712021d23..54ad5642aa 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -23,9 +23,10 @@ public class CommentDetailActivity extends NormalActivity { return getIntent(context, CommentDetailFragment.class, args); } - public static Intent getAnswerCommentIntent(Context context, String commentId) { + public static Intent getAnswerCommentIntent(Context context, String commentId, String answerId) { Bundle args = new Bundle(); args.putString(EntranceUtils.KEY_COMMENTID, commentId); + args.putString(EntranceUtils.KEY_ANSWER_ID, answerId); // return new IntentFactory.Builder(context) // .setActivity(CommentDetailActivity.class) // .setFragment(CommentDetailFragment.class).setArgs(args).build(); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentAdapter.java index 5017e0c07e..904c551b37 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentAdapter.java @@ -2,6 +2,7 @@ package com.gh.gamecenter.ask; import android.content.Context; import android.support.v7.widget.RecyclerView; +import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -73,17 +74,17 @@ public class AnswerCommentAdapter extends ListAdapter { holder.commentContentTv.setText(commentEntity.getContent()); - if (commentEntity.getParent() != null && commentEntity.getParent().getUser() != null) { + if (commentEntity.getParentUser() != null && !TextUtils.isEmpty(commentEntity.getParentUser().getName())) { holder.quoteContainer.setVisibility(View.VISIBLE); - holder.quoteAuthorTv.setText(commentEntity.getParent().getUser().getName()); - holder.quoteContentTv.setText("孙一峰，星際爭霸與星際爭霸2的職業選手，電競戰隊Xteam的經理，美少女团体星際老男孩成員之一，還在杭州經營水產生意。"); + holder.quoteAuthorTv.setText(commentEntity.getParentUser().getName()); + holder.quoteContentTv.setText(commentEntity.getParentUser().getComment()); } else { holder.quoteContainer.setVisibility(View.GONE); } holder.commentLikeIv.setOnClickListener(v -> CommentUtils.postVoteToAnswerComment(mContext, mAnswerId, commentEntity, holder.commentLikeCountTv, holder.commentLikeIv, null)); - holder.itemView.setOnClickListener(v -> CommentUtils.showAnswerCommentOptions(commentEntity, mContext, mOnCommentCallBackListener, null, !mIsShowingConversation)); + holder.itemView.setOnClickListener(v -> CommentUtils.showAnswerCommentOptions(commentEntity, mContext, mOnCommentCallBackListener, null, !mIsShowingConversation, mAnswerId)); } private void initFooterViewHolder(FooterViewHolder holder) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java index ac9e6099c5..b2ff63d515 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java @@ -42,6 +42,9 @@ public class AnswerCommentFragment extends ListFragment