From 4209a1f5d57190bb0903c51bdb8bfac968a4f526 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期二, 01 四月 2025 10:43:36 +0800
Subject: [PATCH] 1.vip续费页面-VIP会员服务协议
---
app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt | 2
app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardFragment.kt | 42 --------------------
app/src/main/java/com/example/firstapp/activity/VipActivity.kt | 26 +++++++++++-
app/src/main/res/layout/activity_vip.xml | 1
4 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/activity/VipActivity.kt b/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
index 1199c1b..d0daa5f 100644
--- a/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
@@ -1,6 +1,7 @@
package com.example.firstapp.activity
import android.app.AlertDialog
+import android.content.Intent
import android.graphics.Color
import android.os.Bundle
import android.util.TypedValue
@@ -18,6 +19,7 @@
import androidx.cardview.widget.CardView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintSet
+import androidx.core.content.ContentProviderCompat.requireContext
import androidx.core.content.ContextCompat
import androidx.lifecycle.Observer
import androidx.lifecycle.lifecycleScope
@@ -96,6 +98,10 @@
// 勾选协议点击事件
handlePrototalClick()
+
+ // VIP会员服务协议
+ handleVipProtocolClick()
+
}
@@ -472,9 +478,6 @@
private fun loadUserInfo() {
// 获取Fragment实例
val memberInfoCardFragment = supportFragmentManager.findFragmentById(R.id.memberInfoCardFragment) as MemberInfoCardFragment?
-
-
-
lifecycleScope.launch {
try {
// 从本地获取保存的手机号
@@ -501,4 +504,21 @@
}
+ // VIP会员服务协议
+ private fun handleVipProtocolClick(){
+
+ binding.protocolVip.setOnClickListener{
+ startContentActivity("privacy_policy", "VIP会员服务协议")
+ }
+
+ }
+
+ private fun startContentActivity(type: String, title: String) {
+ val intent = Intent(this, ContentDetailActivity::class.java).apply {
+ putExtra(ContentDetailActivity.EXTRA_CONTENT_TYPE, type)
+ putExtra(ContentDetailActivity.EXTRA_TITLE, title)
+ }
+ startActivity(intent)
+ }
+
}
\ No newline at end of file
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..eb1c203 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?) {
@@ -148,7 +141,6 @@
}
}
-
viewLifecycleOwner.lifecycleScope.launch {
viewModel.color.collect { color ->
binding.phoneNumberText.setTextColor(Color.parseColor(color))
@@ -159,42 +151,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
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 a3ac89d..6342a76 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
@@ -57,7 +57,7 @@
// vip头像
_vipCover.value ="http://192.168.1.201:9000/sms/member/vip.png"
_background.value = R.drawable.vip_black_background
- _color.value ="#5F6064"
+ _color.value ="#A9A9AB"
}else{
_memberStatus.value = "未开通"
diff --git a/app/src/main/res/layout/activity_vip.xml b/app/src/main/res/layout/activity_vip.xml
index 7db7900..1a8b32f 100644
--- a/app/src/main/res/layout/activity_vip.xml
+++ b/app/src/main/res/layout/activity_vip.xml
@@ -483,6 +483,7 @@
/>
<TextView
+ android:id="@+id/protocol_vip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《VIP会员服务协议》"
--
Gitblit v1.9.3