Merge remote-tracking branch 'origin/master'

tj

2025-03-28 dde2eeddbaf07246da7c2c352e7d49ec63fddcd2

 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
                )
            }