From f261991a55314f0a955e360f4a3c245ca76fab23 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Wed, 6 Nov 2024 15:49:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E5=AF=8C=E6=96=87=E6=9C=AC=E6=8C=87=E5=AE=9A=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20https://jira.shanqu.cc/browse/GHZSCY-6927?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
---
 .../com/gh/gamecenter/gamedetail/desc/DescAdapter.kt  |  7 +++++--
 .../java/com/gh/gamecenter/common/utils/Extensions.kt | 11 +++++++++++
 2 files changed, 16 insertions(+), 2 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 91c61112d1..eab10e699e 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
@@ -983,14 +983,17 @@ class DescAdapter(
                 setExpandMaxLines(maxDesLines)
                 setIsExpanded(Int.MAX_VALUE == maxDesLines)
                 if (customColumn.isHtmlDes == true) {
+                    val decoratedDesBrief = (customColumn.desBrief ?: "").dropFontColorInDarkMode(contentTv.context)
+                    val decoratedDes = (customColumn.des ?: "").dropFontColorInDarkMode(contentTv.context)
+
                     shrankSpanned = HtmlCompat.fromHtml(
-                        customColumn.desBrief ?: "",
+                        decoratedDesBrief,
                         HtmlCompat.FROM_HTML_MODE_COMPACT,
                         PicassoImageGetter(contentTv),
                         ExtraTagHandler()
                     )
                     expandedSpanned = HtmlCompat.fromHtml(
-                        customColumn.des ?: "",
+                        decoratedDes,
                         HtmlCompat.FROM_HTML_MODE_COMPACT,
                         PicassoImageGetter(contentTv),
                         ExtraTagHandler()
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
index f1faaaee55..6d778dd374 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
@@ -455,6 +455,17 @@ fun String.containHtmlTag(): Boolean {
     return matcher.find()
 }
 
+fun String.dropFontColorInDarkMode(context: Context) : String {
+    return if (DarkModeUtils.isDarkModeOn(context)) {
+        val fontColorRegex = Pattern.compile("<font[^>]*color[^>]*>")
+        val matcher = fontColorRegex.matcher(this)
+
+        return matcher.replaceAll("")
+    } else {
+        this
+    }
+}
+
 /**
  * 用户行为相关
  */