From c0c19c8453b837a436e71ec2884d5adbeb89409d Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Fri, 5 Dec 2025 11:41:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20opt=20=E5=87=BA=E6=B8=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/title_tool_bar.xml    |   1 +
 .../gjc/activity/GjcQueryListActivity.kt      |   1 +
 .../gjc/dialog/GjcQueryFilterDialogModel.kt   |   9 ++
 .../main/res/layout/activity_gjc_query.xml    |  13 +-
 .../res/layout/dialog_gjc_query_filter.xml    | 127 ++++++++++--------
 5 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/module_base/src/main/res/layout/title_tool_bar.xml b/module_base/src/main/res/layout/title_tool_bar.xml
index a830bf0..91872c4 100644
--- a/module_base/src/main/res/layout/title_tool_bar.xml
+++ b/module_base/src/main/res/layout/title_tool_bar.xml
@@ -14,6 +14,7 @@
         android:gravity="center">
 
         <ImageView
+            android:id="@+id/tool_iv_back"
             android:layout_width="15dp"
             android:layout_height="15dp"
             android:src="@mipmap/left_icon"
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryListActivity.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryListActivity.kt
index 6ee256b..ec05797 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryListActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryListActivity.kt
@@ -30,6 +30,7 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout
 import java.text.SimpleDateFormat
 import java.util.*
 
