diff --git a/CLAUDE.md b/CLAUDE.md
index a611653..15b587e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -124,11 +124,12 @@ class XxxViewModel : BasePageViewModel() {
-
+
+
@@ -842,6 +843,7 @@ companion object {
- 标题栏统一用 `title_tool_bar` — 禁止手动编写 Toolbar
- 优先使用 PadDataLayoutNew 和 PadSearchLayout 组件
- 在每个页面布局时,如有截图,务必尽可能还原图片上的页面设计,而不是推测假想。如有困难一律要询问,禁止自己想象
+- 工具栏图标尺寸规范: `img_search` 36dp + padding 2dp;`img_add` 40dp 无 padding(使用 `drawable/img_add.xml` 矢量图,`drawable-xhdpi/img_add.png` 已废弃删除)
- 常用资源: `bg_white_radius_8`、`colorPrimary`、`text_normal`、`text_gray`、`color_bottom_layout`
### 环境配置
diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
index c3632ef..d364ae4 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
@@ -100,11 +100,10 @@
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
index 8b83035..8bcfffe 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
@@ -104,11 +104,10 @@
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml b/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml
index 51bbd59..c25ff19 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml
@@ -97,11 +97,10 @@
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_accident_visa.xml b/module_gjj/src/main/res/layout/activity_int_imp_accident_visa.xml
index d5a745f..d9dc1b5 100644
--- a/module_gjj/src/main/res/layout/activity_int_imp_accident_visa.xml
+++ b/module_gjj/src/main/res/layout/activity_int_imp_accident_visa.xml
@@ -99,11 +99,10 @@
android:src="@drawable/img_search" />
diff --git a/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt b/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt
index 2ff0fb9..2d31712 100644
--- a/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt
+++ b/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt
@@ -20,7 +20,8 @@ class HbQueryListViewModel : BasePageViewModel() {
val date = MutableLiveData(DateUtils.getCurrentTime().formatDate())
val fNo = MutableLiveData("")
- val range = MutableLiveData("")
+ val dep = MutableLiveData("") // 始发站
+ val dest = MutableLiveData("") // 目的站
val addressType = MutableLiveData("")
val serviceType = MutableLiveData("")
@@ -59,7 +60,7 @@ class HbQueryListViewModel : BasePageViewModel() {
"limit" to pageModel.limit,
"fdate" to date.value,
"fno" to fNo.value,
- "range" to range.value,
+ "range" to buildRange(),
"countryType" to addressType.value,
"serviceType" to serviceType.value,
).toRequestBody()
@@ -72,6 +73,13 @@ class HbQueryListViewModel : BasePageViewModel() {
}
}
+ private fun buildRange(): String? {
+ val d = dep.value?.trim()
+ val a = dest.value?.trim()
+ if (d.isNullOrEmpty() && a.isNullOrEmpty()) return null
+ return "${d ?: ""}-${a ?: ""}"
+ }
+
override fun onItemClick(position: Int, type: Int) {
val bean = pageModel.rv!!.commonAdapter()!!.getItem(position) as FlightBean
ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_FLIGHT_QUERY_DETAILS)
diff --git a/module_hangban/src/main/res/layout/activity_hb_query_list.xml b/module_hangban/src/main/res/layout/activity_hb_query_list.xml
index 141b48e..5bcb3fe 100644
--- a/module_hangban/src/main/res/layout/activity_hb_query_list.xml
+++ b/module_hangban/src/main/res/layout/activity_hb_query_list.xml
@@ -46,13 +46,29 @@
android:layout_weight="1" />
+ android:layout_weight="0.6" />
+
+
+
+