From 4ed001ff84ed21bf32da85dbc4ba53ff2829e987 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 27 三月 2025 17:01:19 +0800
Subject: [PATCH] fix 修改表字段后版本，
---
app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt | 67 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 20 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..230fb9c 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
@@ -8,16 +8,15 @@
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
import com.example.firstapp.R
import com.example.firstapp.activity.PickupActivity
import com.example.firstapp.adapter.ExpressAdapter
-import com.example.firstapp.core.Core
+import com.example.firstapp.adapter.FinanceAdapter
import com.example.firstapp.databinding.FragmentHomeBinding
class HomeFragment : Fragment() {
@@ -30,7 +29,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
@@ -49,7 +48,8 @@
//通过 ViewModelProvider 获取 HomeViewModel 的实例，以便在视图中使用。
homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-
+ // 加载广告图片
+ //loadAdvertisements()
//调用这个方法来设置 RecyclerView用于设置 RecyclerView 的布局和适配器。
setupRecyclerViews()
setupTabSwitching()
@@ -88,12 +88,25 @@
}
}
-// // 财务列表
-// binding.financeRecycler.apply {
-// layoutManager = LinearLayoutManager(context)
-// financeAdapter = FinanceAdapter()
-// adapter = financeAdapter
-// }
+ // 财务列表
+ binding.financeRecycler.apply {
+ layoutManager = LinearLayoutManager(context)
+ financeAdapter = FinanceAdapter()
+ adapter = financeAdapter
+
+ // 设置初始状态 - 添加这行
+ binding.financeRecycler.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 {
@@ -112,8 +125,8 @@
// 快递标签点击事件
tabExpress.setOnClickListener {
- expressContent.visibility = View.VISIBLE
- financeContent.visibility = View.GONE
+ expressRecycler.visibility = View.VISIBLE
+ financeRecycler.visibility = View.GONE
tabExpress.setTextColor(ContextCompat.getColor(requireContext(), R.color.tab_selected))
tabFinance.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
others.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
@@ -124,20 +137,23 @@
// 财务标签点击事件
tabFinance.setOnClickListener {
- expressContent.visibility = View.GONE
- financeContent.visibility = View.VISIBLE
+ expressRecycler.visibility = View.GONE
+ financeRecycler.visibility = View.VISIBLE
tabExpress.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
tabFinance.setTextColor(ContextCompat.getColor(requireContext(), R.color.tab_selected))
others.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
tabExpress.textSize = 14f
tabFinance.textSize = 16f
others.textSize = 14f
+
+ // 在切换到财务标签时加载数据 - 添加这行
+ homeViewModel.loadFinanceData()
}
// 其他标签点击事件
others.setOnClickListener {
- expressContent.visibility = View.GONE
- financeContent.visibility = View.GONE
+ expressRecycler.visibility = View.GONE
+ financeRecycler.visibility = View.GONE
tabExpress.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
tabFinance.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
others.setTextColor(ContextCompat.getColor(requireContext(), R.color.tab_selected))
@@ -156,9 +172,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)
@@ -193,4 +209,15 @@
super.onDestroyView()
_binding = null
}
+
+ private fun loadAdvertisements() {
+ // 使用 Glide 加载网络图片
+ Glide.with(this)
+ .load("http://192.168.1.235:9999/advertisement/up.png")
+ .into(binding.adBanner)
+
+ Glide.with(this)
+ .load("http://192.168.1.235:9999/advertisement/down.png")
+ .into(binding.bottomAdBanner)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3