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/activity/PickupActivity.kt | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 48a6dc1..8c7cac4 100644
--- a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
@@ -20,6 +20,8 @@
const val TYPE_EXPRESS = "express"
const val TYPE_REPAYMENT = "repayment"
const val TYPE_INCOME = "income"
+ const val TYPE_TRAIN = "train"
+ const val TYPE_FLIGHT = "flight"
}
private var pageType = TYPE_EXPRESS
@@ -65,6 +67,8 @@
TYPE_EXPRESS -> "是否确认取出所有包裹？"
TYPE_REPAYMENT -> "是否确认处理所有还款？"
TYPE_INCOME -> "是否确认处理所有收入？"
+ TYPE_TRAIN -> "是否确认处理所有火车票？"
+ TYPE_FLIGHT -> "是否确认处理所有机票？"
else -> "是否确认处理所有项目？"
}
}
@@ -74,6 +78,8 @@
TYPE_EXPRESS -> "全部取件"
TYPE_REPAYMENT -> "全部还款"
TYPE_INCOME -> "全部收款"
+ TYPE_TRAIN -> "全部处理票务"
+ TYPE_FLIGHT -> "全部处理机票"
else -> "全部处理"
}
}
@@ -132,6 +138,8 @@
TYPE_EXPRESS -> "共${count}个包裹"
TYPE_REPAYMENT -> "共${count}笔还款"
TYPE_INCOME -> "共${count}笔收入"
+ TYPE_TRAIN -> "共${count}张车票"
+ TYPE_FLIGHT -> "共${count}张机票"
else -> "共${count}个"
}
}
--
Gitblit v1.9.3