From 93775e1f3d79a1e11b839abbf24201dafcd9e646 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 25 四月 2025 13:45:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardFragment.kt | 58 ++++++++++++++--------------------------------------------
1 files changed, 14 insertions(+), 44 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 3a30115..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
@@ -9,9 +9,6 @@
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.databinding.DataBindingUtil
import androidx.lifecycle.lifecycleScope
import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.GlideException
@@ -20,10 +17,8 @@
import com.bumptech.glide.request.target.Target
import com.bumptech.glide.load.DataSource
import com.example.firstapp.R
-import com.example.firstapp.database.response.UserInfo
-import com.example.firstapp.database.service.RetrofitClient
+
import com.example.firstapp.databinding.FragmentMemberInfoCardBinding
-import com.example.firstapp.utils.PreferencesManager
import kotlinx.coroutines.launch
class MemberInfoCardFragment : Fragment() {
@@ -38,8 +33,6 @@
// 绑定变量
private var _binding: FragmentMemberInfoCardBinding? = null
private val binding get() = _binding!!
-
- private var currentUserInfo: UserInfo? = null // 确保使用你的实际数据类
override fun onCreate(savedInstanceState: Bundle?) {
@@ -60,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?,
@@ -92,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?,
@@ -123,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)
@@ -137,6 +134,7 @@
.transform(RoundedCorners(100))
.error(R.drawable.error_placeholder)
.into(binding.memberImageView)
+
}
}
@@ -148,10 +146,14 @@
}
}
+ viewLifecycleOwner.lifecycleScope.launch {
+ viewModel.phoneTextColor.collect { color ->
+ binding.phoneNumberText.setTextColor(Color.parseColor(color))
+ }
+ }
viewLifecycleOwner.lifecycleScope.launch {
- viewModel.color.collect { color ->
- binding.phoneNumberText.setTextColor(Color.parseColor(color))
+ viewModel.memberStatusColor.collect { color ->
binding.memberStatus.setTextColor(Color.parseColor(color))
}
}
@@ -159,42 +161,10 @@
return binding.root
}
-
override fun onDestroyView() {
super.onDestroyView()
_binding = null
}
-// private fun loadUserInfo() {
-// // 获取Fragment实例
-// val memberInfoCardFragment = supportFragmentManager.findFragmentById(R.id.memberInfoCardFragment) as MemberInfoCardFragment?
-//
-//
-//
-// lifecycleScope.launch {
-// try {
-// // 从本地获取保存的手机号
-// val savedPhone = PreferencesManager.getPhone()
-// if (savedPhone.isNullOrEmpty()) {
-//// Toast.makeText(this@VipActivity, "用户未登录", Toast.LENGTH_SHORT).show()
-// return@launch
-// }
-//
-// val response = RetrofitClient.apiService.getUserInfo(savedPhone)
-// if (response.code == "0" && response.data != null) {
-// // 保存用户信息
-// currentUserInfo = response.data
-// val userInfo = response.data
-// // 调用ViewModel的刷新方法
-// memberInfoCardFragment?.viewModel?.updateMemberStatus(userInfo)
-//
-// }
-// } catch (e: Exception) {
-// e.printStackTrace()
-// Toast.makeText(this@VipActivity, "获取用户信息失败", Toast.LENGTH_SHORT).show()
-// }
-// }
-//
-// }
}
\ No newline at end of file
--
Gitblit v1.9.3