From f67cf3b81a00f732ca743431258ae6b78f5f40ab Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期四, 17 四月 2025 15:05:28 +0800
Subject: [PATCH] 11、我的 切换头像 点击切换头像没有显示允许存储权限的窗口，华为的手机目前有 49、首页 实时刷新 点击全部取件或其他分类后，回到上一层，内容没有刷新（5个分类） 52、数据统计 数据统计 1.周月年的柱状图统计逻辑需要修改为只统计快递类的数据 2.按年的图形统计，右下方加上图示说明 53、首页 首页登录 点击用户协议、隐私政策无反应
---
app/src/main/java/com/example/firstapp/activity/PickupActivity.kt | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 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 d7dda6d..8c7cac4 100644
--- a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
@@ -14,11 +14,25 @@
class PickupActivity : AppCompatActivity() {
private lateinit var binding: ActivityPickupBinding
private lateinit var expressAdapter: ExpressPackageAdapter
+
+ // 添加类型常量
+ companion object {
+ 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
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityPickupBinding.inflate(layoutInflater)
setContentView(binding.root)
+
+ // 获取页面类型
+ pageType = intent.getStringExtra("page_type") ?: TYPE_EXPRESS
initViews()
loadData()
@@ -39,17 +53,41 @@
finish()
}
- // 修改底部按钮点击事件
- binding.btnPickupAll.setOnClickListener {
- showPickupConfirmDialog()
+ // 设置底部按钮文本并添加点击事件
+ binding.btnPickupAll.apply {
+ text = getButtonText()
+ setOnClickListener {
+ showPickupConfirmDialog()
+ }
}
+ }
+ private fun getConfirmMessage(): String {
+ return when (pageType) {
+ TYPE_EXPRESS -> "是否确认取出所有包裹？"
+ TYPE_REPAYMENT -> "是否确认处理所有还款？"
+ TYPE_INCOME -> "是否确认处理所有收入？"
+ TYPE_TRAIN -> "是否确认处理所有火车票？"
+ TYPE_FLIGHT -> "是否确认处理所有机票？"
+ else -> "是否确认处理所有项目？"
+ }
+ }
+
+ private fun getButtonText(): String {
+ return when (pageType) {
+ TYPE_EXPRESS -> "全部取件"
+ TYPE_REPAYMENT -> "全部还款"
+ TYPE_INCOME -> "全部收款"
+ TYPE_TRAIN -> "全部处理票务"
+ TYPE_FLIGHT -> "全部处理机票"
+ else -> "全部处理"
+ }
}
private fun showPickupConfirmDialog() {
AlertDialog.Builder(this)
- .setTitle("确认取件")
- .setMessage("是否确认取出所有包裹？")
+ .setTitle(getButtonText())
+ .setMessage(getConfirmMessage())
.setPositiveButton("确认") { _, _ ->
handlePickupAll()
}
@@ -84,7 +122,7 @@
// 清空列表
expressAdapter.submitList(emptyList())
// 更新包裹数量显示
- binding.tvPackageCount.text = "共0个包裹"
+ binding.tvPackageCount.text = getCountText(0)
// 通知MainActivity刷新
setResult(RESULT_OK)
} catch (e: Exception) {
@@ -92,6 +130,17 @@
// 如果出错则重新加载数据
loadData()
}
+ }
+ }
+
+ private fun getCountText(count: Int): String {
+ return when (pageType) {
+ TYPE_EXPRESS -> "共${count}个包裹"
+ TYPE_REPAYMENT -> "共${count}笔还款"
+ TYPE_INCOME -> "共${count}笔收入"
+ TYPE_TRAIN -> "共${count}张车票"
+ TYPE_FLIGHT -> "共${count}张机票"
+ else -> "共${count}个"
}
}
@@ -112,7 +161,7 @@
expressAdapter.submitList(packages)
binding.tvStationName.text = stationName
- binding.tvPackageCount.text = "共${packages.size}个包裹"
+ binding.tvPackageCount.text = getCountText(packages.size)
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3