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/activity/PickupActivity.kt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
index 9713e2c..d7dda6d 100644
--- a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
@@ -61,7 +61,7 @@
lifecycleScope.launch {
try {
// 处理单个包裹取件
-// Core.code.pickup(pack.trackingNumber)
+ Core.code.pickup(pack.id)
// 重新加载数据
loadData()
// 通知MainActivity刷新
@@ -79,7 +79,7 @@
val packages = expressAdapter.currentList
// 批量处理取件
packages.forEach { pack ->
-// Core.code.pickup(pack.trackingNumber)
+ Core.code.pickup(pack.id)
}
// 清空列表
expressAdapter.submitList(emptyList())
@@ -103,9 +103,10 @@
val codes = Core.code.getByKeyword(stationName)
val packages = codes.map { code ->
ExpressPackage(
- company = code.name ?: company,
+ id = code.id,
+ company = code.secondLevel ?: company,
trackingNumber = code.code,
- date = code.overtime
+ createTime = code.createTime
)
}
--
Gitblit v1.9.3