From ca8bc638ba9cbca3f5f6a4d497d45f92e70064f3 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 16 四月 2025 08:44:15 +0800 Subject: [PATCH] add: 火车票和航班处理 --- app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt | 108 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 91 insertions(+), 17 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 a6782f5..03440a8 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 @@ -15,26 +15,27 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.bumptech.glide.Glide import com.example.firstapp.R -import com.example.firstapp.activity.ContentDetailActivity import com.example.firstapp.activity.PickupActivity import com.example.firstapp.activity.VipActivity import com.example.firstapp.adapter.ExpressAdapter import com.example.firstapp.adapter.FinanceAdapter import com.example.firstapp.adapter.CategorySelectorAdapter import com.example.firstapp.adapter.IncomeAdapter +import com.example.firstapp.adapter.TrainAdapter +import com.example.firstapp.adapter.FlightAdapter import com.example.firstapp.database.service.RetrofitClient import com.example.firstapp.databinding.FragmentHomeBinding import com.example.firstapp.databinding.DialogCategorySelectorBinding import com.example.firstapp.model.CategoryConfig -import com.example.firstapp.model.IncomeGroup -import com.example.firstapp.model.IncomePackage import com.example.firstapp.utils.PreferencesManager import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.coroutines.launch import com.example.firstapp.view.UnderlineTextView import com.example.firstapp.activity.ReminderListActivity +import android.graphics.Color +import android.view.Gravity +import android.widget.FrameLayout class HomeFragment : Fragment() { @@ -46,9 +47,11 @@ private lateinit var expressAdapter: ExpressAdapter private lateinit var financeAdapter: FinanceAdapter private lateinit var incomeAdapter: IncomeAdapter - private lateinit var flightAdapter: FinanceAdapter - private lateinit var trainAdapter: FinanceAdapter + private lateinit var flightAdapter: FlightAdapter + private lateinit var trainAdapter: TrainAdapter private lateinit var dataUpdateReceiver: BroadcastReceiver + private lateinit var reminderUpdateReceiver: BroadcastReceiver + private var reminderBadge: TextView? = null //onCreateView这个方法创建后被调用,通常是初始化视图组件和观察者 override fun onCreateView( @@ -94,6 +97,7 @@ setupTabSwitching() setupObservers() setupCategorySelector() + setupUnreadBadge() } override fun onCreate(savedInstanceState: Bundle?) { @@ -105,6 +109,16 @@ if (intent.action == "com.example.firstapp.DATA_UPDATED") { // 收到数据更新广播时重新加载数据 homeViewModel.loadExpressData() + } + } + } + + // 创建提醒更新广播接收器 + reminderUpdateReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + if (intent.action == "com.example.firstapp.REMINDER_UPDATED") { + // 收到提醒更新广播时重新检查未读提醒数量 + homeViewModel.checkUnreadReminders() } } } @@ -173,16 +187,38 @@ binding.flightRecycler.apply { layoutManager = LinearLayoutManager(context) - flightAdapter = FinanceAdapter() + flightAdapter = FlightAdapter() adapter = flightAdapter visibility = View.GONE + + // 设置点击监听 + flightAdapter.setOnPackageClickListener { group, pack -> + // 跳转到航班处理页面 + val intent = Intent(requireContext(), PickupActivity::class.java).apply { + putExtra("station_name", group.stationName) + putExtra("company", pack.company) + putExtra("page_type", PickupActivity.TYPE_FLIGHT) + } + startActivity(intent) + } } binding.trainRecycler.apply { layoutManager = LinearLayoutManager(context) - trainAdapter = FinanceAdapter() + trainAdapter = TrainAdapter() adapter = trainAdapter visibility = View.GONE + + // 设置点击监听 + trainAdapter.setOnPackageClickListener { group, pack -> + // 跳转到火车票页面 + val intent = Intent(requireContext(), PickupActivity::class.java).apply { + putExtra("station_name", group.stationName) + putExtra("company", pack.company) + putExtra("page_type", PickupActivity.TYPE_TRAIN) + } + startActivity(intent) + } } } @@ -207,7 +243,7 @@ updateTabStyles(tabFinance) homeViewModel.loadFinanceData() } - + // 其他标签点击事件需要检查会员状态 val memberOnlyTabs = mapOf( tabIncome to { homeViewModel.loadIncomeData() }, @@ -279,7 +315,7 @@ val tabs = listOf(tabExpress, tabFinance, tabIncome, tabFlight, tabTrain) tabs.forEach { tab -> // 设置文字颜色为黑色或灰色 - tab.setTextColor(ContextCompat.getColor(requireContext(), + tab.setTextColor(ContextCompat.getColor(requireContext(), if (tab == selectedTab) android.R.color.black else R.color.gray)) // 设置文字大小 tab.textSize = if (tab == selectedTab) 16f else 14f @@ -311,6 +347,11 @@ homeViewModel.trainItems.observe(viewLifecycleOwner) { items -> trainAdapter.submitList(items) + } + + // 观察未读提醒数量变化 + homeViewModel.unreadReminderCount.observe(viewLifecycleOwner) { unreadCount -> + updateReminderBadge(unreadCount) } // 观察可见分类的变化 @@ -387,8 +428,19 @@ IntentFilter("com.example.firstapp.DATA_UPDATED"), ContextCompat.RECEIVER_NOT_EXPORTED ) + + // 注册提醒更新广播接收器 + ContextCompat.registerReceiver( + requireContext(), + reminderUpdateReceiver, + IntentFilter("com.example.firstapp.REMINDER_UPDATED"), + ContextCompat.RECEIVER_NOT_EXPORTED + ) + // 加载数据 homeViewModel.loadExpressData() + // 检查未读提醒数量 + homeViewModel.checkUnreadReminders() } override fun onPause() { @@ -396,6 +448,7 @@ try { // 取消注册广播接收器 requireContext().unregisterReceiver(dataUpdateReceiver) + requireContext().unregisterReceiver(reminderUpdateReceiver) } catch (e: Exception) { // 处理可能的异常 e.printStackTrace() @@ -451,9 +504,12 @@ } // 添加提醒按钮点击事件 -// binding.reminderButton.setOnClickListener { -// startActivity(Intent(requireContext(), ReminderListActivity::class.java)) -// } + binding.reminderButton.setOnClickListener { + // 跳转到提醒列表页面 + startActivity(Intent(requireContext(), ReminderListActivity::class.java)) + // 重新检查未读提醒数量 + homeViewModel.checkUnreadReminders() + } } private fun showCategorySelectorDialog() { @@ -481,15 +537,15 @@ adapter.setCategories(categories) } else { // 非会员只能看到快递和还款 - val limitedCategories = categories.filter { - it.name == "快递" || it.name == "还款" + val limitedCategories = categories.filter { + it.name == "快递" || it.name == "还款" } adapter.setCategories(limitedCategories) } } catch (e: Exception) { // 发生错误时只显示基础分类 - val limitedCategories = categories.filter { - it.name == "快递" || it.name == "还款" + val limitedCategories = categories.filter { + it.name == "快递" || it.name == "还款" } adapter.setCategories(limitedCategories) } @@ -503,4 +559,22 @@ dialog.show() } + + // 添加设置未读提醒徽章的方法 + private fun setupUnreadBadge() { + // 直接使用布局中定义的小红点 + reminderBadge = binding.reminderBadge + } + + // 更新未读提醒徽章 + private fun updateReminderBadge(unreadCount: Int) { + reminderBadge?.apply { + if (unreadCount > 0) { + text = if (unreadCount > 99) "99+" else unreadCount.toString() + visibility = View.VISIBLE + } else { + visibility = View.GONE + } + } + } } \ No newline at end of file -- Gitblit v1.9.3