Merge branch 'hotfix/v5.38.4-1114/GHZSCY-6927' into 'release'

fix: 深色模式下富文本指定颜色无法显示的问题 https://jira.shanqu.cc/browse/GHZSCY-6927 See merge request halo/android/assistant-android!1978
2024-11-14 10:21:48 +08:00
parent f34ad0675d f261991a55
commit 78f9aa3ee4
2 changed files with 16 additions and 2 deletions
--- 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()