diff --git a/app/src/main/java/com/gh/gamecenter/entity/AmwayCommentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/AmwayCommentEntity.kt
index cc2cab0e8c..63ae2c2eb8 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/AmwayCommentEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/AmwayCommentEntity.kt
@@ -18,7 +18,7 @@ data class AmwayCommentEntity(
             var id: String,
             var icon: String,
             var name: String,
-            @SerializedName(value="tag", alternate=["tag_style"])
+            @SerializedName(value="new_tag_style")
             var tag: List<TagStyleEntity>? = arrayListOf(),
             var star: Float) : Parcelable {
         fun toGameEntity() : GameEntity {
diff --git a/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt
index 3a500a5264..da43193c98 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt
@@ -70,7 +70,7 @@ data class PersonalHistoryEntity(
             val nameSuffix: String = "",
 
             val icon: String = "",
-            @SerializedName(value = "tag", alternate = ["tag_style"])
+            @SerializedName(value = "new_tag_style")
             val tag: ArrayList<TagStyleEntity> = ArrayList(),
             val star: Float = 0F,
             @SerializedName("libao_exists")
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt
index b13775c6ec..c0482b893e 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt
@@ -17,7 +17,9 @@ import com.gh.gamecenter.personalhome.rating.MyRating
 import kotlinx.android.synthetic.main.item_my_game_rating.view.*
 import java.util.regex.Pattern
 
-class MyRatingAdapter(context: Context) : ListAdapter<MyRating>(context) {
+class MyRatingAdapter(context: Context,
+                      val mEntrance: String,
+                      val mListViewModel: MyRatingViewModel) : ListAdapter<MyRating>(context) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val view: View
@@ -48,10 +50,32 @@ class MyRatingAdapter(context: Context) : ListAdapter<MyRating>(context) {
                 } else {
                     holder.itemView.tv_comment.setTextWithHighlightedTextWrappedInsideWrapper(text = rating.content, copyClickedText = true)
                 }
-                GameViewUtils.setLabelList(mContext, holder.itemView.label_list, "type", rating.game.tag as List<TagStyleEntity>)
+                GameViewUtils.setLabelList(mContext, holder.itemView.label_list, rating.game.tag as List<TagStyleEntity>)
                 holder.itemView.label_list.goneIf(holder.itemView.label_list.childCount == 0)
                 holder.itemView.gamedetail_iv_libao.goneIf(!rating.game.isLibaoExists)
 
+                holder.binding.vote.setOnClickListener {
+                    mContext.ifLogin(mEntrance) {
+                        if (!holder.binding.vote.isChecked) {
+                            mListViewModel.voteComment(rating.game.id, rating.id, callback = {
+                                val count = rating.vote + 1
+                                holder.binding.vote.text = count.toString()
+                                holder.binding.vote.isChecked = true
+                                rating.vote = count
+                                rating.me.isVoted = true
+                            })
+                        } else {
+                            mListViewModel.unVoteComment(rating.game.id, rating.id, callback = {
+                                val count = rating.vote - 1
+                                holder.binding.vote.text = if (count == 0) "" else count.toString()
+                                holder.binding.vote.isChecked = false
+                                rating.vote = count
+                                rating.me.isVoted = false
+                            })
+                        }
+                    }
+                }
+
                 holder.itemView.apply {
                     game_info.setOnClickListener {
                         MtaHelper.onEvent("我的光环_新", "我的游戏评论", "游戏详情")
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt
index ec0b2135ba..93956fb2fa 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt
@@ -32,7 +32,7 @@ class MyRatingFragment : ListFragment<MyRating, MyRatingViewModel>() {
 
     override fun provideListAdapter(): ListAdapter<*> {
         if (mAdapter == null) {
-            mAdapter = MyRatingAdapter(requireContext())
+            mAdapter = MyRatingAdapter(requireContext(), mEntrance, mListViewModel)
         }
         return mAdapter!!
     }
@@ -51,6 +51,7 @@ class MyRatingFragment : ListFragment<MyRating, MyRatingViewModel>() {
             myRating?.reply = resultData?.reply ?: 0
             myRating?.content = resultData?.content ?: ""
             myRating?.star = resultData?.star ?: 0
+            myRating?.me?.isVoted = resultData?.me?.isVoted ?: false
             mAdapter?.notifyItemChanged(dataPosition)
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt
index 9bc12b83c8..a9acae0c33 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt
@@ -1,23 +1,72 @@
 package com.gh.gamecenter.gamedetail.myrating
 
 import android.app.Application
+import com.gh.common.util.ErrorHelper
+import com.gh.common.util.toObject
 import com.gh.gamecenter.baselist.ListViewModel
+import com.gh.gamecenter.entity.ErrorEntity
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.personalhome.rating.MyRating
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.Observable
 import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
+import retrofit2.HttpException
 
 class MyRatingViewModel(application: Application) : ListViewModel<MyRating, MyRating>(application) {
+    private val mApi = RetrofitManager.getInstance(getApplication()).api
+
+
     override fun provideDataObservable(page: Int): Observable<MutableList<MyRating>>? {
         return null
     }
 
     override fun provideDataSingle(page: Int): Single<MutableList<MyRating>> {
-        return RetrofitManager.getInstance(getApplication()).api.getMyRating(UserManager.getInstance().userId, page,"view:halo")
+        return mApi.getMyRating(UserManager.getInstance().userId, page, "view:halo")
     }
 
     override fun mergeResultLiveData() {
         mResultLiveData.addSource(mListLiveData) { mResultLiveData.postValue(it) }
     }
+
+    fun voteComment(gameId: String, commentId: String, callback: () -> Unit) {
+        mApi.voteGameComment(gameId, commentId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        callback.invoke()
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        val string = e?.response()?.errorBody()?.string()
+                        val errorEntity = string?.toObject<ErrorEntity>()
+                        if (errorEntity?.code == 403008) {
+                            onResponse(null)
+                            return
+                        }
+                        ErrorHelper.handleError(getApplication(), string)
+                    }
+                })
+    }
+
+    fun unVoteComment(gameId: String, commentId: String, callback: () -> Unit) {
+        mApi.unvoteGameComment(gameId, commentId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        callback.invoke()
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        val string = e?.response()?.errorBody()?.string()
+                        ErrorHelper.handleError(getApplication(), string)
+                    }
+                })
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt
index 8f6d4eef56..6421db3e26 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt
@@ -68,8 +68,6 @@ class UserHistoryAdapter(context: Context,
     }
 
     private fun bindNormalItem(holder: PersonalItemViewHolder, position: Int) {
-        holder.binding.root.setPadding(20F.dip2px(), if (position == 0) 0 else 16F.dip2px(), 20F.dip2px(), 0)
-
         val historyEntity = mEntityList[holder.adapterPosition]
 
         holder.bindPersonalItem(historyEntity, mEntrance)
@@ -115,6 +113,28 @@ class UserHistoryAdapter(context: Context,
         holder.binding.root.setOnClickListener {
             itemClickCallback.invoke(historyEntity, position)
         }
+
+        holder.binding.vote.setOnClickListener {
+            mContext.ifLogin(mEntrance) {
+                if (!holder.binding.vote.isChecked) {
+                    mListViewModel.voteComment(historyEntity.comment.game.id, historyEntity.comment.id, callback = {
+                        val count = historyEntity.count.vote + 1
+                        holder.binding.vote.text = count.toString()
+                        holder.binding.vote.isChecked = true
+                        historyEntity.count.vote = count
+                        historyEntity.me.isVoted = true
+                    })
+                } else {
+                    mListViewModel.unVoteComment(historyEntity.comment.game.id, historyEntity.comment.id, callback = {
+                        val count = historyEntity.count.vote - 1
+                        holder.binding.vote.text = if (count == 0) "" else count.toString()
+                        holder.binding.vote.isChecked = false
+                        historyEntity.count.vote = count
+                        historyEntity.me.isVoted = false
+                    })
+                }
+            }
+        }
     }
 
     fun getEntityList(): List<PersonalHistoryEntity> {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
index 07a65ece62..dc0c23067c 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
@@ -189,6 +189,7 @@ class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewM
                         count.reply = resultData?.reply ?: 0
                         comment.content = resultData?.content ?: ""
                         comment.star = resultData?.star ?: 0
+                        me.isVoted = resultData?.me?.isVoted ?: false
                     }
                 }
                 101 -> {
@@ -204,9 +205,9 @@ class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewM
                     val resultData = data.getParcelableExtra<AnswerDetailEntity>(AnswerDetailEntity::class.java.simpleName)
                     historyEntity?.apply {
                         count.vote = resultData?.vote ?: 0
-                        count.comment = resultData?.commentCount?:0
+                        count.comment = resultData?.commentCount ?: 0
                         brief = HtmlUtils.stripHtmlCode(resultData?.content ?: "")
-                        question.title = resultData?.question?.title?:""
+                        question.title = resultData?.question?.title ?: ""
                     }
                 }
                 103 -> {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt
index e5fe0239ff..bfc291c2c8 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt
@@ -3,21 +3,32 @@ package com.gh.gamecenter.personalhome.home
 import android.app.Application
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import com.gh.common.util.ErrorHelper
 import com.gh.common.util.UrlFilterUtils
+import com.gh.common.util.toObject
 import com.gh.gamecenter.baselist.ListViewModel
 import com.gh.gamecenter.baselist.LoadType
+import com.gh.gamecenter.entity.ErrorEntity
 import com.gh.gamecenter.entity.PersonalHistoryEntity
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
+import retrofit2.HttpException
 
 class UserHistoryViewModel(application: Application, var userId: String, private var mScene: SCENE)
     : ListViewModel<PersonalHistoryEntity, PersonalHistoryEntity>(application) {
 
+    private val mApi = RetrofitManager.getInstance(getApplication()).api
+
+
     var type: TYPE = TYPE.ALL
 
     override fun provideDataObservable(page: Int): Observable<MutableList<PersonalHistoryEntity>> {
-        return RetrofitManager.getInstance(getApplication()).api.getPersonalHistory(userId, page,
+        return mApi.getPersonalHistory(userId, page,
                 HaloApp.getInstance().channel, getFilter())
     }
 
@@ -25,6 +36,45 @@ class UserHistoryViewModel(application: Application, var userId: String, private
         mResultLiveData.addSource(mListLiveData) { mResultLiveData.postValue(it) }
     }
 
+    fun voteComment(gameId: String, commentId: String, callback: () -> Unit) {
+        mApi.voteGameComment(gameId, commentId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        callback.invoke()
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        val string = e?.response()?.errorBody()?.string()
+                        val errorEntity = string?.toObject<ErrorEntity>()
+                        if (errorEntity?.code == 403008) {
+                            onResponse(null)
+                            return
+                        }
+                        ErrorHelper.handleError(getApplication(), string)
+                    }
+                })
+    }
+
+    fun unVoteComment(gameId: String, commentId: String, callback: () -> Unit) {
+        mApi.unvoteGameComment(gameId, commentId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        callback.invoke()
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        val string = e?.response()?.errorBody()?.string()
+                        ErrorHelper.handleError(getApplication(), string)
+                    }
+                })
+    }
+
+
     fun changeType(type: TYPE) {
         if (this.type != type) {
             this.type = type
diff --git a/app/src/main/res/layout/fragment_user_history.xml b/app/src/main/res/layout/fragment_user_history.xml
index 353e61e2ef..12070bacd2 100644
--- a/app/src/main/res/layout/fragment_user_history.xml
+++ b/app/src/main/res/layout/fragment_user_history.xml
@@ -4,6 +4,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/list_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/filter"
+        android:layout_marginTop="-16dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list_rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
     <RelativeLayout
         android:id="@+id/filter"
         android:layout_width="match_parent"
@@ -35,8 +48,8 @@
                 android:id="@+id/filterBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
                 android:drawableRight="@drawable/ic_user_history_arrow_down"
                 android:drawablePadding="4dp"
                 android:text="筛选"
@@ -46,18 +59,6 @@
         </RelativeLayout>
     </RelativeLayout>
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/list_refresh"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/filter">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/list_rv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
     <include
         layout="@layout/reuse_loading"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_my_game_rating.xml b/app/src/main/res/layout/item_my_game_rating.xml
index 126ac49f6a..d33b549624 100644
--- a/app/src/main/res/layout/item_my_game_rating.xml
+++ b/app/src/main/res/layout/item_my_game_rating.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:fresco="http://schemas.android.com/tools">
+    xmlns:fresco="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
+        <import type="com.gh.common.util.NumberUtils" />
+
         <variable
             name="rating"
             type="com.gh.gamecenter.personalhome.rating.MyRating" />
@@ -17,8 +20,7 @@
         android:orientation="vertical"
         android:paddingLeft="20dp"
         android:paddingTop="16dp"
-        android:paddingRight="20dp"
-        android:paddingBottom="16dp">
+        android:paddingRight="20dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/game_info"
@@ -129,11 +131,11 @@
 
             <com.gh.common.view.materialratingbar.MaterialRatingBar
                 style="@style/Widget.MaterialRatingBar.RatingBar"
-                android:layout_width="100dp"
-                android:layout_height="15dp"
+                android:layout_width="86dp"
+                android:layout_height="14dp"
                 android:isIndicator="true"
-                android:minWidth="12dp"
-                android:minHeight="12dp"
+                android:minWidth="14dp"
+                android:minHeight="14dp"
                 android:rating="@{rating.star}"
                 android:stepSize="0.01"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_rating"
@@ -156,43 +158,47 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_rating"
                 fresco:text="经典移植，画面比例稍微有拉伸，看起来有些不适。扣一星。操作基本还原，因为没有手柄的关系，需要一段时间去适应。需要不支持中文，但是基本上不影响体验" />
-           <!-- <TextView
-                android:id="@+id/audit"
-                visibleGone="@{!rating.active}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="20dp"
-                android:background="@color/white"
-                android:textColor="@color/red"
-                android:textSize="12sp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_comment" />-->
-            <TextView
-                android:id="@+id/tv_agree_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@{rating.vote+`赞同`}"
-                android:textColor="@color/text_999999"
-                android:textSize="11sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_comment"
-                fresco:text="5赞同" />
 
             <TextView
-                android:id="@+id/tv_rating_count"
+                android:id="@+id/comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dp"
-                android:layout_marginTop="16dp"
-                android:text="@{rating.reply>0?rating.reply+`评论`:`0评论`}"
-                android:textColor="@color/text_999999"
-                android:textSize="11sp"
-                app:layout_constraintStart_toEndOf="@+id/tv_agree_count"
+                android:drawableLeft="@drawable/community_comment_count"
+                android:drawablePadding="4dp"
+                android:gravity="center_vertical"
+                android:paddingTop="16dp"
+                android:paddingRight="12dp"
+                android:paddingBottom="16dp"
+                android:text="@{rating.reply > 0? NumberUtils.transSimpleCount(rating.reply) : ``}"
+                android:textColor="@color/vote_selector"
+                android:textSize="13sp"
+                app:layout_constraintBottom_toBottomOf="@+id/vote"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/vote"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/vote"
+                tools:text="1" />
+
+            <CheckedTextView
+                android:id="@+id/vote"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:layout_marginRight="16dp"
+                android:checked="@{rating.me.isVoted}"
+                android:drawableLeft="@drawable/comment_vote_selector"
+                android:drawablePadding="4dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingTop="16dp"
+                android:paddingRight="12dp"
+                android:paddingBottom="16dp"
+                android:text="@{rating.vote > 0? NumberUtils.transSimpleCount(rating.vote) : ``}"
+                android:textColor="@color/vote_selector"
+                android:textSize="13sp"
+                app:layout_constraintLeft_toRightOf="@id/comment"
                 app:layout_constraintTop_toBottomOf="@+id/tv_comment"
-                fresco:text="5评论" />
+                tools:text="1" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 </layout>
diff --git a/app/src/main/res/layout/personal_home_rating.xml b/app/src/main/res/layout/personal_home_rating.xml
index 0d4d243970..f6dabd0ce7 100644
--- a/app/src/main/res/layout/personal_home_rating.xml
+++ b/app/src/main/res/layout/personal_home_rating.xml
@@ -1,122 +1,139 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android = "http://schemas.android.com/apk/res/android"
-    xmlns:app = "http://schemas.android.com/apk/res-auto"
-    xmlns:fresco = "http://schemas.android.com/tools" >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:fresco="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <data >
+    <data>
 
-        <import type = "com.gh.common.util.NumberUtils" />
+        <import type="com.gh.common.util.NumberUtils" />
 
         <variable
-            name = "entity"
-            type = "com.gh.gamecenter.entity.PersonalHistoryEntity" />
-    </data >
+            name="entity"
+            type="com.gh.gamecenter.entity.PersonalHistoryEntity" />
+    </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width = "match_parent"
-        android:layout_height = "wrap_content"
-        android:background = "@drawable/reuse_listview_item_style"
-        android:orientation = "vertical"
-        android:paddingLeft = "20dp"
-        android:paddingTop = "12dp"
-        android:paddingRight = "20dp"
-        android:paddingBottom = "10dp" >
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/reuse_listview_item_style"
+        android:orientation="vertical"
+        android:paddingLeft="20dp"
+        android:paddingTop="16dp"
+        android:paddingRight="20dp">
 
         <RelativeLayout
-            android:id = "@+id/user_icon_container"
-            android:layout_width = "22dp"
-            android:layout_height = "22dp"
-            app:layout_constraintLeft_toLeftOf = "parent"
-            app:layout_constraintTop_toTopOf = "parent" >
+            android:id="@+id/user_icon_container"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <com.facebook.drawee.view.SimpleDraweeView
-                android:id = "@+id/user_icon"
-                style = "@style/frescoCircleStyle"
-                imageUrl = "@{entity.user.icon}"
-                android:layout_width = "20dp"
-                android:layout_height = "20dp"
-                fresco:roundAsCircle = "true" />
+                android:id="@+id/user_icon"
+                style="@style/frescoCircleStyle"
+                imageUrl="@{entity.user.icon}"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                fresco:roundAsCircle="true" />
 
             <com.facebook.drawee.view.SimpleDraweeView
-                android:id = "@+id/user_auth_icon"
-                imageUrl = "@{entity.user.auth.icon}"
-                visibleGone = "@{entity.user.auth == null? false: true}"
-                android:layout_width = "10dp"
-                android:layout_height = "10dp"
-                android:layout_alignParentRight = "true"
-                android:layout_alignParentBottom = "true" />
-        </RelativeLayout >
+                android:id="@+id/user_auth_icon"
+                imageUrl="@{entity.user.auth.icon}"
+                visibleGone="@{entity.user.auth == null? false: true}"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true" />
+        </RelativeLayout>
 
         <TextView
-            android:id = "@+id/user_command"
-            android:layout_width = "0dp"
-            android:layout_height = "wrap_content"
-            android:layout_marginLeft = "12dp"
-            android:layout_marginBottom = "2dp"
-            android:singleLine = "true"
-            android:textColor = "@color/hint"
-            android:textSize = "13sp"
-            app:layout_constraintBottom_toBottomOf = "@id/user_icon_container"
-            app:layout_constraintLeft_toRightOf = "@id/user_icon_container"
-            app:layout_constraintRight_toRightOf = "parent"
-            app:layout_constraintTop_toTopOf = "@id/user_icon_container" />
+            android:id="@+id/user_command"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_marginBottom="2dp"
+            android:singleLine="true"
+            android:textColor="@color/text_999999"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@id/user_icon_container"
+            app:layout_constraintLeft_toRightOf="@id/user_icon_container"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@id/user_icon_container" />
 
         <com.gh.common.view.EllipsizeTextView
-            android:id = "@+id/content"
-            android:layout_width = "match_parent"
-            android:layout_height = "wrap_content"
-            android:layout_marginTop = "7dp"
-            android:ellipsize = "end"
-            android:maxLines = "3"
-            android:textColor = "@color/title"
-            android:textSize = "14sp"
+            android:id="@+id/content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:ellipsize="end"
             android:includeFontPadding="false"
-            android:lineSpacingMultiplier="1.3"
-            app:layout_constraintTop_toBottomOf = "@id/user_icon_container" />
+            android:lineSpacingExtra="4dp"
+            android:maxLines="3"
+            android:textColor="@color/text_666666"
+            android:textSize="14sp"
+            app:layout_constraintTop_toBottomOf="@id/user_icon_container" />
 
         <TextView
-            android:id = "@+id/vote_count"
-            visibleGone = "@{entity.count.vote != -1}"
-            android:layout_width = "wrap_content"
-            android:layout_height = "wrap_content"
-            android:layout_marginTop = "10dp"
-            android:text = "@{NumberUtils.transSimpleCount(entity.count.vote) + ` 赞同`}"
-            android:textColor = "@color/hint"
-            android:textSize = "11sp"
-            app:layout_constraintLeft_toLeftOf = "parent"
-            app:layout_constraintTop_toBottomOf = "@id/content" />
+            android:id="@+id/comment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/community_comment_count"
+            android:drawablePadding="4dp"
+            android:gravity="center_vertical"
+            android:paddingTop="16dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="16dp"
+            android:text="@{entity.count.reply > 0? NumberUtils.transSimpleCount(entity.count.reply) : ``}"
+            android:textColor="@color/vote_selector"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="@+id/vote"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/vote"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/content"
+            app:layout_constraintTop_toTopOf="@+id/vote"
+            tools:text="1" />
 
-        <TextView
-            android:id = "@+id/comment_count"
-            visibleGone = "@{entity.count.reply != -1}"
-            android:layout_width = "wrap_content"
-            android:layout_height = "wrap_content"
-            android:layout_marginLeft = "10dp"
-            android:text = "@{NumberUtils.transSimpleCount(entity.count.reply) + ` 评论`}"
-            android:textColor = "@color/hint"
-            android:textSize = "11sp"
-            app:layout_constraintBottom_toBottomOf = "@id/vote_count"
-            app:layout_constraintLeft_toRightOf = "@id/vote_count"
-            app:layout_constraintTop_toTopOf = "@id/vote_count" />
+        <CheckedTextView
+            android:id="@+id/vote"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginRight="16dp"
+            android:checked="@{entity.me.isVoted}"
+            android:drawableLeft="@drawable/comment_vote_selector"
+            android:drawablePadding="4dp"
+            android:gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingTop="16dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="16dp"
+            android:text="@{entity.count.vote > 0? NumberUtils.transSimpleCount(entity.count.vote) : ``}"
+            android:textColor="@color/vote_selector"
+            android:textSize="13sp"
+            app:layout_constraintLeft_toRightOf="@id/comment"
+            app:layout_constraintTop_toBottomOf="@+id/content"
+            tools:text="1" />
 
 
         <com.gh.common.view.materialratingbar.MaterialRatingBar
-            android:id = "@+id/rating_start"
-            style = "@style/Widget.MaterialRatingBar.RatingBar"
-            android:layout_width = "wrap_content"
-            android:layout_height = "10dp"
-            android:layout_marginLeft = "12dp"
-            android:layout_marginTop = "5dp"
-            android:layout_marginBottom = "2dp"
-            android:isIndicator = "true"
-            android:minWidth = "14dp"
-            android:minHeight = "14dp"
-            android:numStars = "5"
-            android:rating = "@{entity.comment.star}"
-            app:layout_constraintBottom_toBottomOf = "@id/comment_count"
-            app:layout_constraintRight_toRightOf = "parent"
-            app:layout_constraintTop_toTopOf = "@id/comment_count"
-            app:mrb_progressTint = "@color/theme" />
+            android:id="@+id/rating_start"
+            style="@style/Widget.MaterialRatingBar.RatingBar"
+            android:layout_width="wrap_content"
+            android:layout_height="10dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="2dp"
+            android:isIndicator="true"
+            android:minWidth="14dp"
+            android:minHeight="14dp"
+            android:numStars="5"
+            android:rating="@{entity.comment.star}"
+            app:layout_constraintBottom_toBottomOf="@id/vote"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@id/vote"
+            app:mrb_progressTint="@color/theme" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout >
-</layout >
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>