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 e734ff9aca..85933b2fe7 100644
--- a/app/src/main/java/com/gh/common/util/CommentUtils.java
+++ b/app/src/main/java/com/gh/common/util/CommentUtils.java
@@ -269,135 +269,6 @@ public class CommentUtils {
 
     }
 
-//    public static void showAnswerCommentOptions(final CommentEntity commentEntity, final Context context,
-//                                                final OnCommentCallBackListener listener, final String id,
-//                                                boolean showConversation, String answerId, String articleId, String articleCommunityId) {
-//
-//        final Dialog dialog = new Dialog(context);
-//
-//        LinearLayout container = new LinearLayout(context);
-//        container.setOrientation(LinearLayout.VERTICAL);
-//        container.setBackgroundColor(Color.WHITE);
-//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-//
-//        List<String> dialogType = new ArrayList<>();
-//
-//        if (commentEntity.getMe() == null || !commentEntity.getMe().isAnswerCommented()) {
-//            dialogType.add("回复");
-//        }
-//
-//        dialogType.add("复制");
-//        dialogType.add("举报");
-//
-//        if (commentEntity.getParentUser() != null && showConversation) {
-//            dialogType.add("查看对话");
-//        }
-//
-//        for (String s : dialogType) {
-//            final TextView reportTv = new TextView(context);
-//            reportTv.setText(s);
-//            reportTv.setTextSize(17);
-//            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-//            reportTv.setBackgroundResource(R.drawable.textview_white_style);
-//            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-//            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-//                    LinearLayout.LayoutParams.WRAP_CONTENT));
-//            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-//                    0, DisplayUtils.dip2px(context, 12));
-//            container.addView(reportTv);
-//
-//            reportTv.setOnClickListener(v -> {
-//                dialog.cancel();
-//                switch (reportTv.getText().toString()) {
-//                    case "回复":
-//                        CheckLoginUtils.checkLogin(context, () -> {
-//                            if (listener != null) {
-//                                listener.onCommentCallback(commentEntity);
-//                            } else if (!TextUtils.isEmpty(id)) {
-//                                context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, id));
-//                            } else {
-//                                Utils.toast(context, "缺少关键属性");
-//                            }
-//                        });
-//                        break;
-//                    case "复制":
-//                        copyText(commentEntity.getContent(), context);
-//                        break;
-//                    case "举报":
-//                        CheckLoginUtils.checkLogin(context, () -> showAnswerReportDialog(answerId, commentEntity, context));
-//                        break;
-//                    case "查看对话":
-//                        if (TextUtils.isEmpty(articleId)) {
-//                            context.startActivity(CommentDetailActivity.getAnswerCommentIntent(context, commentEntity.getId(), answerId, null));
-//                        } else {
-//                            context.startActivity(CommentDetailActivity.getCommunityArticleCommentIntent(context, articleId, commentEntity.getId(), articleCommunityId, null));
-//                        }
-//                        break;
-//                }
-//            });
-//        }
-//
-//        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-//        dialog.setContentView(container);
-//        dialog.show();
-//    }
-
-//    private static void showAnswerReportDialog(final String answerId, final CommentEntity commentEntity, final Context context) {
-//        final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
-//                "违法有害信息", "其它"};
-//        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-//
-//        final Dialog reportTypeDialog = new Dialog(context);
-//        LinearLayout container = new LinearLayout(context);
-//        container.setOrientation(LinearLayout.VERTICAL);
-//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-//        container.setBackgroundColor(Color.WHITE);
-//
-//        for (final String s : arrReportType) {
-//            TextView reportTypeTv = new TextView(context);
-//            reportTypeTv.setText(s);
-//            reportTypeTv.setTextSize(17);
-//            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-//            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
-//            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-//                    LinearLayout.LayoutParams.WRAP_CONTENT));
-//            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-//                    0, DisplayUtils.dip2px(context, 12));
-//            container.addView(reportTypeTv);
-//
-//            reportTypeTv.setOnClickListener(v -> {
-//                JSONObject jsonObject = new JSONObject();
-//                try {
-//                    jsonObject.put("reason", s);
-//                } catch (JSONException e) {
-//                    e.printStackTrace();
-//                }
-//
-//                PostCommentUtils.postAnswerReportData(context, commentEntity.getId(), answerId, jsonObject.toString(),
-//                        new PostCommentUtils.PostCommentListener() {
-//                            @Override
-//                            public void postSuccess(JSONObject response) {
-//                                Utils.toast(context, "感谢您的举报");
-//                            }
-//
-//                            @Override
-//                            public void postFailed(Throwable error) {
-//                                if (error != null) {
-//                                    Utils.toast(context, "举报失败" + error.getMessage());
-//                                } else {
-//                                    Utils.toast(context, "举报失败，请稍候重试");
-//                                }
-//                            }
-//                        });
-//                reportTypeDialog.cancel();
-//            });
-//        }
-//
-//        reportTypeDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-//        reportTypeDialog.setContentView(container);
-//        reportTypeDialog.show();
-//    }
-
     private static void showReportTypeDialog(final CommentEntity commentEntity, final Context context) {
         final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
                 "违法有害信息", "其它"};
