From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

---
 app/src/main/java/com/example/firstapp/ui/dashboard/DashboardViewModel.kt |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardViewModel.kt b/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardViewModel.kt
index 6d8b8fe..192b2ed 100644
--- a/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardViewModel.kt
+++ b/app/src/main/java/com/example/firstapp/ui/dashboard/DashboardViewModel.kt
@@ -21,10 +21,14 @@
     fun getPackages(date: Long, dateType: String) =
         repository.getPackages(date, dateType).asLiveData()
 
+    fun getPackagesReaded(date: Long, dateType: String) =
+        repository.getPackagesReaded(date, dateType).asLiveData()
+
     fun getCourierStats(date: Long, dateType: String) = 
         repository.getCourierStats(date, dateType).asLiveData()
 
     fun getYearlyHeatmap(date: Long) = repository.getYearlyHeatmap(date).asLiveData()
+
 
     fun getWeeklyStats(date: Long, weekCount: Int = 6) = 
         repository.getWeeklyStats(date, weekCount).asLiveData()
@@ -39,4 +43,14 @@
     fun insert(code: Code) = viewModelScope.launch {
         repository.insert(code)
     }
+
+    fun getCurrentWeekStats(date: Long) =
+        repository.getCurrentWeekStats(date).asLiveData()
+
+    fun getCurrentYearStats(date: Long) =
+        repository.getCurrentYearStats(date).asLiveData()
+
+    fun getCurrentWeekStats2(startDateCur: String, endDateCur: String) = repository.getCurrentWeekStats2(startDateCur,endDateCur).asLiveData()
+    fun getWeeklyStatsChart(startDateCur: String, endDateCur: String) =  repository.getWeeklyStatsChart(startDateCur, endDateCur).asLiveData()
+    fun getCurrentDayStatsByType(startDateCur: String, endDateCur: String,type: String) =repository.getDateStatsByType(startDateCur, endDateCur,type).asLiveData()
 }
\ No newline at end of file

--
Gitblit v1.9.3