From 2a117297daf83b2e1a104603e9641226d5beeba3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 04 三月 2025 10:41:38 +0800
Subject: [PATCH] fix: 按天统计相关逻辑
---
app/src/main/java/com/example/firstapp/ui/dashboard/DashboardFragment.kt | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardFragment.kt b/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardFragment.kt
index 992fcb1..565676c 100644
--- a/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardFragment.kt
@@ -13,7 +13,7 @@
import com.google.android.material.tabs.TabLayout
import androidx.recyclerview.widget.LinearLayoutManager
import com.example.firstapp.adapter.PackageAdapter
-import com.example.firstapp.model.PackageInfo
+import com.example.firstapp.core.Core
import com.github.mikephil.charting.charts.BarChart
import com.github.mikephil.charting.charts.PieChart
import com.github.mikephil.charting.components.Legend
@@ -185,7 +185,7 @@
private fun updatePieChartData() {
viewModel.getCourierStats(currentDate.timeInMillis).observe(viewLifecycleOwner) { stats ->
val entries = stats.map { stat ->
- PieEntry(stat.count.toFloat(), stat.courierName)
+ PieEntry(stat.count.toFloat(), stat.category)
}
val dataSet = PieDataSet(entries, "快递公司分布")
@@ -204,24 +204,18 @@
private fun loadPackages() {
// 这里应该从数据库或网络加载数据
- // 这里使用模拟数据作为示例
- val mockPackages = listOf(
- PackageInfo(
- trackingNumber = "14-6-7023",
- courierName = "某快递",
- receivedTime = System.currentTimeMillis(),
- courierIcon = R.drawable.data
- ),
- PackageInfo(
- trackingNumber = "230721",
- courierName = "京东",
- receivedTime = System.currentTimeMillis() - 3600000,
- courierIcon = R.drawable.data
- )
- )
-
- packageAdapter.updatePackages(mockPackages)
- binding.textPackageCount.text = "${mockPackages.size}个"
+ // 根据当前选择的日期类型传入对应参数
+ val packages = when (currentDateType) {
+ DateType.DAY -> Core.code.getPackagesByDay(currentDate.timeInMillis)
+// DateType.WEEK -> Core.code.getPackagesByWeek(currentDate.timeInMillis)
+// DateType.MONTH -> Core.code.getPackagesByMonth(currentDate.timeInMillis)
+// DateType.YEAR -> Core.code.getPackagesByYear(currentDate.timeInMillis)
+ DateType.WEEK -> TODO()
+ DateType.MONTH -> TODO()
+ DateType.YEAR -> TODO()
+ }
+ packageAdapter.updatePackages(packages)
+ binding.textPackageCount.text = "${packageAdapter.itemCount}个"
}
private fun observePackages() {
viewModel.getPackages(
@@ -235,8 +229,8 @@
updatePieChartData()
}
else -> {
- packageAdapter.updatePackages(packages)
- }
+ packageAdapter.updatePackages(packages)
+ }
}
binding.textPackageCount.text = "${packages.size}个"
}
--
Gitblit v1.9.3