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/adapter/ExpressAdapter.kt | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/adapter/ExpressAdapter.kt b/app/src/main/java/com/example/firstapp/adapter/ExpressAdapter.kt
index 8db9999..3f2d7b2 100644
--- a/app/src/main/java/com/example/firstapp/adapter/ExpressAdapter.kt
+++ b/app/src/main/java/com/example/firstapp/adapter/ExpressAdapter.kt
@@ -85,6 +85,7 @@
stationName.contains("妈妈") -> R.drawable.express_mama
stationName.contains("小兵") -> R.drawable.express_xiaobing
stationName.contains("蓝店") -> R.drawable.express_landian
+ stationName.contains("丰巢") -> R.drawable.express_fengchao
else -> R.drawable.express_normal
}
@@ -152,8 +153,10 @@
companyName.contains("韵达") -> R.drawable.express_package_yunda
companyName.contains("圆通") -> R.drawable.express_package_yuantong
companyName.contains("申通") -> R.drawable.express_package_shentong
+ companyName.contains("中通") -> R.drawable.express_package_zhongtong
companyName.contains("邮政") || companyName.contains("ems") -> R.drawable.express_package_youzheng
companyName.contains("极兔") -> R.drawable.express_package_jitu
+ companyName.contains("丰巢") -> R.drawable.express_fengchao
else -> R.drawable.express_normal
}
@@ -228,8 +231,10 @@
companyName.contains("韵达") -> R.drawable.express_package_yunda
companyName.contains("圆通") -> R.drawable.express_package_yuantong
companyName.contains("申通") -> R.drawable.express_package_shentong
+ companyName.contains("中通") -> R.drawable.express_package_zhongtong
companyName.contains("邮政") || companyName.contains("ems") -> R.drawable.express_package_youzheng
companyName.contains("极兔") -> R.drawable.express_package_jitu
+ companyName.contains("丰巢") -> R.drawable.express_fengchao
else -> R.drawable.express_normal
}
--
Gitblit v1.9.3