From dde2eeddbaf07246da7c2c352e7d49ec63fddcd2 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 28 三月 2025 14:56:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt
index c8c6c17..7b5c3fb 100644
--- a/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt
@@ -29,16 +29,16 @@
fun loadExpressData() {
viewModelScope.launch {
// 1. 获取所有驿站类型的提醒设置
- val stations = Core.reminder.getByType("驿站")
+ val stations = Core.reminder.getByType("快递")
// 2. 按驿站分组获取包裹信息
val groups = stations.map { station ->
val packages = Core.code.getByKeyword(station.nickname).map { code ->
ExpressPackage(
id = code.id, //ID
- company = code.name, //快递公司
+ company = code.secondLevel, //快递公司
trackingNumber = code.code, // 取件码
- createTime = code.createtime //快递时间
+ createTime = code.createTime //快递时间
)
}
ExpressGroup(
@@ -53,16 +53,16 @@
fun loadFinanceData() {
viewModelScope.launch {
// 1. 获取所有驿站类型的提醒设置
- val stations = Core.reminder.getByType("财务")
+ val stations = Core.reminder.getByType("还款")
// 2. 按驿站分组获取包裹信息
val groups = stations.map { station ->
val packages = Core.code.getByKeyword(station.nickname).map { code ->
FinancePackage(
id = code.id, //ID
- company = code.name, //快递公司
+ company = code.secondLevel, //快递公司
trackingNumber = code.code, // 取件码
- createTime = code.createtime //快递时间
+ createTime = code.createTime //快递时间
)
}
FinanceGroup(
--
Gitblit v1.9.3