From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardFragment.kt | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardFragment.kt b/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardFragment.kt
index eb1c203..2166148 100644
--- a/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardFragment.kt
@@ -53,8 +53,10 @@
Glide.with(this)
.load(viewModel.cover)
+ .circleCrop()
.transform(RoundedCorners(100)) // 设置圆角
- .error(R.drawable.error_placeholder) // 如果加载失败，显示占位图
+// .error(R.drawable.error_placeholder) // 如果加载失败，显示占位图
+ .error(R.mipmap.avatar_default)
.listener(object : RequestListener<Drawable> {
override fun onResourceReady(
resource: Drawable?,
@@ -85,7 +87,8 @@
Glide.with(this)
.load(viewModel.vipCover)
.transform(RoundedCorners(100)) // 设置圆角
- .error(R.drawable.error_placeholder) // 如果加载失败，显示占位图
+// .error(R.drawable.error_placeholder) // 如果加载失败，显示占位图
+ .error(R.mipmap.vip_no)
.listener(object : RequestListener<Drawable> {
override fun onResourceReady(
resource: Drawable?,
@@ -116,6 +119,7 @@
viewModel.cover.collect { coverUrl ->
Glide.with(this@MemberInfoCardFragment)
.load(coverUrl)
+ .circleCrop()
.transform(RoundedCorners(100))
.error(R.drawable.error_placeholder)
.into(binding.memberAvatarView)
@@ -130,6 +134,7 @@
.transform(RoundedCorners(100))
.error(R.drawable.error_placeholder)
.into(binding.memberImageView)
+
}
}
@@ -142,8 +147,13 @@
}
viewLifecycleOwner.lifecycleScope.launch {
- viewModel.color.collect { color ->
+ viewModel.phoneTextColor.collect { color ->
binding.phoneNumberText.setTextColor(Color.parseColor(color))
+ }
+ }
+
+ viewLifecycleOwner.lifecycleScope.launch {
+ viewModel.memberStatusColor.collect { color ->
binding.memberStatus.setTextColor(Color.parseColor(color))
}
}
--
Gitblit v1.9.3