From a1e123f0bf9720629298d1a23f3bb507c7a1d177 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Mon, 24 Nov 2025 16:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=94=99=E4=B9=B1=E5=AE=B9=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modulemain/activity/user/activity/HeartCpActivity.kt    | 6 ++++--
 .../java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
index 6ee464dd..d4a3da6f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
@@ -52,8 +52,10 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
         }
         mBinding.ivHelp.setOnClickListener {
             val dialog = DialogWebView(this)
-            dialog.show(CommonAppContext.getInstance()
-                .getCurrentEnvironment().serverUrl + "api/Page/page_show?id=31")
+            dialog.show(
+                CommonAppContext.getInstance().currentEnvironment.serverUrl
+                        + "api/Page/page_show?id=31"
+            )
         }
 
         mBinding.ivHeadLeft.setOnClickListener {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt b/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt
index 4d2ce62f..19c6687f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt
@@ -36,7 +36,7 @@ class ItemCpHeartAdapter(
             tv.setTextColor(context.getColor(R.color.ff4a89ff))
             R.color.ffff53cc
         }
-        if (item.remark.contains(item.to_user_info.nickname)) {
+        if (item.remark.contains(item.to_user_info.nickname) && item.to_user_info.nickname.isNotEmpty()) {
             val builder = getContentColor(item.to_user_info.nickname, item.remark, cid)
             helper.setText(R.id.tv_content, builder)
         } else {