diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
index 54b36c6536..732cf21e32 100644
--- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java
+++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
@@ -46,6 +46,7 @@ import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
@@ -96,6 +97,19 @@ public class BindingAdapters {
         }
     }
 
+    // 如果超过10000，则转换为1.0W
+    @BindingAdapter("transSimpleCount")
+    public static void transSimpleCount(TextView view, int count) {
+        String s;
+        if (count > 10000) {
+            DecimalFormat df = new DecimalFormat("#.0W");
+            s = df.format(count / 10000f);
+        } else {
+            s = String.valueOf(count);
+        }
+        view.setText(s);
+    }
+
     @BindingAdapter({"addKaiFuView", "clickListener"})
     public static void addKaiFuView(LinearLayout view, List<KaiFuCalendarEntity> list, OnViewClickListener listener) {
         if (list == null) return;
diff --git a/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt b/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt
index 9a5c647b15..b0e8a3d8ab 100644
--- a/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt
@@ -24,9 +24,7 @@ class PersonalHomeActivity : ListActivity<PersonalHistoryEntity, PersonalHomeVie
     private var mUnreadViewModel: MessageUnreadViewModel? = null
 
     override fun provideListAdapter(): PersonalHomeAdapter {
-        if (mAdapter == null) mAdapter = PersonalHomeAdapter(this, mListViewModel, {
-            mUnreadViewModel?.markRead(MessageUnreadViewModel.ReadType.FANS)
-        })
+        if (mAdapter == null) mAdapter = PersonalHomeAdapter(this, mListViewModel)
         return mAdapter!!
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt
index 04340015e0..10e3047572 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt
@@ -4,7 +4,9 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import com.gh.gamecenter.R
+import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
 import com.gh.gamecenter.qa.entity.AnswerEntity
+import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity
 import com.gh.gamecenter.qa.recommends.AskQuestionsRecommendsViewHolder
 import com.lightgame.adapter.BaseRecyclerAdapter
 
@@ -21,7 +23,14 @@ class GameDetailAnswerAdapter(context: Context,
 
     override fun onBindViewHolder(holder: AskQuestionsRecommendsViewHolder, position: Int) {
         holder.mLine.visibility = View.VISIBLE
-        holder.initQuestionsHotViewHolder(mContext, mAnswerList[position])
+        val entity = mAnswerList[position]
+        holder.initQuestionsHotViewHolder(mContext, entity)
+        holder.mAskTitle.setOnClickListener {
+            mContext.startActivity(QuestionsDetailActivity.getIntent(mContext, entity.questions.id, "（游戏详情）"))
+        }
+        holder.itemView.setOnClickListener {
+            mContext.startActivity(AnswerDetailActivity.getIntent(mContext, entity.id, "（游戏详情）"))
+        }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java
index eb97694df6..d92d7ebb8c 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java
@@ -90,6 +90,12 @@ public class MessageUnreadViewModel extends AndroidViewModel {
         }
 
         if (isChange) {
+            // 重新统计总数
+            cacheUnreadData.setTotal(cacheUnreadData.getInvited() + cacheUnreadData.getAnswerVote() +
+                    cacheUnreadData.getCommentVote() + cacheUnreadData.getAnswerCommentVote() +
+                    cacheUnreadData.getService() + cacheUnreadData.getAnswer() + cacheUnreadData.getReply() +
+                    cacheUnreadData.getFollowQuestion() + cacheUnreadData.getReplyAnswerComment() + cacheUnreadData.getAnswerComment() +
+                    cacheUnreadData.getSystemInvited() + cacheUnreadData.getFans());
             liveData.postValue(cacheUnreadData);
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
index e911d66368..2db44e5c63 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
@@ -119,7 +119,7 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
     @BindView(R.id.personal_service_unread)
     TextView mServiceUnread;
     @BindView(R.id.personal_home_fans_hint)
-    View mFansHint;
+    TextView mFansHint;
 //    @BindView(R.id.personal_game_rv)
 //    RecyclerView mGameRv;
 
@@ -176,6 +176,7 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
                 , messageUnread -> {
                     if (messageUnread != null && messageUnread.getTotal() > 0) {
                         mFansHint.setVisibility(messageUnread.getFans() > 0 ? View.VISIBLE : View.GONE);
+                        mFansHint.setText(("新增了" + messageUnread.getFans() + "个粉丝"));
                         mLoginMessageHint.setVisibility(messageUnread.getTotal() - messageUnread.getFans() > 0 ?
                                 View.VISIBLE : View.GONE);
                         EventBus.getDefault().post(new EBReuse(MESSAGE_UNREAD_TAG));
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt
index b8890ed251..967718aba1 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt
@@ -13,6 +13,7 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.baselist.ListAdapter
 import com.gh.gamecenter.databinding.FollowersOrFansItemBinding
 import com.gh.gamecenter.entity.FollowersOrFansEntity
+import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.personalhome.FollowersOrFansViewHolder
 import com.gh.gamecenter.personalhome.FollowersOrFansViewModel
 
@@ -46,7 +47,11 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi
             val entity = mEntityList[position]
             holder.binding.entity = entity
             holder.binding.followerBtn.run {
-                if (entity?.me?.isFollower!!) {
+                if (entity.id == UserManager.getInstance().userId) {
+                    setText(R.string.myself)
+                    setTextColor(ContextCompat.getColor(mContext, R.color.button_gray))
+                    setBackgroundResource(R.drawable.button_border_gray)
+                } else if (entity?.me?.isFollower!!) {
                     setText(R.string.cancel_concern)
                     setTextColor(ContextCompat.getColor(mContext, R.color.theme))
                     setBackgroundResource(R.drawable.button_normal_border)
@@ -57,19 +62,21 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi
                 }
             }
             holder.binding.followerBtn.setOnClickListener {
-                mViewModel.followingCommand(true, callback = {
-                    holder.binding.followerBtn.run {
-                        if (it) { // 关注成功
-                            setText(R.string.cancel_concern)
-                            setBackgroundResource(R.drawable.button_normal_border)
-                            setTextColor(ContextCompat.getColor(mContext, R.color.theme))
-                        } else { // 取消关注成功
-                            setText(R.string.concern)
-                            setBackgroundResource(R.drawable.button_normal_style)
-                            setTextColor(Color.WHITE)
+                if (entity.id != UserManager.getInstance().userId) {
+                    mViewModel.followingCommand(!entity?.me?.isFollower!!, entity.id, callback = {
+                        holder.binding.followerBtn.run {
+                            if (it) { // 关注成功
+                                setText(R.string.cancel_concern)
+                                setBackgroundResource(R.drawable.button_normal_border)
+                                setTextColor(ContextCompat.getColor(mContext, R.color.theme))
+                            } else { // 取消关注成功
+                                setText(R.string.concern)
+                                setBackgroundResource(R.drawable.button_normal_style)
+                                setTextColor(Color.WHITE)
+                            }
                         }
-                    }
-                })
+                    })
+                }
             }
             holder.itemView.setOnClickListener {
                 PersonalHomeActivity.startTargetActivity(mContext, entity.id)
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt
index fa57224c8e..7b5d9067f7 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt
@@ -6,6 +6,7 @@ import com.gh.common.util.EntranceUtils
 import com.gh.gamecenter.baselist.ListFragment
 import com.gh.gamecenter.entity.FollowersOrFansEntity
 import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.message.MessageUnreadViewModel
 import com.gh.gamecenter.personalhome.FollowersOrFansViewModel
 import com.gh.gamecenter.personalhome.fans.FansActivity
 import com.gh.gamecenter.personalhome.fans.FollowersOrFansAdapter
@@ -17,6 +18,8 @@ class FollowersOrFansFragment : ListFragment<FollowersOrFansEntity, FollowersOrF
         const val PAGE_SOURCE = "PAGE_SOURCE"
     }
 
+    private var mUnreadViewModel: MessageUnreadViewModel? = null
+
     private var mAdapter: FollowersOrFansAdapter? = null
 
     override fun provideListAdapter(): FollowersOrFansAdapter {
@@ -34,6 +37,9 @@ class FollowersOrFansFragment : ListFragment<FollowersOrFansEntity, FollowersOrF
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val factory = MessageUnreadViewModel.Factory(HaloApp.getInstance().application)
+        mUnreadViewModel = ViewModelProviders.of(this, factory).get(MessageUnreadViewModel::class.java)
+
         if (mListViewModel.mPageSource == FansActivity::class.java.name) {
             if (mListViewModel.userId == UserManager.getInstance().userId) {
                 setNavigationTitle("我的的粉丝")
@@ -49,4 +55,11 @@ class FollowersOrFansFragment : ListFragment<FollowersOrFansEntity, FollowersOrF
         }
     }
 
+    override fun onLoadDone() {
+        super.onLoadDone()
+        if (mListViewModel.mPageSource == FansActivity::class.java.name) {
+            mUnreadViewModel?.markRead(MessageUnreadViewModel.ReadType.FANS)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt
index 6aa87fd4f7..9a610ee1f0 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt
@@ -17,7 +17,7 @@ import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
 import retrofit2.HttpException
 
-class FollowersOrFansViewModel(application: Application, 
+class FollowersOrFansViewModel(application: Application,
                                var mPageSource: String,
                                val userId: String) : ListViewModel<FollowersOrFansEntity, FollowersOrFansEntity>(application) {
 
@@ -33,11 +33,11 @@ class FollowersOrFansViewModel(application: Application,
         }
     }
 
-    fun followingCommand(isFollow: Boolean, callback: (isFollow: Boolean) -> Unit) {
+    fun followingCommand(isFollow: Boolean, targetUserId: String, callback: (isFollow: Boolean) -> Unit) {
         val observable = if (isFollow) {
-            RetrofitManager.getInstance(getApplication()).api.postFollowing(userId)
+            RetrofitManager.getInstance(getApplication()).api.postFollowing(targetUserId)
         } else {
-            RetrofitManager.getInstance(getApplication()).api.deleteFollowing(userId)
+            RetrofitManager.getInstance(getApplication()).api.deleteFollowing(targetUserId)
         }
         observable
                 .subscribeOn(Schedulers.io())
@@ -61,7 +61,7 @@ class FollowersOrFansViewModel(application: Application,
                 })
     }
 
-    class Factory(private val mApplication: Application, 
+    class Factory(private val mApplication: Application,
                   private val mPageSource: String,
                   private val mUserId: String) : ViewModelProvider.NewInstanceFactory() {
 
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt
index af1a48e8ce..4bfadcf3c8 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt
@@ -24,11 +24,11 @@ import com.gh.gamecenter.personalhome.fans.FollowersActivity
 import com.gh.gamecenter.personalhome.question.PersonalQuestionActivity
 import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
 import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity
+import com.lightgame.utils.Utils
 import java.util.*
 
 class PersonalHomeAdapter(context: Context,
-                          private val mListViewModel: PersonalHomeViewModel,
-                          private val unreadItemClick: () -> Unit) : ListAdapter<PersonalHistoryEntity>(context) {
+                          private val mListViewModel: PersonalHomeViewModel) : ListAdapter<PersonalHistoryEntity>(context) {
     private var mUnreadEntity: MessageUnreadEntity? = null
 
     var personalData: PersonalEntity? = null
@@ -102,7 +102,6 @@ class PersonalHomeAdapter(context: Context,
                         mContext.startActivity(FollowersActivity.getIntent(mContext, mListViewModel.userId))
                     }
                     userFansContainer.setOnClickListener {
-                        unreadItemClick.invoke()
                         mContext.startActivity(FansActivity.getIntent(mContext, mListViewModel.userId))
                     }
                     userQuestionText.setOnClickListener {
@@ -111,6 +110,9 @@ class PersonalHomeAdapter(context: Context,
                     userAnswerText.setOnClickListener {
                         mContext.startActivity(PersonalAnswerActivity.getIntent(mContext, mListViewModel.userId))
                     }
+                    userVoteContainer.setOnClickListener {
+                        Utils.toast(mContext, "共获得" + entity?.count?.answerVote + "赞同")
+                    }
                     userConcernOrEdit.setOnClickListener({
                         if (mListViewModel.userId == UserManager.getInstance().userId) {
                             mContext.startActivity(UserInfoActivity.getIntent(mContext))
@@ -161,8 +163,8 @@ class PersonalHomeAdapter(context: Context,
             "answer" -> personalData?.name + "回答了问题·" + NewsUtils.getFormattedTime(time)
             "question" -> personalData?.name + "提交了问题·" + NewsUtils.getFormattedTime(time)
             "answer_vote" -> personalData?.name + "关注了问题·" + NewsUtils.getFormattedTime(time)
-            "question_follow" -> personalData?.name + "关注了问题·" + NewsUtils.getFormattedTime(time)
-            else -> ""
+            "follow_question" -> personalData?.name + "关注了问题·" + NewsUtils.getFormattedTime(time)
+            else -> personalData?.name + ""
         }
     }
 
diff --git a/app/src/main/res/drawable-xxhdpi/personal_home_icon.png b/app/src/main/res/drawable-xxhdpi/personal_home_icon.png
new file mode 100644
index 0000000000..5dfd5c593c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/personal_home_icon.png differ
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index ebadafb3f8..200ff5f57f 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -189,7 +189,7 @@
                     android:layout_height = "18dp"
                     android:layout_centerVertical = "true"
                     android:layout_marginRight = "18dp"
-                    android:src = "@drawable/personal_ask_icon" />
+                    android:src = "@drawable/personal_home_icon" />
 
                 <TextView
                     android:layout_width = "wrap_content"
@@ -201,15 +201,19 @@
                     android:textSize = "15sp" />
 
                 <TextView
-                    android:id="@+id/personal_home_fans_hint"
+                    android:id = "@+id/personal_home_fans_hint"
                     android:layout_width = "wrap_content"
                     android:layout_height = "wrap_content"
                     android:layout_alignParentRight = "true"
                     android:layout_centerVertical = "true"
-                    android:text = "你有新的粉丝"
-                    android:visibility="gone"
-                    android:textColor = "@color/hint"
-                    android:textSize = "12sp" />
+                    android:background = "@drawable/setting_update_hint"
+                    android:paddingBottom = "2dp"
+                    android:paddingLeft = "8dp"
+                    android:paddingRight = "8dp"
+                    android:paddingTop = "2dp"
+                    android:textColor = "@android:color/white"
+                    android:textSize = "12sp"
+                    android:visibility = "gone" />
 
             </RelativeLayout >
 
diff --git a/app/src/main/res/layout/personal_home_top.xml b/app/src/main/res/layout/personal_home_top.xml
index 5a6effceb0..3f7b28d19c 100644
--- a/app/src/main/res/layout/personal_home_top.xml
+++ b/app/src/main/res/layout/personal_home_top.xml
@@ -121,10 +121,10 @@
 
                 <TextView
                     android:id = "@+id/user_follower_count"
+                    transSimpleCount = "@{entity.count.follower}"
                     android:layout_width = "wrap_content"
                     android:layout_height = "wrap_content"
                     android:layout_marginTop = "15dp"
-                    android:text = "@{entity.count.follower + ``}"
                     android:textColor = "@color/title"
                     android:textSize = "14sp" />
 
@@ -153,10 +153,10 @@
 
                 <TextView
                     android:id = "@+id/user_fans_count"
+                    transSimpleCount = "@{entity.count.fans}"
                     android:layout_width = "wrap_content"
                     android:layout_height = "wrap_content"
                     android:layout_marginTop = "15dp"
-                    android:text = "@{entity.count.fans + ``}"
                     android:textColor = "@color/title"
                     android:textSize = "14sp"
                     app:layout_constraintLeft_toLeftOf = "parent"
@@ -210,10 +210,10 @@
 
                 <TextView
                     android:id = "@+id/user_vote_count"
+                    transSimpleCount = "@{entity.count.answerVote}"
                     android:layout_width = "wrap_content"
                     android:layout_height = "wrap_content"
                     android:layout_marginTop = "15dp"
-                    android:text = "@{entity.count.answerVote + ``}"
                     android:textColor = "@color/title"
                     android:textSize = "14sp" />
 
@@ -250,11 +250,11 @@
 
         <TextView
             android:id = "@+id/user_question_count"
+            transSimpleCount = "@{entity.count.question}"
             android:layout_width = "wrap_content"
             android:layout_height = "45dp"
             android:layout_marginRight = "20dp"
             android:gravity = "center_vertical"
-            android:text = "@{entity.count.question + ``}"
             android:textSize = "13sp"
             app:layout_constraintRight_toRightOf = "parent"
             app:layout_constraintTop_toBottomOf = "@id/user_line"
@@ -282,11 +282,11 @@
 
         <TextView
             android:id = "@+id/user_answer_count"
+            transSimpleCount = "@{entity.count.answer}"
             android:layout_width = "wrap_content"
             android:layout_height = "45dp"
             android:layout_marginRight = "20dp"
             android:gravity = "center_vertical"
-            android:text = "@{entity.count.answer + ``}"
             android:textSize = "13sp"
             app:layout_constraintRight_toRightOf = "parent"
             app:layout_constraintTop_toBottomOf = "@id/user_question_text"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3fde0fff7..4895443136 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -569,5 +569,6 @@
     <string name = "personal_home" >个人主页</string >
     <string name = "userinfo_introduce" >个性签名</string >
     <string name = "introduce_hint" >介绍下自己吧..</string >
+    <string name = "myself" >自己</string >
 
 </resources >