From fe04012057d024770e0180543483d393281a542f Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期四, 03 四月 2025 09:18:16 +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 | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 7df6edb..fa18bcf 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
@@ -51,8 +51,15 @@
// 开通状态
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"
@@ -68,10 +75,16 @@
// 头像
// 如果头像不为空的话，则更新头像
- if(userInfo.cover.isNotEmpty()){
- _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