diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
index 2bb22e299b..e6877c3dc3 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
@@ -101,8 +101,10 @@ class ForumArticleAskListFragment : ListFragment<AnswerEntity, ForumArticleAskLi
     override fun onLoadDone() {
         super.onLoadDone()
         AppExecutor.uiExecutor.executeWithDelay(Runnable {
-            scroll()
-            mScrollCalculatorHelper?.onScrollStateChanged(mListRv, RecyclerView.SCROLL_STATE_IDLE)
+            tryCatchInRelease {
+                scroll()
+                mScrollCalculatorHelper?.onScrollStateChanged(mListRv, RecyclerView.SCROLL_STATE_IDLE)
+            }
         }, 100)
     }
 
@@ -130,6 +132,8 @@ class ForumArticleAskListFragment : ListFragment<AnswerEntity, ForumArticleAskLi
             mAdapter.run {
                 entityList.add(0, entity)
                 notifyDataSetChanged()
+                mViewModel?.videoList?.add(0, entity.transformForumVideoEntity())
+                mListRv?.scrollToPosition(0)
             }
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt
index de270e6933..059d313a3c 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt
@@ -15,7 +15,7 @@ class ForumArticleAskListViewModel(application: Application, val bbsId: String =
 
     var sort: String = "time.reply"
     var videoSort: String = "recommend"
-    var videoList = listOf<ForumVideoEntity>()
+    var videoList = arrayListOf<ForumVideoEntity>()
 
     override fun provideDataObservable(page: Int): Observable<MutableList<AnswerEntity>> {
         return when (mPath) {
@@ -37,10 +37,10 @@ class ForumArticleAskListViewModel(application: Application, val bbsId: String =
     override fun mergeResultLiveData() {
         mResultLiveData.addSource(mListLiveData) { list ->
 
-            videoList = list.map {
+            videoList = ArrayList(list.map {
                 if (mPath == "视频") it.type = "video"
                 it.transformForumVideoEntity()
-            }
+            })
 
             mResultLiveData.postValue(list)
         }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt
index 8769eac174..958593ac24 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt
@@ -74,8 +74,8 @@ class ForumActivityAdapter(context: Context,
                         // 奖励发放中
                         currentTime > activityEntity.awardTime.start
                                 && currentTime < activityEntity.awardTime.end -> {
-                            status = "发放中"
-                            statusTv.text = "发放中"
+                            status = "奖励发放中"
+                            statusTv.text = "奖励发放中"
                             statusTv.setTextColor(R.color.theme_font.toColor())
                             statusTv.setBackgroundResource(R.drawable.bg_forum_activity_status_blue)
                             val startTime = TimeUtils.getFormatTime(activityEntity.awardTime.start, "yyyy.MM.dd")
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
index 4749abe6c2..3837b3b58b 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
@@ -174,10 +174,8 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B
         } else {
             if (entity.questions.answerCount > 0) {
                 commentCount.text = entity.questions.answerCount.toString()
-                commentCount.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(itemView.context, R.drawable.community_question_answer_count), null, null, null)
             } else {
                 commentCount.text = "我来回答"
-                commentCount.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(itemView.context, R.drawable.community_question_answer_edit), null, null, null)
             }
             voteCount.text = "邀请回答"
             voteIcon.setImageDrawable(ContextCompat.getDrawable(itemView.context, R.drawable.community_invite_follow))
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
index f43a47089d..86052ed44e 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
@@ -138,8 +138,10 @@ class ForumArticleListFragment : LazyListFragment<ArticleEntity, ForumArticleLis
         super.onLoadDone()
         if (CheckLoginUtils.isLogin()) mHaveLoadLoginData = true
         AppExecutor.uiExecutor.executeWithDelay(Runnable {
-            scroll()
-            mScrollCalculatorHelper?.onScrollStateChanged(mListRv, RecyclerView.SCROLL_STATE_IDLE)
+            tryCatchInRelease {
+                scroll()
+                mScrollCalculatorHelper?.onScrollStateChanged(mListRv, RecyclerView.SCROLL_STATE_IDLE)
+            }
         }, 100)
     }
 
@@ -189,6 +191,8 @@ class ForumArticleListFragment : LazyListFragment<ArticleEntity, ForumArticleLis
         mAdapter?.run {
             entityList.add(0, entity)
             notifyDataSetChanged()
+            mViewModel?.videoList?.add(0, entity.transformForumVideoEntity())
+            scrollToTop()
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt
index d0f000e752..59ec3ec124 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt
@@ -25,7 +25,7 @@ class ForumArticleListViewModel(application: Application) : ListViewModel<Articl
     var recordForums = arrayListOf<ForumEntity>()
     var recordStatusForums = arrayListOf<ForumUnreadEntity>()
     var sort: String = "time.comment"//排序 time.edit 最新发布 time.comment 最新回复
-    var videoList = listOf<ForumVideoEntity>()
+    var videoList = arrayListOf<ForumVideoEntity>()
 
     init {
         setOverLimitSize(0)
@@ -40,7 +40,7 @@ class ForumArticleListViewModel(application: Application) : ListViewModel<Articl
     override fun mergeResultLiveData() {
         mResultLiveData.addSource(mListLiveData) { list ->
 
-            videoList = list.map { it.transformForumVideoEntity() }
+            videoList = ArrayList(list.map { it.transformForumVideoEntity() })
 
             mResultLiveData.postValue(list)
         }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt
index caa4ea87a6..caeb6208cb 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt
@@ -217,6 +217,11 @@ class ForumFragment: LazyFragment() {
                 }
             }
 
+            val entityList = (hotForumRv.adapter as? HotForumsAdapter)?.list ?: return
+            val findEntity = entityList.find { it.id == forumFollowChange.forumEntity.id } ?: return
+            val index = entityList.indexOfFirst { it.id == forumFollowChange.forumEntity.id }
+            findEntity.me.isFollowForum = forumFollowChange.isFollow
+            hotForumRv.adapter?.notifyItemChanged(index)
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt
index a2c94e9b0d..0cb92e7185 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt
@@ -16,11 +16,11 @@ import org.greenrobot.eventbus.EventBus
 class HotForumsAdapter(context: Context,
                        private val entrance: String,
                        private val mViewModel: ForumViewModel?,
-                       private var mList: List<ForumEntity>)
+                       var list: List<ForumEntity>)
     : BaseRecyclerAdapter<HotForumsAdapter.HotForumViewHolder>(context) {
 
 
-    override fun getItemCount() = mList.size
+    override fun getItemCount() = list.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int)
             = HotForumViewHolder(DataBindingUtil.inflate(mLayoutInflater, R.layout.hot_forum_item, parent, false))
@@ -28,7 +28,7 @@ class HotForumsAdapter(context: Context,
 
     override fun onBindViewHolder(holder: HotForumViewHolder, position: Int) {
         holder.binding.run {
-            val forumEntity = mList[position]
+            val forumEntity = list[position]
             entity = forumEntity
             executePendingBindings()
 
diff --git a/app/src/main/res/layout/forum_activity_item.xml b/app/src/main/res/layout/forum_activity_item.xml
index a6ab5b468a..4908eceb5d 100644
--- a/app/src/main/res/layout/forum_activity_item.xml
+++ b/app/src/main/res/layout/forum_activity_item.xml
@@ -56,14 +56,16 @@
 
         <TextView
             android:id="@+id/statusTv"
-            android:layout_width="46dp"
+            android:layout_width="wrap_content"
             android:layout_height="14dp"
             android:layout_marginTop="8dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
             android:gravity="center"
             android:background="@drawable/bg_forum_activity_status_blue"
             android:textColor="@color/theme_font"
             android:textSize="10sp"
-            tools:text="进行中"
+            tools:text="奖励发放中"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/title" />