diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
index dec2ce4daf..1597ad1340 100644
--- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
@@ -157,9 +157,10 @@ abstract class BaseRichEditorActivity : BaseActivity() {
         fun onPaste() {
             val clipboard =
                     HaloApp.getInstance().application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            if (!TextUtils.isEmpty(clipboard.text.toString())) {
+            val clipText = clipboard.text.toString()
+            if (!TextUtils.isEmpty(clipText)) {
                 // 替换换行符号否则 插入失败
-                val text = clipboard.text.toString().replace("[\r\n]".toRegex(), "")
+                val text = clipText.replace("[  ]".toRegex(), "&nbsp;").replace("[\r\n]".toRegex(), "<br/>")
                 mBaseHandler.post { mRichEditor.insertHtml(text) }
             }
         }
diff --git a/app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java b/app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java
index 3ed14146bc..f983c14ba6 100644
--- a/app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java
+++ b/app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java
@@ -1,12 +1,12 @@
 package com.gh.gamecenter.db;
 
 import android.content.Context;
+import android.text.TextUtils;
 
 import com.gh.gamecenter.db.info.AskSearchHistoryInfo;
 import com.j256.ormlite.dao.CloseableIterator;
 import com.j256.ormlite.dao.Dao;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -20,15 +20,17 @@ public class AskSearchHistoryDao {
         try {
             helper = DatabaseHelper.getHelper(context);
             dao = helper.getDao(AskSearchHistoryInfo.class);
-        } catch (SQLException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     public void add(String key, String communityId) {
         try {
-            dao.createOrUpdate(createInfo(key, communityId));
-        } catch (SQLException e) {
+            if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(communityId)) {
+                dao.createOrUpdate(createInfo(key, communityId));
+            }
+        } catch (Exception e) {
 
             e.printStackTrace();
         }
@@ -41,9 +43,10 @@ public class AskSearchHistoryDao {
                     where().eq("communityId", communityId).
                     query();
             for (AskSearchHistoryInfo next : his) {
-                if (next.getKey().equals(key)) dao.delete(next);
+                String dbKey = next.getKey();
+                if (dbKey != null && dbKey.equals(key)) dao.delete(next);
             }
-        } catch (SQLException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -55,7 +58,7 @@ public class AskSearchHistoryDao {
         while (iterator.hasNext()) {
             try {
                 dao.delete(iterator.next());
-            } catch (SQLException e) {
+            } catch (Exception e) {
 
                 e.printStackTrace();
             }
@@ -75,7 +78,7 @@ public class AskSearchHistoryDao {
             while (hisIterator.hasNext()) {
                 history.add(hisIterator.next().getKey());
             }
-        } catch (SQLException e) {
+        } catch (Exception e) {
 
             e.printStackTrace();
         }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt
index b864d52e54..61c5de1ee9 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt
@@ -102,7 +102,6 @@ class AnswerEditActivity : BaseRichEditorActivity() {
 
     private var mProcessingDialog: WaitingDialogFragment? = null
     private var mUploadImageCancelDialog: Dialog? = null
-    private var postDialog: WaitingDialogFragment? = null
 
     private var mQuestionsTitle: String? = null
     private var mCommunityName: String? = null
@@ -308,14 +307,11 @@ class AnswerEditActivity : BaseRichEditorActivity() {
 
     private fun readyPost() {
         CheckLoginUtils.checkLogin(this, "回答编辑-提交") {
-            postDialog = WaitingDialogFragment.newInstance(getString(R.string.vote_post))
-            postDialog?.show(supportFragmentManager, null)
             val answerContent = getReplaceNetImageContent()
             // filter rule
             val answerLength = answerContent.length
             if (answerLength < MIN_ANSWER_TEXT_LENGTH) {
                 toast(R.string.answer_beneath_length_limit)
-                postDialog?.dismiss()
                 return@checkLogin
             } else if (answerLength > MAX_ANSWER_TEXT_LENGTH) {
                 DialogUtils.showAlertDialog(this,
@@ -326,7 +322,6 @@ class AnswerEditActivity : BaseRichEditorActivity() {
                         getString(R.string.answer_resume_edit), "", {
                     // do nothing
                 }, null)
-                postDialog?.dismiss()
                 return@checkLogin
             }
             Utils.log("answerEditHtml:$answerContent")
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt
index 7510ac935b..990688d08c 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt
@@ -23,6 +23,7 @@ class HotFragmentAdapter(context: Context, val list: List<CommunityHotSearch>)
     }
 
     override fun getItemCount(): Int {
+        if (list.size > 8) return 8 // 最多显示8个
         return list.size
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt
index 2e43b9f435..8ece3e528a 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt
@@ -127,7 +127,7 @@ class HottestAdapter(context: Context,
             is ColumnViewHolder -> {
                 val entity = mEntityList[position]
                 holder.binding.data = entity
-                holder.binding.columnSkip.setOnClickListener {
+                holder.itemView.setOnClickListener {
                     mContext.startActivity(CommunitySubjectActivity.getIntent(mContext,
                             UserManager.getInstance().community,
                             entity.id, mEntrance,
@@ -137,7 +137,7 @@ class HottestAdapter(context: Context,
             is SpecialColumnViewHolder -> {
                 val entity = mEntityList[position]
                 holder.binding.data = entity
-                holder.binding.specialColumnSkip.setOnClickListener {
+                holder.itemView.setOnClickListener {
                     mContext.startActivity(AskColumnDetailActivity.getIntentByColumnId(mContext,
                             entity.id,
                             UserManager.getInstance().community,
diff --git a/app/src/main/res/layout/community_search_hot_item.xml b/app/src/main/res/layout/community_search_hot_item.xml
index 7881897350..8b0189fd05 100644
--- a/app/src/main/res/layout/community_search_hot_item.xml
+++ b/app/src/main/res/layout/community_search_hot_item.xml
@@ -23,12 +23,12 @@
             android:layout_width = "wrap_content"
             android:layout_height = "wrap_content"
             android:layout_marginLeft = "15dp"
-            android:layout_marginTop="10dp"
-            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop = "10dp"
             android:text = "@{position + ``}"
             android:textColor = "@{position > 3? @color/text_3a3a3a : @color/tag_orange}"
             android:textSize = "12sp"
-            app:layout_constraintLeft_toLeftOf = "parent" />
+            app:layout_constraintLeft_toLeftOf = "parent"
+            app:layout_constraintTop_toTopOf = "parent" />
 
         <TextView
             android:id = "@+id/title"
@@ -37,24 +37,23 @@
             android:layout_marginLeft = "7dp"
             android:singleLine = "true"
             android:text = "@{data.title}"
-            app:layout_constraintTop_toTopOf="@id/position"
             android:textColor = "@{position > 3? @color/text_3a3a3a : @color/tag_orange}"
             android:textSize = "12sp"
-            app:layout_constraintLeft_toRightOf = "@id/position" />
+            app:layout_constraintLeft_toRightOf = "@id/position"
+            app:layout_constraintTop_toTopOf = "@id/position" />
 
         <TextView
             android:id = "@+id/desc"
             android:layout_width = "wrap_content"
             android:layout_height = "wrap_content"
-            android:layout_marginLeft = "10dp"
             android:layout_marginTop = "3dp"
+            android:layout_marginBottom = "5dp"
             android:singleLine = "true"
             android:text = "@{data.introduction}"
             android:textColor = "@color/hint"
             android:textSize = "10dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="5dp"
-            app:layout_constraintLeft_toRightOf = "@id/position"
+            app:layout_constraintBottom_toBottomOf = "parent"
+            app:layout_constraintLeft_toLeftOf = "@id/title"
             app:layout_constraintTop_toBottomOf = "@id/title" />
 
     </android.support.constraint.ConstraintLayout >
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f26eed4e9e..6db0b3d274 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -488,7 +488,7 @@
     <string name = "vote" >投票</string >
     <string name = "title_libao" >礼包中心</string >
     <string name = "invited" >已邀请</string >
-    <string name = "ask_search_hint" >搜索，提问</string >
+    <string name = "ask_search_hint" >搜你想搜的</string >
     <string name = "concern_questions" >关注问题</string >
     <string name = "menu_share" >分享</string >
     <string name = "menu_collect" >收藏</string >