From 5c73f167603693d5e015193730bf16f3b6bb2bf5 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 25 三月 2025 13:47:54 +0800
Subject: [PATCH] fix 1111

---
 app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt b/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt
index 4f3ba17..ea75a47 100644
--- a/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt
@@ -13,6 +13,7 @@
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -178,14 +179,6 @@
         }
 
         // 头像点击老的处理逻辑
-//        binding.layoutUserInfo.setOnClickListener {
-//            val intent = Intent(requireContext(), EditProfileActivity::class.java).apply {
-//                putExtra("nickname", binding.tvNickname.text.toString())
-//                putExtra("avatar_url", binding.ivAvatar.toString())
-//            }
-//            editProfileLauncher.launch(intent)
-//        }
-
         binding.layoutUserInfo.setOnClickListener {
             currentUserInfo?.let { user ->
                 val intent = Intent(requireContext(), EditProfileActivity::class.java).apply {
@@ -286,8 +279,11 @@
                 if (userInfo.showed) {
                     binding.ivVip.visibility = View.VISIBLE
                     binding.cardVip.visibility = View.VISIBLE
-                    binding.tvVipExpire.text = "${userInfo.passTime} 到期"
+                    binding.tvVipExpire.text = "${userInfo.overTime} 到期"
                 } else {
+                    //非会员信息
+                    binding.btnRenew.text = "立即开通"
+                    binding.linearVipContainer.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.gray))
                     binding.cardVip.visibility = View.GONE
                 }
             }

--
Gitblit v1.9.3