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<CommentEntity> {
 
         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<CommentEntity, AnswerCom
     protected EditText mCommentDetailCommentEt;
     @BindView(R.id.answer_comment_send_btn)
     protected TextView mCommentSend;
+    @Nullable
+    @BindView(R.id.answer_comment_dialog_count_tv)
+    protected TextView mCommentCountTv;
 
     protected Dialog mSendingDialog;
 
diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java
index 8693ca19a5..5674bcbb13 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java
@@ -452,7 +452,7 @@ public class AnswerDetailFragment extends NormalFragment {
             mTime.setText(String.format("编辑于 %s", NewsUtils.getFormattedTime(mDetailEntity.getUpdateTime())));
         }
 
-        mAnswerCommentCountTv.setText(String.format("%d 评论", mDetailEntity.getQuestion().getCommentCount()));
+        mAnswerCommentCountTv.setText(String.format("%d 评论", mDetailEntity.getCommentCount()));
 
         mNoConn.setVisibility(View.GONE);
         mLoading.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/gh/gamecenter/ask/entity/AnswerDetailEntity.kt b/app/src/main/java/com/gh/gamecenter/ask/entity/AnswerDetailEntity.kt
index 22703e8994..8b6ab51473 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/entity/AnswerDetailEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/ask/entity/AnswerDetailEntity.kt
@@ -28,6 +28,9 @@ class AnswerDetailEntity() : Parcelable {
 
     var vote: Int = 0
 
+    @SerializedName("comment_count")
+    var commentCount:Int = 0
+
     constructor(parcel: Parcel) : this() {
         content = parcel.readString()
         time = parcel.readLong()
@@ -35,6 +38,7 @@ class AnswerDetailEntity() : Parcelable {
         me = parcel.readParcelable(MeEntity::class.java.classLoader)
         user = parcel.readParcelable(UserEntity::class.java.classLoader)
         vote = parcel.readInt()
+        commentCount = parcel.readInt()
     }
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
@@ -44,6 +48,7 @@ class AnswerDetailEntity() : Parcelable {
         parcel.writeParcelable(question, flags)
         parcel.writeParcelable(user, flags)
         parcel.writeInt(vote)
+        parcel.writeInt(commentCount)
     }
 
     override fun describeContents(): Int {
diff --git a/app/src/main/java/com/gh/gamecenter/ask/entity/Questions.kt b/app/src/main/java/com/gh/gamecenter/ask/entity/Questions.kt
index bd5c356cd7..02e20ff4d0 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/entity/Questions.kt
+++ b/app/src/main/java/com/gh/gamecenter/ask/entity/Questions.kt
@@ -20,15 +20,11 @@ class Questions() : Parcelable {
     @SerializedName("answer_count")
     var answerCount: Int = 0
 
-    @SerializedName("comment_count")
-    var commentCount:Int = 0
-
     constructor(parcel: Parcel) : this() {
         id = parcel.readString()
         title = parcel.readString()
         communityName = parcel.readString()
         answerCount = parcel.readInt()
-        commentCount = parcel.readInt()
     }
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
@@ -36,7 +32,6 @@ class Questions() : Parcelable {
         parcel.writeString(title)
         parcel.writeString(communityName)
         parcel.writeInt(answerCount)
-        parcel.writeInt(commentCount)
     }
 
     override fun describeContents(): Int {
diff --git a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentConversationFragment.java b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentConversationFragment.java
index 0fcb5aa328..28b33edc58 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentConversationFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentConversationFragment.java
@@ -24,9 +24,9 @@ public class AnswerCommentConversationFragment extends AnswerCommentFragment {
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
         mCommentId = getArguments().getString(EntranceUtils.KEY_COMMENTID);
+        mAnswerId = getArguments().getString(EntranceUtils.KEY_ANSWER_ID);
+        super.onCreate(savedInstanceState);
     }
 
     @SuppressLint("ClickableViewAccessibility")
diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt
index 06ff93e414..43b6f8e366 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt
@@ -16,6 +16,9 @@ class CommentEntity() : Parcelable {
 
     var parent: CommentParentEntity? = null
 
+    @SerializedName("parent_user")
+    var parentUser: CommentParentEntity? = null
+
     var content: String? = null
 
     var vote: Int = 0
diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt
index 0625e0296b..4426633962 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt
@@ -6,15 +6,21 @@ import android.os.Parcelable
 class CommentParentEntity() : Parcelable {
     var user: UserEntity? = null
     var content: String? = null
+    var name: String? = null
+    var comment: String? = null
 
     constructor(parcel: Parcel) : this() {
         user = parcel.readParcelable(UserEntity::class.java.classLoader)
         content = parcel.readString()
+        name = parcel.readString()
+        comment = parcel.readString()
     }
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeParcelable(user, flags)
         parcel.writeString(content)
+        parcel.writeString(name)
+        parcel.writeString(comment)
     }
 
     override fun describeContents(): Int {