From 2c0177d2bfc2ed89b2fdffc7ccb84dc685cdf524 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 18 三月 2025 10:09:04 +0800
Subject: [PATCH] fix： 财务统计逻辑
---
app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 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 b272afa..ac27547 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
@@ -17,6 +17,7 @@
import com.example.firstapp.R
import com.example.firstapp.activity.PickupActivity
import com.example.firstapp.adapter.ExpressAdapter
+import com.example.firstapp.adapter.FinanceAdapter
import com.example.firstapp.core.Core
import com.example.firstapp.databinding.FragmentHomeBinding
@@ -30,7 +31,7 @@
private lateinit var homeViewModel: HomeViewModel
private lateinit var expressAdapter: ExpressAdapter
- // private lateinit var financeAdapter: FinanceAdapter
+ private lateinit var financeAdapter: FinanceAdapter
// private lateinit var memorialAdapter: MemorialAdapter
private lateinit var dataUpdateReceiver: BroadcastReceiver
@@ -88,12 +89,25 @@
}
}
-// // 财务列表
-// binding.financeRecycler.apply {
-// layoutManager = LinearLayoutManager(context)
-// financeAdapter = FinanceAdapter()
-// adapter = financeAdapter
-// }
+ // 财务列表
+ binding.financeRecycler.apply {
+ layoutManager = LinearLayoutManager(context)
+ financeAdapter = FinanceAdapter()
+ adapter = financeAdapter
+
+ // 设置初始状态 - 添加这行
+ binding.financeContent.visibility = View.GONE
+
+ // 设置点击监听
+ financeAdapter.setOnPackageClickListener { group, pack ->
+ // 跳转到取件页面
+ val intent = Intent(requireContext(), PickupActivity::class.java).apply {
+ putExtra("station_name", group.stationName)
+ putExtra("company", pack.company)
+ }
+ startActivity(intent)
+ }
+ }
//
// // 纪念日列表
// binding.memorialRecycler.apply {
@@ -132,6 +146,9 @@
tabExpress.textSize = 14f
tabFinance.textSize = 16f
others.textSize = 14f
+
+ // 在切换到财务标签时加载数据 - 添加这行
+ homeViewModel.loadFinanceData()
}
// 其他标签点击事件
@@ -156,9 +173,9 @@
expressAdapter.submitList(items)
}
-// homeViewModel.financeItems.observe(viewLifecycleOwner) { items ->
-// financeAdapter.submitList(items)
-// }
+ homeViewModel.financeItems.observe(viewLifecycleOwner) { items ->
+ financeAdapter.submitList(items)
+ }
//
// homeViewModel.memorialItems.observe(viewLifecycleOwner) { items ->
// memorialAdapter.submitList(items)
--
Gitblit v1.9.3