From 93775e1f3d79a1e11b839abbf24201dafcd9e646 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 25 四月 2025 13:45:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt b/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
index db81d86..9cfcf78 100644
--- a/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
@@ -302,8 +302,8 @@
// 其他标签点击事件需要检查会员状态
val memberOnlyTabs = mapOf(
tabIncome to { homeViewModel.loadIncomeData() },
- tabFlight to { homeViewModel.loadFlightData() },
- tabTrain to { homeViewModel.loadTrainData() }
+// tabFlight to { homeViewModel.loadFlightData() },
+// tabTrain to { homeViewModel.loadTrainData() }
)
memberOnlyTabs.forEach { (tab, loadAction) ->
@@ -312,8 +312,8 @@
hideAllRecyclers()
when (tab) {
tabIncome -> incomeRecycler.visibility = View.VISIBLE
- tabFlight -> flightRecycler.visibility = View.VISIBLE
- tabTrain -> trainRecycler.visibility = View.VISIBLE
+// tabFlight -> flightRecycler.visibility = View.VISIBLE
+// tabTrain -> trainRecycler.visibility = View.VISIBLE
}
updateTabStyles(tab)
loadAction()
@@ -367,7 +367,8 @@
private fun updateTabStyles(selectedTab: UnderlineTextView) {
binding.apply {
- val tabs = listOf(tabExpress, tabFinance, tabIncome, tabFlight, tabTrain)
+// val tabs = listOf(tabExpress, tabFinance, tabIncome, tabFlight, tabTrain)
+ val tabs = listOf(tabExpress, tabFinance, tabIncome)
tabs.forEach { tab ->
// 设置文字颜色为黑色或灰色
tab.setTextColor(ContextCompat.getColor(requireContext(),
@@ -416,8 +417,8 @@
tabExpress.visibility = View.GONE
tabFinance.visibility = View.GONE
tabIncome.visibility = View.GONE
- tabFlight.visibility = View.GONE
- tabTrain.visibility = View.GONE
+// tabFlight.visibility = View.GONE
+// tabTrain.visibility = View.GONE
// 获取用户信息判断是否是会员
val savedPhone = PreferencesManager.getPhone()
@@ -451,14 +452,14 @@
tabIncome.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
if (categories.indexOf(category) == 0 && category.isEnabled) tabIncome.performClick()
}
- "航班" -> {
- tabFlight.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
- if (categories.indexOf(category) == 0 && category.isEnabled) tabFlight.performClick()
- }
- "火车票" -> {
- tabTrain.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
- if (categories.indexOf(category) == 0 && category.isEnabled) tabTrain.performClick()
- }
+// "航班" -> {
+// tabFlight.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
+// if (categories.indexOf(category) == 0 && category.isEnabled) tabFlight.performClick()
+// }
+// "火车票" -> {
+// tabTrain.visibility = if (category.isEnabled) View.VISIBLE else View.GONE
+// if (categories.indexOf(category) == 0 && category.isEnabled) tabTrain.performClick()
+// }
}
}
}
--
Gitblit v1.9.3