+@Deprecated(message = "废弃的国际出港查询页面，由GjcQueryActivity 接管")
 //@Route(path = ARouterConstants.ACTIVITY_URL_GJC_QUERY_LIST)
 class GjcQueryListActivity : BaseActivity(), View.OnClickListener {
     private val currentTitleName = "国际出港查询"
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/GjcQueryFilterDialogModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/GjcQueryFilterDialogModel.kt
index 8a656e7..da00000 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/GjcQueryFilterDialogModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/GjcQueryFilterDialogModel.kt
@@ -1,7 +1,10 @@
 package com.lukouguoji.gjc.dialog
 
 import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.view.View
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.lifecycle.MutableLiveData
 import com.lukouguoji.gjc.R
@@ -61,8 +64,14 @@ class GjcQueryFilterDialogModel(
         binding.model = this
         binding.lifecycleOwner = context as? androidx.lifecycle.LifecycleOwner
 
+        val titleColor = Color.parseColor("#666666")
+
         // 设置标题
         binding.root.findViewById<TextView>(R.id.title_name)?.text = "筛选条件"
+        binding.root.findViewById<TextView>(R.id.title_name)?.setTextColor(titleColor)
+        binding.root.findViewById<TextView>(R.id.tool_tv_back)?.setTextColor(titleColor)
+        binding.root.findViewById<ImageView>(R.id.tool_iv_back)?.imageTintList = ColorStateList.valueOf(titleColor)
+        binding.root.findViewById<View>(R.id.toolbar)?.setBackgroundColor(Color.WHITE)
 
         // 返回按钮
         binding.root.findViewById<View>(R.id.tool_back)?.setOnClickListener {
diff --git a/module_gjc/src/main/res/layout/activity_gjc_query.xml b/module_gjc/src/main/res/layout/activity_gjc_query.xml
index bd9fda0..e0af843 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_query.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_query.xml
@@ -90,13 +90,16 @@
 
                 <!-- 搜索按钮 -->
                 <ImageView
-                    style="@style/iv_search_action"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
                     android:onClick="@{()-> viewModel.searchClick()}"
                     android:src="@drawable/img_search" />
 
                 <!-- 筛选按钮 -->
                 <ImageView
-                    style="@style/iv_search_action"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_marginStart="24dp"
                     android:onClick="@{()-> viewModel.filterClick()}"
                     android:src="@drawable/img_filter" />
 
@@ -141,7 +144,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text='@{`合计：` + viewModel.totalCount + `票`}'
-                    android:textColor="@color/text_normal"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="16sp"
                     android:textStyle="bold"
                     tools:text="合计：3票" />
@@ -151,7 +154,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{`总件数：` + viewModel.totalPc}'
-                    android:textColor="@color/text_normal"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="16sp"
                     android:textStyle="bold"
                     tools:text="总件数：100" />
@@ -161,7 +164,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{`总重量：` + viewModel.totalWeight}'
-                    android:textColor="@color/text_normal"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="16sp"
                     android:textStyle="bold"
                     tools:text="总重量：100" />
diff --git a/module_gjc/src/main/res/layout/dialog_gjc_query_filter.xml b/module_gjc/src/main/res/layout/dialog_gjc_query_filter.xml
index 6a28d84..0239184 100644
--- a/module_gjc/src/main/res/layout/dialog_gjc_query_filter.xml
+++ b/module_gjc/src/main/res/layout/dialog_gjc_query_filter.xml
@@ -2,6 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
+
         <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
 
         <variable
@@ -24,6 +25,10 @@
         <!-- 标题栏 -->
         <include layout="@layout/title_tool_bar" />
 
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="match_parent"
+            android:layout_height="1dp"/>
+
         <!-- 筛选条件区域 -->
         <ScrollView
             android:layout_width="match_parent"
@@ -38,111 +43,115 @@
 
                 <!-- 特码 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
                     hint='@{"请输入特码"}'
                     title='@{"特码"}'
                     titleLength="@{4}"
                     type="@{DataLayoutType.INPUT}"
-                    value='@={model.spCode}' />
+                    value='@={model.spCode}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
 
                 <!-- 航班号 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
                     hint='@{"请输入航班号"}'
                     title='@{"航班号"}'
                     titleLength="@{4}"
                     type="@{DataLayoutType.INPUT}"
-                    value='@={model.flightNo}' />
+                    value='@={model.flightNo}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
 
                 <!-- 目的港 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
                     hint='@{"请输入目的港"}'
                     title='@{"目的港"}'
                     titleLength="@{4}"
                     type="@{DataLayoutType.INPUT}"
-                    value='@={model.dest}' />
+                    value='@={model.dest}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
 
                 <!-- 运单类型 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
                     hint='@{"请选择运单类型"}'
                     list="@{model.awbTypeList}"
                     title='@{"运单类型"}'
                     titleLength="@{4}"
                     type="@{DataLayoutType.SPINNER}"
-                    value='@={model.awbType}' />
+                    value='@={model.awbType}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
 
                 <!-- 业务类型 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
                     hint='@{"请选择业务类型"}'
                     list="@{model.businessTypeList}"
                     title='@{"业务类型"}'
                     titleLength="@{4}"
                     type="@{DataLayoutType.SPINNER}"
-                    value='@={model.businessType}' />
+                    value='@={model.businessType}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
 
                 <!-- 品名(中) -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
                     hint='@{"请输入品名"}'
                     title='@{"品名(中)"}'
                     titleLength="@{4}"
                     type="@{DataLayoutType.INPUT}"
-                    value='@={model.goodsCn}' />
+                    value='@={model.goodsCn}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
+
+                <!-- 底部按钮区域 -->
+                <LinearLayout
+                    android:layout_width="300dp"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="32dp"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="15dp">
+
+                    <!-- 重置按钮 -->
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="40dp"
+                        android:layout_marginRight="24dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_primary_radius_4"
+                        android:gravity="center"
+                        android:onClick="@{()-> model.onResetClick()}"
+                        android:text="重置"
+                        android:textColor="@color/white"
+                        android:textSize="16sp" />
+
+                    <!-- 搜索按钮 -->
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="40dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_primary_radius_4"
+                        android:gravity="center"
+                        android:onClick="@{()-> model.onConfirmClick()}"
+                        android:text="搜索"
+                        android:textColor="@color/white"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
 
             </LinearLayout>
 
+
         </ScrollView>
 
-        <!-- 底部按钮区域 -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingHorizontal="15dp">
-
-            <!-- 重置按钮 -->
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_marginRight="10dp"
-                android:layout_weight="1"
-                android:background="@drawable/bg_gray_radius_4"
-                android:gravity="center"
-                android:onClick="@{()-> model.onResetClick()}"
-                android:text="重置"
-                android:textColor="@color/text_normal"
-                android:textSize="16sp" />
-
-            <!-- 搜索按钮 -->
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_weight="1"
-                android:background="@drawable/bg_primary_radius_4"
-                android:gravity="center"
-                android:onClick="@{()-> model.onConfirmClick()}"
-                android:text="搜索"
-                android:textColor="@color/white"
-                android:textSize="16sp" />
-
-        </LinearLayout>
 
     </LinearLayout>