From f4a4110d5ebd74cccd38eea6cdeed0bd96d80c5e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 02 四月 2025 11:22:03 +0800
Subject: [PATCH] fix : 分类缓存
---
app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt | 282 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 217 insertions(+), 65 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt b/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
index 481756d..3fcc370 100644
--- a/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
@@ -13,29 +13,38 @@
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import com.bumptech.glide.Glide
import com.example.firstapp.R
+import com.example.firstapp.activity.ContentDetailActivity
import com.example.firstapp.activity.PickupActivity
+import com.example.firstapp.activity.VipActivity
import com.example.firstapp.adapter.ExpressAdapter
import com.example.firstapp.adapter.FinanceAdapter
import com.example.firstapp.adapter.CategorySelectorAdapter
+import com.example.firstapp.adapter.IncomeAdapter
+import com.example.firstapp.database.service.RetrofitClient
import com.example.firstapp.databinding.FragmentHomeBinding
import com.example.firstapp.databinding.DialogCategorySelectorBinding
+import com.example.firstapp.model.CategoryConfig
+import com.example.firstapp.model.IncomeGroup
+import com.example.firstapp.model.IncomePackage
+import com.example.firstapp.utils.PreferencesManager
import com.google.android.material.bottomsheet.BottomSheetDialog
+import kotlinx.coroutines.launch
+import com.example.firstapp.view.UnderlineTextView
class HomeFragment : Fragment() {
private var _binding: FragmentHomeBinding? = null
- // This property is only valid between onCreateView and
- // onDestroyView.
private val binding get() = _binding!!
private lateinit var homeViewModel: HomeViewModel
private lateinit var expressAdapter: ExpressAdapter
private lateinit var financeAdapter: FinanceAdapter
- private lateinit var incomeAdapter: FinanceAdapter
+ private lateinit var incomeAdapter: IncomeAdapter
private lateinit var flightAdapter: FinanceAdapter
private lateinit var trainAdapter: FinanceAdapter
private lateinit var dataUpdateReceiver: BroadcastReceiver
@@ -54,16 +63,35 @@
super.onViewCreated(view, savedInstanceState)
homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
- // 假设从某处获取用户ID
-// val userId = getUserId() // 需要实现这个方法
- val userId ="123456"
+ val userId = "123456"
homeViewModel.initialize(requireContext(), userId)
-
- //调用这个方法来设置 RecyclerView用于设置 RecyclerView 的布局和适配器。
- setupRecyclerViews()
+
+ // 检查是否是首次安装
+ val isFirstInstall = PreferencesManager.isFirstInstall()
+ if (isFirstInstall) {
+ // 首次安装，设置默认显示快递和还款
+ val defaultCategories = listOf(
+ CategoryConfig(
+ id = 1,
+ name = "快递",
+ order = 1,
+ isEnabled = true
+ ),
+ CategoryConfig(
+ id = 2,
+ name = "还款",
+ order = 2,
+ isEnabled = true
+ )
+ )
+ homeViewModel.saveCategories(defaultCategories)
+ // 标记为非首次安装
+ PreferencesManager.setFirstInstall(false)
+ }
+
+ setupAdapters()
setupTabSwitching()
- //调用这个方法来观察 ViewModel 中的数据变化
- observeViewModelData()
+ setupObservers()
setupCategorySelector()
}
@@ -81,7 +109,7 @@
}
}
- private fun setupRecyclerViews() {
+ private fun setupAdapters() {
binding.expressRecycler.apply {
layoutManager = LinearLayoutManager(context)
expressAdapter = ExpressAdapter()
@@ -93,6 +121,7 @@
val intent = Intent(requireContext(), PickupActivity::class.java).apply {
putExtra("station_name", group.stationName)
putExtra("company", pack.company)
+ putExtra("page_type", PickupActivity.TYPE_EXPRESS)
}
startActivity(intent)
}
@@ -113,6 +142,8 @@
val intent = Intent(requireContext(), PickupActivity::class.java).apply {
putExtra("station_name", group.stationName)
putExtra("company", pack.company)
+ putExtra("page_type", PickupActivity.TYPE_REPAYMENT)
+
}
startActivity(intent)
}
@@ -121,9 +152,22 @@
// 添加新的 RecyclerView
binding.incomeRecycler.apply {
layoutManager = LinearLayoutManager(context)
- incomeAdapter = FinanceAdapter()
+ incomeAdapter = IncomeAdapter()
adapter = incomeAdapter
- visibility = View.GONE
+
+ // 设置初始状态 - 添加这行
+ binding.incomeRecycler.visibility = View.GONE
+
+ // 设置点击监听
+ incomeAdapter.setOnPackageClickListener { group, pack ->
+ // 跳转到取件页面
+ val intent = Intent(requireContext(), PickupActivity::class.java).apply {
+ putExtra("station_name", group.stationName)
+ putExtra("company", pack.company)
+ putExtra("page_type", PickupActivity.TYPE_INCOME)
+ }
+ startActivity(intent)
+ }
}
binding.flightRecycler.apply {
@@ -154,34 +198,67 @@
updateTabStyles(tabExpress)
homeViewModel.loadExpressData()
}
-
- // 财务标签点击事件
+
+ // 还款标签点击事件 - 非会员也可以使用
tabFinance.setOnClickListener {
hideAllRecyclers()
financeRecycler.visibility = View.VISIBLE
updateTabStyles(tabFinance)
homeViewModel.loadFinanceData()
}
+
+ // 其他标签点击事件需要检查会员状态
+ val memberOnlyTabs = mapOf(
+ tabIncome to { homeViewModel.loadIncomeData() },
+ tabFlight to { homeViewModel.loadFlightData() },
+ tabTrain to { homeViewModel.loadTrainData() }
+ )
- tabIncome.setOnClickListener {
- hideAllRecyclers()
- incomeRecycler.visibility = View.VISIBLE
- updateTabStyles(tabIncome)
- homeViewModel.loadIncomeData()
+ memberOnlyTabs.forEach { (tab, loadAction) ->
+ tab.setOnClickListener {
+ checkMembershipAndExecute(tab) {
+ hideAllRecyclers()
+ when (tab) {
+ tabIncome -> incomeRecycler.visibility = View.VISIBLE
+ tabFlight -> flightRecycler.visibility = View.VISIBLE
+ tabTrain -> trainRecycler.visibility = View.VISIBLE
+ }
+ updateTabStyles(tab)
+ loadAction()
+ }
+ }
}
+ }
+ }
- tabFlight.setOnClickListener {
- hideAllRecyclers()
- flightRecycler.visibility = View.VISIBLE
- updateTabStyles(tabFlight)
- homeViewModel.loadFlightData()
- }
+ private fun checkMembershipAndExecute(tab: TextView, action: () -> Unit) {
+ // 从本地获取保存的手机号
+ val savedPhone = PreferencesManager.getPhone()
+ if (savedPhone.isNullOrEmpty()) {
+ Toast.makeText(requireContext(), "请先登录", Toast.LENGTH_SHORT).show()
+ return
+ }
- tabTrain.setOnClickListener {
- hideAllRecyclers()
- trainRecycler.visibility = View.VISIBLE
- updateTabStyles(tabTrain)
- homeViewModel.loadTrainData()
+ // 使用协程检查会员状态
+ lifecycleScope.launch {
+ try {
+ val response = RetrofitClient.apiService.getUserInfo(savedPhone)
+ if (response.code == "0" && response.data != null) {
+ if (response.data.isMember) {
+ action()
+ } else {
+ Toast.makeText(requireContext(), "该功能仅对会员开放", Toast.LENGTH_SHORT).show()
+ // 切回快递标签
+ binding.tabExpress.performClick()
+ }
+ } else {
+ Toast.makeText(requireContext(), "获取用户信息失败", Toast.LENGTH_SHORT).show()
+ binding.tabExpress.performClick()
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ Toast.makeText(requireContext(), "网络错误，请稍后重试", Toast.LENGTH_SHORT).show()
+ binding.tabExpress.performClick()
}
}
}
@@ -196,19 +273,22 @@
}
}
- private fun updateTabStyles(selectedTab: TextView) {
+ private fun updateTabStyles(selectedTab: UnderlineTextView) {
binding.apply {
val tabs = listOf(tabExpress, tabFinance, tabIncome, tabFlight, tabTrain)
tabs.forEach { tab ->
+ // 设置文字颜色为黑色或灰色
tab.setTextColor(ContextCompat.getColor(requireContext(),
- if (tab == selectedTab) R.color.tab_selected else R.color.gray))
+ if (tab == selectedTab) android.R.color.black else R.color.gray))
+ // 设置文字大小
tab.textSize = if (tab == selectedTab) 16f else 14f
+ // 设置下划线
+ tab.setUnderlineVisible(tab == selectedTab)
}
}
}
- //这个方法用于观察 homeViewModel 中的 expressItems 数据。
- private fun observeViewModelData() {
+ private fun setupObservers() {
//当 expressItems 数据发生变化时，更新 RecyclerView 的数据。
homeViewModel.expressItems.observe(viewLifecycleOwner) { items ->
//将新的数据列表提交给适配器，以更新 RecyclerView 的显示内容。
@@ -219,6 +299,7 @@
financeAdapter.submitList(items)
}
+ // 观察收入数据变化
homeViewModel.incomeItems.observe(viewLifecycleOwner) { items ->
incomeAdapter.submitList(items)
}
@@ -232,7 +313,7 @@
}
// 观察可见分类的变化
- homeViewModel.visibleCategories.observe(viewLifecycleOwner) { categories: List<String> ->
+ homeViewModel.visibleCategories.observe(viewLifecycleOwner) { categories: List<CategoryConfig> ->
binding.apply {
// 隐藏所有标签
tabExpress.visibility = View.GONE
@@ -241,29 +322,55 @@
tabFlight.visibility = View.GONE
tabTrain.visibility = View.GONE
- // 根据选中的分类显示对应的标签
- categories.forEachIndexed { index: Int, categoryName: String ->
- when (categoryName) {
- "快递" -> {
+ // 获取用户信息判断是否是会员
+ val savedPhone = PreferencesManager.getPhone()
+ lifecycleScope.launch {
+ try {
+ val response = RetrofitClient.apiService.getUserInfo(savedPhone ?: "")
+ val isMember = response.code == "0" && response.data?.isMember == true
+
+ if (!isMember) {
+ // 非会员只显示快递和还款
tabExpress.visibility = View.VISIBLE
- if (index == 0) tabExpress.performClick()
- }
- "还款" -> {
tabFinance.visibility = View.VISIBLE
- if (index == 0) tabFinance.performClick()
+ if (categories.firstOrNull()?.name == "快递") {
+ tabExpress.performClick()
+ } else {
+ tabFinance.performClick()
+ }
+ } else {
+ // 会员显示所有选中的分类
+ categories.forEach { category ->
+ when (category.name) {
+ "快递" -> {
+ tabExpress.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
+ if (categories.indexOf(category) == 0 && category.isEnabled) tabExpress.performClick()
+ }
+ "还款" -> {
+ tabFinance.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
+ if (categories.indexOf(category) == 0 && category.isEnabled) tabFinance.performClick()
+ }
+ "收入" -> {
+ tabIncome.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
+ if (categories.indexOf(category) == 0 && category.isEnabled) tabIncome.performClick()
+ }
+ "航班" -> {
+ tabFlight.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
+ if (categories.indexOf(category) == 0 && category.isEnabled) tabFlight.performClick()
+ }
+ "火车票" -> {
+ tabTrain.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
+ if (categories.indexOf(category) == 0 && category.isEnabled) tabTrain.performClick()
+ }
+ }
+ }
}
- "收入" -> {
- tabIncome.visibility = View.VISIBLE
- if (index == 0) tabIncome.performClick()
- }
- "航班" -> {
- tabFlight.visibility = View.VISIBLE
- if (index == 0) tabFlight.performClick()
- }
- "火车票" -> {
- tabTrain.visibility = View.VISIBLE
- if (index == 0) tabTrain.performClick()
- }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ // 发生错误时默认显示快递和还款
+ tabExpress.visibility = View.VISIBLE
+ tabFinance.visibility = View.VISIBLE
+ tabExpress.performClick()
}
}
}
@@ -310,14 +417,35 @@
.into(binding.bottomAdBanner)
}
+ // 设置分类选择器 检查会员状态
private fun setupCategorySelector() {
binding.categoryButton.setOnClickListener {
- // TODO: 检查会员状态
- if (true) { // 临时设置为true，实际应该检查会员状态
- showCategorySelectorDialog()
- } else {
- // 显示会员提示
- Toast.makeText(requireContext(), "该功能仅对会员开放", Toast.LENGTH_SHORT).show()
+ // 从本地获取保存的手机号
+ val savedPhone = PreferencesManager.getPhone()
+ if (savedPhone.isNullOrEmpty()) {
+ Toast.makeText(requireContext(), "请先登录", Toast.LENGTH_SHORT).show()
+ return@setOnClickListener
+ }
+
+ // 使用协程检查会员状态
+ lifecycleScope.launch {
+ try {
+ val response = RetrofitClient.apiService.getUserInfo(savedPhone)
+ if (response.code == "0" && response.data != null) {
+ if (response.data.isMember) {
+ showCategorySelectorDialog()
+ } else {
+ // 非会员跳转到VIP开通页面
+ val intent = Intent(requireContext(), VipActivity::class.java)
+ startActivity(intent)
+ }
+ } else {
+ Toast.makeText(requireContext(), "获取用户信息失败", Toast.LENGTH_SHORT).show()
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ Toast.makeText(requireContext(), "网络错误，请稍后重试", Toast.LENGTH_SHORT).show()
+ }
}
}
}
@@ -333,9 +461,33 @@
this.adapter = adapter
}
- // 加载现有分类
+ // 加载所有分类
homeViewModel.categories.observe(viewLifecycleOwner) { categories ->
- adapter.setCategories(categories)
+ // 如果是会员，显示所有分类供选择
+ lifecycleScope.launch {
+ try {
+ val savedPhone = PreferencesManager.getPhone()
+ val response = RetrofitClient.apiService.getUserInfo(savedPhone ?: "")
+ val isMember = response.code == "0" && response.data?.isMember == true
+
+ if (isMember) {
+ // 会员可以看到所有分类
+ adapter.setCategories(categories)
+ } else {
+ // 非会员只能看到快递和还款
+ val limitedCategories = categories.filter {
+ it.name == "快递" || it.name == "还款"
+ }
+ adapter.setCategories(limitedCategories)
+ }
+ } catch (e: Exception) {
+ // 发生错误时只显示基础分类
+ val limitedCategories = categories.filter {
+ it.name == "快递" || it.name == "还款"
+ }
+ adapter.setCategories(limitedCategories)
+ }
+ }
}
dialogBinding.saveButton.setOnClickListener {
--
Gitblit v1.9.3