From 0cf0870889d65f5d11d0b2c8af7bca9442a7ba19 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 21 四月 2025 17:14:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt b/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt
index 6342a76..aac84ca 100644
--- a/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt
+++ b/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt
@@ -19,7 +19,7 @@
val memberStatus: StateFlow<String> = _memberStatus
// 头像
- private val _cover = MutableStateFlow("")
+ private val _cover = MutableStateFlow("https://smart-manager-new.tos-cn-beijing.volces.com/sms/avatar/avatar_default.png")
val cover: StateFlow<String> = _cover
// vip头像
@@ -30,9 +30,13 @@
private val _background = MutableStateFlow(R.drawable.dialog_background)
val background: StateFlow<Int> = _background
- // 背景色
- private val _color = MutableStateFlow("#E8EAEE")
- val color: StateFlow<String> = _color
+ // 手机号字体颜色
+ private val _phoneTextColor = MutableStateFlow("#37393B")
+ val phoneTextColor: StateFlow<String> = _phoneTextColor
+
+ // 到期时间字体颜色
+ private val _memberStatusColor = MutableStateFlow("#37393B")
+ val memberStatusColor: StateFlow<String> = _memberStatusColor
// 更新数据的方法
@@ -51,23 +55,42 @@
// 开通状态
if(userInfo.isMember){
// 判断userInfo.memberOvertime是否为空，如果不为空，则截取字符串到年月日
- if(userInfo.memberOvertime.isNotEmpty()){
- _memberStatus.value = userInfo.memberOvertime.substring(0,10)+" 到期"
+// if(userInfo.memberOvertime.isNotEmpty()){
+// _memberStatus.value = userInfo.memberOvertime.substring(0,10)+" 到期"
+// }
+
+ _memberStatus.value = " 到期"
+ userInfo.memberOvertime?.let {
+ if (it.isNotEmpty()) {
+ _memberStatus.value = it.substring(0, 10) + " 到期"
+ }
}
// vip头像
- _vipCover.value ="http://192.168.1.201:9000/sms/member/vip.png"
+ _vipCover.value ="https://smart-manager-new.tos-cn-beijing.volces.com/sms/member/vip.png"
_background.value = R.drawable.vip_black_background
- _color.value ="#A9A9AB"
+ _phoneTextColor.value ="#F2F2F2"
+ _memberStatusColor.value ="#AAAAAA"
}else{
_memberStatus.value = "未开通"
- _vipCover.value ="http://192.168.1.201:9000/sms/member/vip_no.png"
+ _vipCover.value ="https://smart-manager-new.tos-cn-beijing.volces.com/sms/member/vip_no.png"
_background.value =R.drawable.vip_white_background
- _color.value ="#A4A4A4"
+ _phoneTextColor.value ="#37393B"
+ _memberStatusColor.value ="#37393B"
}
// 头像
- _cover.value = userInfo.cover
+ // 如果头像不为空的话，则更新头像
+// if(userInfo.cover.isNotEmpty()){
+// _cover.value = userInfo.cover
+// }
+ userInfo.cover?.let {
+ if (it.isNotEmpty()) {
+ _cover.value = it
+ }
+ }
+
+
}
}
--
Gitblit v1.9.3