diff --git a/app/src/main/java/com/gh/common/util/Extensions.kt b/app/src/main/java/com/gh/common/util/Extensions.kt
index 73f4b49ae3..b7ad859b1b 100644
--- a/app/src/main/java/com/gh/common/util/Extensions.kt
+++ b/app/src/main/java/com/gh/common/util/Extensions.kt
@@ -5,6 +5,8 @@ import android.content.Context
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentActivity
 import android.support.v4.view.ViewPager
+import android.text.Html
+import android.text.Spanned
 import android.view.View
 import com.google.gson.reflect.TypeToken
 
@@ -106,4 +108,8 @@ fun debounceActionWithInterval(id: Int, interval: Long = 300, action: (() -> Uni
 
 fun View.debounceActionWithInterval(interval: Long = 300, action: (() -> Unit)? = null) {
     debounceActionWithInterval(this.id, interval, action)
+}
+
+fun String.fromHtml(): Spanned {
+    return Html.fromHtml(this)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt
index d78b91eb15..27d8fea594 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt
@@ -8,4 +8,8 @@ class RatingReplyEntity(@SerializedName("_id")
                         val time: Long,
                         val me: MeEntity,
                         val user: UserEntity,
-                        val vote: Int)
\ No newline at end of file
+                        val vote: Int,
+                        val parent: Parent?) {
+
+    class Parent(val user: UserEntity)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
index 418d3b55b1..df9c7c3acf 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
@@ -5,29 +5,40 @@ import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.support.v4.content.ContextCompat
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import butterknife.OnClick
 import com.gh.base.BaseActivity
+import com.gh.base.fragment.WaitingDialogFragment
 import com.gh.common.util.EntranceUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.RatingComment
+import com.gh.gamecenter.entity.RatingReplyEntity
 import com.gh.gamecenter.mvvm.Status
+import com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity
+import com.lightgame.utils.Util_System_Keyboard
 import com.lightgame.utils.Utils
 import kotterknife.bindView
 
 class RatingReplyActivity : BaseActivity() {
 
     private val mRecyclerView by bindView<RecyclerView>(R.id.rating_reply_list)
-    private val mPostReplyButton by bindView<View>(R.id.answer_comment_send_btn)
+    private val mPostReplyButton by bindView<Button>(R.id.answer_comment_send_btn)
     private val mReplyContent by bindView<EditText>(R.id.answer_comment_et)
 
     private lateinit var mViewModel: RatingReplyViewModel
     private lateinit var mAdapter: RatingReplyAdapter
 
+    private var mProcessingDialog: WaitingDialogFragment? = null
+    private var mReadyReplyData: RatingReplyEntity? = null
+
     override fun getLayoutId(): Int {
         return R.layout.activity_rating_reply
     }
@@ -44,9 +55,26 @@ class RatingReplyActivity : BaseActivity() {
         mViewModel.resultLiveData.observe(this, Observer {
             if (it != null) mAdapter.submitList(it)
         })
+        mViewModel.processDialog.observe(this, Observer { it ->
+            if (it?.isShow!!) {
+                mProcessingDialog = WaitingDialogFragment.newInstance(it.msg, false)
+                mProcessingDialog?.show(supportFragmentManager, HistoryDetailActivity::class.java.simpleName)
+            } else {
+                mProcessingDialog?.dismiss()
+            }
+        })
 
         val layoutManager = LinearLayoutManager(this)
-        mAdapter = RatingReplyAdapter(this, mEntrance, mViewModel, game, comment)
+        mAdapter = RatingReplyAdapter(this, mEntrance, mViewModel, game, comment, replyCallback = {
+            if (it != null) {
+                mReplyContent.hint = "回复: " + it.user.name
+            } else {
+                mReplyContent.hint = "回复: " + comment.user.name
+            }
+            mReadyReplyData = it
+            mReplyContent.requestFocus()
+            Util_System_Keyboard.showSoftKeyboard(this, mReplyContent)
+        })
         mRecyclerView.layoutManager = layoutManager
         mRecyclerView.adapter = mAdapter
         mRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
@@ -61,6 +89,33 @@ class RatingReplyActivity : BaseActivity() {
                 }
             }
         })
+
+        mReplyContent.hint = "回复: " + comment.user.name
+        mPostReplyButton.isEnabled = false
+        mPostReplyButton.background = resources.getDrawable(R.drawable.button_gray_style)
+        mReplyContent.setOnFocusChangeListener { v, hasFocus ->
+            if (hasFocus) {
+                mReplyContent.setHintTextColor(ContextCompat.getColor(this, R.color.hint))
+            } else {
+                mReplyContent.setHintTextColor(ContextCompat.getColor(this, R.color.theme))
+            }
+        }
+        mReplyContent.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+            override fun afterTextChanged(s: Editable?) {}
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                if (s.toString().trim().isNotEmpty()) {
+                    mPostReplyButton.isEnabled = true
+                    mPostReplyButton.background = resources.getDrawable(R.drawable.button_normal_style)
+                } else {
+                    mPostReplyButton.isEnabled = false
+                    mPostReplyButton.background = resources.getDrawable(R.drawable.button_gray_style)
+                }
+
+            }
+        })
     }
 
     @OnClick(R.id.answer_comment_send_btn)
