From 045be4ff09e264893697ab269e85d3602bd8ae6f Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Thu, 7 May 2020 10:58:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AF=A6=E6=83=85=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=A0=8F=E7=9B=AE=E5=86=85=E5=AE=B9=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=AF=8C=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt    | 5 +++--
 .../gamecenter/gamedetail/history/HistoryApkListViewModel.kt | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
index 9cf0348afe..7848dfc63f 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
@@ -10,6 +10,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.core.text.HtmlCompat
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
@@ -231,8 +232,8 @@ class DescAdapter(context: Context,
                 detailEntity.shouldBoundTogetherWithPreviousItem,
                 detailEntity.shouldBoundTogetherWithNextItem)
 
-        viewHolder.binding.contentTv.setTextWithHighlightedTextWrappedInsideWrapper(customColumn.des
-                ?: "", copyClickedText = true)
+        viewHolder.binding.contentTv.setTextWithHighlightedTextWrappedInsideWrapper(
+                HtmlCompat.fromHtml(customColumn.des ?: "", HtmlCompat.FROM_HTML_MODE_LEGACY), copyClickedText = true)
 
         viewHolder.binding.recyclerview.isNestedScrollingEnabled = false
         viewHolder.binding.recyclerview.layoutManager = if (customColumn.showInfoTagDes == true) {
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt
index 3a0997c21e..1b62a51180 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt
@@ -33,7 +33,7 @@ class HistoryApkListViewModel(application: Application, var game: GameEntity)
                     // 改变 id 避免其它地方根据原有 game id 变更状态
                     this.isReservable = false
                     this.id = game.id + Constants.GAME_ID_DIVIDER + apk.version
-                    this.name = game.name + apk.version
+                    this.name = game.name + " " // 历史版本加个空格避免其他用游戏名来判定是否待安装的地方错误判断
                     this.setApk(arrayListOf(apk))
                 })
             }