diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
index 778225c3e8..f2e2a87064 100644
--- a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
@@ -3,10 +3,10 @@ package com.gh.gamecenter.baselist;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+
 import androidx.recyclerview.widget.DiffUtil;
 
 import com.lightgame.adapter.BaseRecyclerAdapter;
-import com.lightgame.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -103,8 +103,6 @@ public abstract class ListAdapter<DataType> extends BaseRecyclerAdapter {
     }
 
     public void loadChange(LoadStatus status) {
-
-        Utils.log("=====>>>" + status.name());
         switch (status) {
             case INIT_OVER:
             case LIST_OVER:
diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt
index b3fafb0375..3e03f43b51 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt
@@ -34,7 +34,6 @@ import com.lightgame.utils.Util_System_Keyboard
 import org.greenrobot.eventbus.EventBus
 
 
-// todo 大小输入框交换逻辑出错
 open class NewCommentFragment : ListFragment<CommentEntity, NewCommentViewModel>(), OnCommentCallBackListener, KeyboardHeightObserver {
 
     @Nullable
@@ -99,7 +98,14 @@ open class NewCommentFragment : ListFragment<CommentEntity, NewCommentViewModel>
                 apiResponse.data != null -> {
                     mSendingDialog?.dismiss()
                     toast("发表成功")
-                    commentEt.setText("")
+
+                    if (mCommentEntity != null) { // 补充默认草稿
+                        mCommentEntity = null // 清空当前评论实体
+                        commentEt.hint = getString(R.string.message_detail_comment_hint)
+                        commentEt.setText(mViewModel.getCommentDraft(mCommentEntity)?.draft ?: "")
+                    } else {
+                        commentEt.setText("")
+                    }
 
                     mCommentCount++
                     updateCommentCount()
@@ -163,6 +169,7 @@ open class NewCommentFragment : ListFragment<CommentEntity, NewCommentViewModel>
             if (mCommentListener != null) {
                 mCommentListener?.onCommentDraftChange(commentEt.text.toString())
             }
+            mViewModel.saveCommentDraft(mCommentEntity, commentEt.text.toString())
         }
         commentEt.filters = arrayOf(TextHelper.getFilter(140, "评论不能多于140字"))
         if (!mCommentDraft.isNullOrEmpty()) {
@@ -181,8 +188,6 @@ open class NewCommentFragment : ListFragment<CommentEntity, NewCommentViewModel>
             }, 200)
         } else {
             commentEt.clearFocus()
-            commentSendBtn.setBackgroundResource(R.drawable.comment_send_button_unavailable)
-            commentSendBtn.setTextColor(R.color.text_cccccc.toColor())
         }
 
         commentEt.setOnFocusChangeListener { _, hasFocus ->
@@ -228,8 +233,6 @@ open class NewCommentFragment : ListFragment<CommentEntity, NewCommentViewModel>
     override fun onDestroy() {
         super.onDestroy()
         mKeyboardHeightProvider?.close()
-
-        mViewModel.saveCommentDraft(mCommentEntity, commentEt.text.toString())
     }
 
     private fun updateCommentCount() {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt
index 96e79f536e..8596334729 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt
@@ -101,11 +101,11 @@ class NewCommentViewModel(application: Application,
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(object : Response<ResponseBody>() {
                     override fun onResponse(response: ResponseBody?) {
+                        deleteCommentDraft(commentEntity)
+
                         val apiResponse = ApiResponse<JSONObject>()
                         apiResponse.data = JSONObject()
                         mPostCommentLiveData.postValue(apiResponse)
-
-                        deleteCommentDraft(commentEntity)
                     }
 
                     override fun onFailure(e: HttpException?) {
diff --git a/app/src/main/res/layout/piece_comment_typing_container.xml b/app/src/main/res/layout/piece_comment_typing_container.xml
index aebe96e747..3911361745 100644
--- a/app/src/main/res/layout/piece_comment_typing_container.xml
+++ b/app/src/main/res/layout/piece_comment_typing_container.xml
@@ -20,20 +20,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/comment_line"
-        android:paddingTop="16dp"
-        android:paddingBottom="12dp"
+        android:background="@drawable/bg_shape_white_radius_10_top_only"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:background="@drawable/bg_shape_white_radius_10_top_only">
+        android:paddingTop="16dp"
+        android:paddingBottom="12dp">
 
         <ScrollView
             android:id="@+id/scrollView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_centerVertical="true"
             android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp">
+            android:layout_marginRight="20dp"
+            android:layout_weight="1">
 
             <EditText
                 android:id="@+id/answer_comment_et"
@@ -41,8 +41,8 @@
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
                 android:drawablePadding="4dp"
-                android:lineSpacingExtra="4dp"
                 android:hint="写评论"
+                android:lineSpacingExtra="4dp"
                 android:textColor="@color/text_333333"
                 android:textColorHint="@color/theme_font"
                 android:textCursorDrawable="@drawable/cursor_color"
@@ -56,9 +56,9 @@
             android:layout_height="28dp"
             android:layout_gravity="right"
             android:layout_marginRight="20dp"
-            android:background="@drawable/comment_send_button_available"
+            android:background="@drawable/comment_send_button_unavailable"
             android:text="发送"
-            android:textColor="@android:color/white"
+            android:textColor="@color/text_cccccc"
             android:textSize="14sp" />
 
     </LinearLayout>