fix: 修复xcrash敏感行为【读取系统属性】

Merge branch 'fix/GHZSCY-6773' into 'dev'
fix:【光环助手】游戏专题-右上角显示问题 https://jira.shanqu.cc/browse/GHZSCY-6773 See merge request halo/android/assistant-android!1928
2024-10-15 15:07:57 +08:00 · 2024-10-15 09:35:38 +08:00 · 2024-10-15 09:31:13 +08:00 · 2024-10-14 17:09:30 +08:00
2 changed files with 8 additions and 3 deletions
--- a/app/src/main/java/com/gh/gamecenter/home/custom/viewholder/BaseCustomViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/custom/viewholder/BaseCustomViewHolder.kt
@ -123,8 +123,12 @@ abstract class BaseCustomViewHolder(
                    _title.name = subject.name
                    tvTitle.text = subject.name ?: ""
                }
-                if (_title.rightText != subject.home) {
-                    _title.rightText = subject.home
+                val home = subject.home ?: ""
+                val homeText = subject.homeText ?: ""
+                if (_title.rightHome != home || _title.rightText != homeText) {
+                    _title.rightHome = home
+                    _title.rightText = homeText
+
                    fun getHomeText(defaultResId: Int): String =
                        if (subject.homeText.isNullOrBlank()) {
                            defaultResId.toResString()
@ -363,6 +367,7 @@ abstract class BaseCustomViewHolder(

    data class TitleData(
        var name: String? = null,
+        var rightHome: String? = null,
        var rightText: String? = null,
        var isRefresh: Boolean = false,
        var icon: String? = null,
--- a/2
+++ b/2
Author	SHA1	Message	Date
yangfei	f75396d7ae	fix: 修复xcrash敏感行为【读取系统属性】	2024-10-15 15:07:57 +08:00
张晨	72c3df7fa6	Merge branch 'fix/GHZSCY-6773' into 'dev' fix:【光环助手】游戏专题-右上角显示问题 https://jira.shanqu.cc/browse/GHZSCY-6773 See merge request halo/android/assistant-android!1928	2024-10-15 09:35:38 +08:00
张晨	2d4920cfb0	fix:【光环助手】游戏专题-右上角显示问题 https://jira.shanqu.cc/browse/GHZSCY-6773	2024-10-15 09:31:13 +08:00
yangfei	2d30b97cca	Merge branch 'fix/hiddenapibypass-bug' into 'dev' fix: 更新hiddenapibypass库，观察native crash的hiddenapi相关问题是否解决。 See merge request halo/android/assistant-android!1927	2024-10-14 17:09:30 +08:00