From acb5be78c07b8499d0a38515b05a4982207c1c9a Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 15:24:16 +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 | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 4c3032e..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,11 +21,36 @@
fun getPackages(date: Long, dateType: String) =
repository.getPackages(date, dateType).asLiveData()
- fun getCourierStats(date: Long) = repository.getCourierStats(date).asLiveData()
+ fun getPackagesReaded(date: Long, dateType: String) =
+ repository.getPackagesReaded(date, dateType).asLiveData()
- fun getDailyStats() = repository.getDailyStats().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()
+
+ fun getMonthlyStats(date: Long) = repository.getMonthlyStats(date).asLiveData()
+
+ fun getYearlyStats(date: Long) = repository.getYearlyStats(date).asLiveData()
+
+ fun getYearMonthlyStats(date: Long) =
+ repository.getYearMonthlyStats(date).asLiveData()
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