From db2e408f6c2eddc363ed76e0f5fd1e59a02aa175 Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期四, 03 四月 2025 09:12:37 +0800
Subject: [PATCH] 邀请有礼

---
 app/src/main/java/com/example/firstapp/ui/dashboard/DashboardFragment.kt |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 dadbe96..967a83c 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
@@ -23,6 +23,7 @@
 import android.graphics.Color
 import android.widget.GridLayout
 import com.example.firstapp.model.DailyStat
+import com.github.mikephil.charting.components.YAxis
 
 class DashboardFragment : Fragment() {
 
@@ -163,7 +164,8 @@
                 setDrawGridLines(false)
                 granularity = 1f
                 labelRotationAngle = 0f
-                textSize = 12f
+                textSize = 10f  //标签字体
+                setExtraLeftOffset(5f)  // 减少左侧留白
                 setExtraBottomOffset(15f)
             }
 
@@ -189,6 +191,8 @@
             setExtraOffsets(10f, 10f, 10f, 20f)
         }
 
+
+        
         updateBarChartData()
     }
     private fun updateBarChartData() {
@@ -504,7 +508,7 @@
                 binding.recyclerPackages.visibility = View.VISIBLE
                 binding.layoutWeekStats.root.visibility = View.GONE
                 binding.layoutYearStats.root.visibility = View.GONE
-                binding.cardPackageStats.visibility = View.VISIBLE  // 显示包裹统计卡片
+                binding.cardPackageStats.visibility = View.VISIBLE
             }
             DateType.WEEK, DateType.MONTH -> {
                 // 周和月视图显示柱状图和饼图,隐藏包裹列表
@@ -512,8 +516,9 @@
                 binding.layoutWeekStats.root.visibility = View.VISIBLE
                 binding.layoutYearStats.root.visibility = View.GONE
                 binding.layoutWeekStats.chartDailyPackages.visibility = View.VISIBLE
+                (binding.layoutWeekStats.chartDailyPackages.parent as? View)?.visibility = View.VISIBLE
                 binding.layoutWeekStats.heatmapYearly.visibility = View.GONE
-                binding.cardPackageStats.visibility = View.VISIBLE  // 显示包裹统计卡片
+                binding.cardPackageStats.visibility = View.VISIBLE
                 updateBarChartData()
                 updatePieChartData()
             }
@@ -522,12 +527,12 @@
                 binding.recyclerPackages.visibility = View.GONE
                 binding.layoutWeekStats.root.visibility = View.VISIBLE
                 binding.layoutYearStats.root.visibility = View.VISIBLE
-                binding.layoutWeekStats.chartDailyPackages.visibility = View.GONE
+                (binding.layoutWeekStats.chartDailyPackages.parent as? View)?.visibility = View.GONE
                 binding.layoutWeekStats.heatmapYearly.visibility = View.VISIBLE
-                binding.cardPackageStats.visibility = View.GONE  // 隐藏包裹统计卡片
+                binding.cardPackageStats.visibility = View.GONE
                 updateHeatmapData()
                 updatePieChartData()
-                updateYearlyStats()  // 更新年度统计数据
+                updateYearlyStats()
             }
         }
     }

--
Gitblit v1.9.3