Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

zhujie

9 天以前 88b00f3fc74446a1727c93722c7b64179b45a9db

 app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt

@@ -33,9 +33,6 @@
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() {

@@ -133,11 +130,24 @@

            // 设置点击监听
            expressAdapter.setOnPackageClickListener { group, pack ->
                // 根据驿站名称设置相应的图标
                val stationName = group.stationName.lowercase()
                val stationIconResId = when {
                    stationName.isEmpty() || stationName == "未知" -> R.drawable.express_normal
                    stationName.contains("菜鸟") -> R.drawable.express_cainiao
                    stationName.contains("多多") -> R.drawable.express_duoduo
                    stationName.contains("兔喜") -> R.drawable.express_tuxi
                    stationName.contains("妈妈") -> R.drawable.express_mama
                    stationName.contains("小兵") -> R.drawable.express_xiaobing
                    stationName.contains("蓝店") -> R.drawable.express_landian
                    else -> R.drawable.express_normal
                }
                // 跳转到取件页面
                val intent = Intent(requireContext(), PickupActivity::class.java).apply {
                    putExtra("station_name", group.stationName)
                    putExtra("company", pack.company)
                    putExtra("page_type", PickupActivity.TYPE_EXPRESS)
                    putExtra("station_icon_res_id", stationIconResId) // 添加图标资源ID
                }
                startActivity(intent)
            }
@@ -154,11 +164,28 @@

            // 设置点击监听
            financeAdapter.setOnPackageClickListener { group, pack ->
                val stationName = group.stationName.lowercase()
                val stationIconResId = when {
                    stationName.isEmpty() || stationName == "未知" -> R.drawable.finance_huankuan_normal
                    stationName.contains("安逸花") -> R.drawable.finance_anyihua
                    stationName.contains("房贷") -> R.drawable.finance_fangdai
                    stationName.contains("还款") -> R.drawable.finance_huankuan
                    stationName.contains("花呗") -> R.drawable.finance_huabei
                    stationName.contains("借呗") -> R.drawable.finance_jiebei
                    stationName.contains("京东白条") -> R.drawable.finance_jingdongbaitiao
                    stationName.contains("京东金条") -> R.drawable.finance_jingdongjintiao
                    stationName.contains("汽车分期") -> R.drawable.finance_qichefenqi
                    stationName.contains("省呗") -> R.drawable.finance_shenbei
                    stationName.contains("信用卡") -> R.drawable.finance_xingyongka
                    stationName.contains("支付宝") -> R.drawable.finance_zhifubao
                    else -> R.drawable.finance_huankuan_normal
                }
                // 跳转到取件页面
                val intent = Intent(requireContext(), PickupActivity::class.java).apply {
                    putExtra("station_name", group.stationName)
                    putExtra("company", pack.company)
                    putExtra("page_type", PickupActivity.TYPE_REPAYMENT)
                    putExtra("station_icon_res_id", stationIconResId) // 添加图标资源ID

                }
                startActivity(intent)
@@ -176,11 +203,38 @@

            // 设置点击监听
            incomeAdapter.setOnPackageClickListener { group, pack ->

                val stationName = group.stationName.lowercase()
                val stationIconResId = when {
                    stationName.isEmpty() || stationName == "未知" -> R.drawable.finance_income_bank_normal
                    stationName.contains("工商银行") -> R.drawable.bank_gongshang
                    stationName.contains("光大银行") -> R.drawable.bank_guangda
                    stationName.contains("国家开发银行") -> R.drawable.bank_guojiakaifa
                    stationName.contains("恒丰银行") -> R.drawable.bank_hengfeng
                    stationName.contains("华夏银行") -> R.drawable.bank_huaxia
                    stationName.contains("花呗分期") -> R.drawable.bank_huabeifenqi
                    stationName.contains("建设银行") -> R.drawable.bank_jianshe
                    stationName.contains("交通银行") -> R.drawable.bank_jiaotong
                    stationName.contains("民生银行") -> R.drawable.bank_mingsheng
                    stationName.contains("南京银行") -> R.drawable.bank_nanjing
                    stationName.contains("农商银行") -> R.drawable.bank_nongshang
                    stationName.contains("农业银行") -> R.drawable.bank_nongye
                    stationName.contains("平安银行") -> R.drawable.bank_pingan
                    stationName.contains("浦发银行") -> R.drawable.bank_pufa
                    stationName.contains("苏州银行") -> R.drawable.bank_suzhou
                    stationName.contains("邮储银行") -> R.drawable.bank_youzheng
                    stationName.contains("招商银行") -> R.drawable.bank_zhaoshang
                    stationName.contains("中国银行") -> R.drawable.bank_zhongguo
                    stationName.contains("中信银行") -> R.drawable.bank_zhongxin
                    stationName.contains("中原银行") -> R.drawable.bank_zhongyuan
                    else -> R.drawable.finance_income_bank_normal
                }
                // 跳转到取件页面
                val intent = Intent(requireContext(), PickupActivity::class.java).apply {
                    putExtra("station_name", group.stationName)
                    putExtra("company", pack.company)
                    putExtra("page_type", PickupActivity.TYPE_INCOME)
                    putExtra("station_icon_res_id", stationIconResId) // 添加图标资源ID
                }
                startActivity(intent)
            }
@@ -191,7 +245,7 @@
            flightAdapter = FlightAdapter()
            adapter = flightAdapter
            visibility = View.GONE
            

            // 设置点击监听
            flightAdapter.setOnPackageClickListener { group, pack ->
                // 跳转到航班处理页面
@@ -209,7 +263,7 @@
            trainAdapter = TrainAdapter()
            adapter = trainAdapter
            visibility = View.GONE
            

            // 设置点击监听
            trainAdapter.setOnPackageClickListener { group, pack ->
                // 跳转到火车票页面
@@ -573,7 +627,7 @@
        // 直接使用布局中定义的小红点
        reminderBadge = binding.reminderBadge
    }
    

    // 更新未读提醒徽章
    private fun updateReminderBadge(unreadCount: Int) {
        reminderBadge?.apply {