@@ -68,9 +123,10 @@ class RatingReplyActivity : BaseActivity() {
         if (view.id == R.id.answer_comment_send_btn) {
             val replyContent = mReplyContent.text.toString()
             if (!replyContent.isEmpty()) {
-                mViewModel.replyComment(null, replyContent)
+                val replyId = if (mReadyReplyData != null) mReadyReplyData?.id else null
+                mViewModel.replyComment(replyId, replyContent)
             } else {
-                Utils.toast(this, "恢复内容不能为空")
+                Utils.toast(this, "回复内容不能为空")
             }
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
index 5179f5520d..ba44778b97 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.gh.base.BaseRecyclerViewHolder
 import com.gh.common.constant.ItemViewType
+import com.gh.common.util.fromHtml
 import com.gh.common.util.ifLogin
 import com.gh.gamecenter.R
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
@@ -25,7 +26,8 @@ class RatingReplyAdapter(context: Context,
                          val entrance: String,
                          val viewModel: RatingReplyViewModel,
                          val game: GameEntity,
-                         val comment: RatingComment) : BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
+                         val comment: RatingComment,
+                         val replyCallback: (RatingReplyEntity?) -> Unit) : BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
 
     var pageList = PagedList<RatingReplyEntity>()
 
@@ -93,12 +95,24 @@ class RatingReplyAdapter(context: Context,
                 holder.binding.line.visibility = View.GONE
                 holder.binding.content.setExpendMaxLines(Int.MAX_VALUE)
                 holder.setContent(comment, entrance, "评论详情")
+                holder.binding.comment.setOnClickListener {
+                    replyCallback.invoke(null)
+                }
             }
             is RatingReplyItemViewHolder -> {
                 val headCount = if (comment.reply > 0) 3 else 2
                 val replyEntity = pageList[position - headCount]
                 holder.binding.run {
                     data = replyEntity
+                    val parent = replyEntity.parent
+                    if (parent != null) {
+                        userName.text = mContext.getString(
+                                R.string.game_comment_reply_name,
+                                replyEntity.user.name,
+                                parent.user.name).fromHtml()
+                    } else {
+                        userName.text = replyEntity.user.name
+                    }
                     vote.setOnClickListener {
                         mContext.ifLogin("游戏详情-评分-评论详情-点赞评论") {
                             if (!vote.isChecked) {
@@ -111,6 +125,9 @@ class RatingReplyAdapter(context: Context,
                             }
                         }
                     }
+                    replyButton.setOnClickListener {
+                        replyCallback.invoke(replyEntity)
+                    }
                 }
             }
             is ListSectionItemViewHolder -> {
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt
index 19c78f9779..0e4879dcdb 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt
@@ -5,6 +5,7 @@ import android.arch.lifecycle.AndroidViewModel
 import android.arch.lifecycle.MediatorLiveData
 import android.arch.lifecycle.ViewModel
 import android.arch.lifecycle.ViewModelProvider
+import com.gh.base.fragment.WaitingDialogFragment
 import com.gh.gamecenter.baselist.PagedList
 import com.gh.gamecenter.entity.RatingReplyEntity
 import com.gh.gamecenter.mvvm.Status
@@ -28,6 +29,7 @@ class RatingReplyViewModel(application: Application,
                            private val commentId: String?) : AndroidViewModel(application) {
 
     var resultLiveData = MediatorLiveData<PagedList<RatingReplyEntity>>()
+    val processDialog = MediatorLiveData<WaitingDialogFragment.WaitingDialogData>()
 
     private val mApi = RetrofitManager.getInstance(getApplication()).api
     private var mDisposable: Disposable? = null
@@ -74,6 +76,8 @@ class RatingReplyViewModel(application: Application,
     }
 
     fun replyComment(replyId: String?, content: String) {
+        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("提交中...", true))
+
         val json = JSONObject()
         try {
             json.put("content", content)
@@ -94,11 +98,13 @@ class RatingReplyViewModel(application: Application,
                 .subscribe(object : Response<ResponseBody>() {
                     override fun onResponse(response: ResponseBody?) {
                         super.onResponse(response)
+                        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("提交中...", false))
                     }
 
                     override fun onFailure(e: HttpException?) {
                         super.onFailure(e)
                         Utils.toast(getApplication(), "提交评论回复失败!")
+                        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("提交中...", false))
                     }
                 })
     }
@@ -110,6 +116,7 @@ class RatingReplyViewModel(application: Application,
                 .subscribe(object : Response<ResponseBody>() {
                     override fun onResponse(response: ResponseBody?) {
                         callback.invoke()
+
                     }
 
                     override fun onFailure(e: HttpException?) {
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt
index a51766e6ea..6c4671d581 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt
@@ -90,6 +90,7 @@ class RatingViewModel(application: Application, val game: GameEntity) : ListView
     }
 
 
+    // todo 请求成功后是否需要更新列表数据
     fun voteComment(commentId: String, callback: () -> Unit) {
         mApi.voteGameComment(game.id, commentId)
                 .subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java
index e94423a064..fdc6700e74 100644
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@@ -110,7 +110,7 @@ public class HaloApp extends TinkerAppLike {
         ProcessLifecycleOwner.get().getLifecycle().addObserver(new ProcessorLifeCycleOwner());
 
         mChannel = ChannelReaderUtil.getChannel(getApplication());
-        if (TextUtils.isEmpty(mChannel)) {
+        if (mChannel == null || TextUtils.isEmpty(mChannel.trim())) {
             mChannel = "GH_TEST";
         }
 
diff --git a/app/src/main/res/layout/rating_reply_item.xml b/app/src/main/res/layout/rating_reply_item.xml
index f21b350111..76e6851352 100644
--- a/app/src/main/res/layout/rating_reply_item.xml
+++ b/app/src/main/res/layout/rating_reply_item.xml
@@ -58,14 +58,15 @@
 
             <TextView
                 android:id = "@+id/user_name"
-                android:layout_width = "wrap_content"
+                android:layout_width = "0dp"
                 android:layout_height = "wrap_content"
                 android:layout_marginLeft = "6dp"
-                android:text = "@{data.user.name}"
                 android:textColor = "@color/black"
                 android:textSize = "12sp"
+                android:layout_marginRight="15dp"
                 app:layout_constraintBottom_toBottomOf = "@id/user_icon_container"
                 app:layout_constraintLeft_toRightOf = "@id/user_icon_container"
+                app:layout_constraintRight_toLeftOf = "@+id/time"
                 app:layout_constraintTop_toTopOf = "@id/user_icon_container" />
 
             <TextView
@@ -95,7 +96,7 @@
                 tools:text = "每个评论的正文，最多显示4行，超过则使用省略号…全部，点击[全部]即可展开余下全文" />
 
             <TextView
-                android:id = "@+id/comment"
+                android:id = "@+id/reply_button"
                 android:layout_width = "wrap_content"
                 android:layout_height = "wrap_content"
                 android:layout_marginRight = "10dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c72dfe55ae..24362fd841 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -579,19 +579,20 @@
     <string name = "introduce_hint" >介绍下自己吧</string >
     <string name = "myself" >自己</string >
 
-    <string name = "suggestion_game_name">游戏名字<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>
-    <string name = "suggestion_platform_name">游戏平台<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>
-    <string name = "suggestion_function">功能需求<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>
-    <string name = "suggestion_contact">联系方式<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>
+    <string name = "suggestion_game_name" >游戏名字<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string >
+    <string name = "suggestion_platform_name" >游戏平台<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string >
+    <string name = "suggestion_function" >功能需求<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string >
+    <string name = "suggestion_contact" >联系方式<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string >
 
-    <string name = "article_edit_game_name">所属游戏<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>
+    <string name = "article_edit_game_name" >所属游戏<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string >
 
     <string name = "article_placeholder" >请撰写文章...</string >
 
-
     <string name = "share_community_article_url" >https://www.ghzs.com/communities/%1$s/articles/%2$s.html</string >
     <string name = "share_community_article_title" >%1$s发布了文章：%2$s （%3$d赞同）</string >
-    <string name = "ask_follow" >关注</string>
+    <string name = "ask_follow" >关注</string >
     <string name = "comment_hide_hint" >该内容已被删除</string >
 
+    <string name = "game_comment_reply_name" >%1$s<Data ><![CDATA[<font color="#9a9a9a"> 回复 </font>]]></Data >%2$s</string >
+
 </resources >