From 710b85de9aee506dea8c91496e0532236de0f787 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Sat, 27 Dec 2025 18:07:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20opt=20=E5=8E=9F=E8=88=B1=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/activity_int_arr_air_manifest.xml  | 154 ++++++++++--------
 1 file changed, 82 insertions(+), 72 deletions(-)

diff --git a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml
index f0d41f8..d8aad2d 100644
--- a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml
+++ b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml
@@ -24,16 +24,18 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:orientation="horizontal"
-            android:padding="15dp">
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <!-- 航班日期 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                hint="@{`请选择航班日期`}"
+                hint='@{"请选择航班日期"}'
+                icon="@{@drawable/img_date}"
                 type="@{SearchLayoutType.DATE}"
                 value="@={viewModel.flightDate}" />
 
@@ -42,7 +44,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                hint="@{`请输入航班号`}"
+                hint='@{"请输入航班号"}'
                 type="@{SearchLayoutType.INPUT}"
                 value="@={viewModel.flightNo}" />
 
@@ -51,7 +53,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                hint="@{`请输入运单号`}"
+                hint='@{"请输入运单号"}'
                 icon="@{@drawable/scan_code}"
                 setOnIconClickListener="@{(v)-> viewModel.scanWaybill()}"
                 type="@{SearchLayoutType.INPUT}"
@@ -62,17 +64,29 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                hint="@{`请输入分单号`}"
+                hint='@{"请输入分单号"}'
                 icon="@{@drawable/scan_code}"
                 setOnIconClickListener="@{(v)-> viewModel.scanHouseNo()}"
                 type="@{SearchLayoutType.INPUT}"
                 value="@={viewModel.houseNo}" />
 
             <!-- 搜索按钮 -->
-            <ImageView
-                style="@style/iv_search_action"
-                android:onClick="@{()-> viewModel.searchClick()}"
-                android:src="@drawable/img_search" />
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_vertical|start"
+                android:orientation="horizontal"
+                android:paddingHorizontal="24dp">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:onClick="@{()-> viewModel.searchClick()}"
+                    android:padding="2dp"
+                    android:src="@drawable/img_search" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -81,125 +95,121 @@
             android:id="@+id/srl"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_marginTop="10dp">
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_weight="1">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp"
+                android:overScrollMode="never"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 itemLayoutId="@{viewModel.itemLayoutId}"
                 viewHolder="@{viewModel.itemViewHolder}" />
 
         </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
-        <!-- 底部工具栏 -->
+        <!-- 底部统计和操作按钮 -->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:background="@color/color_bottom_layout"
+            android:layout_height="50dp"
+            android:background="@android:color/white"
             android:gravity="center_vertical"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp">
+            android:paddingHorizontal="15dp">
 
             <!-- 全选按钮 -->
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="5dp"
                 android:gravity="center_vertical"
-                android:onClick="@{()-> viewModel.checkAllClick()}">
+                android:onClick="@{()-> viewModel.checkAllClick()}"
+                android:orientation="horizontal">
 
                 <ImageView
                     android:id="@+id/checkIcon"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
                     android:src="@drawable/img_check_all" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
                     android:text="全选"
-                    android:textColor="@color/white"
+                    android:textColor="@color/color_66"
                     android:textSize="18sp" />
 
             </LinearLayout>
 
-            <!-- 合计信息 -->
+            <!-- 统计信息 -->
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
                 android:layout_weight="1"
-                android:layout_marginLeft="30dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="20dp"
-                    android:text='@{"合计:"+viewModel.totalCount+"票"}'
-                    android:textColor="@color/white"
-                    android:textSize="16sp" />
+                    android:text='@{"合计："+viewModel.totalCount+"票"}'
+                    android:textColor="@color/bottom_tool_tips_text_color"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="20dp"
-                    android:text='@{"总件数:"+viewModel.totalPc}'
-                    android:textColor="@color/white"
-                    android:textSize="16sp" />
+                    android:layout_marginLeft="20dp"
+                    android:text='@{"总件数："+viewModel.totalPc}'
+                    android:textColor="@color/bottom_tool_tips_text_color"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text='@{"总重量:"+viewModel.totalWeight}'
-                    android:textColor="@color/white"
-                    android:textSize="16sp" />
+                    android:layout_marginLeft="20dp"
+                    android:text='@{"总重量："+viewModel.totalWeight}'
+                    android:textColor="@color/bottom_tool_tips_text_color"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
             </LinearLayout>
 
-            <!-- 操作按钮区域 -->
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+            <!-- 状态重置按钮 (蓝色) -->
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:onClick="@{()-> viewModel.resetStatusClick()}"
+                android:text="状态重置" />
 
-                <!-- 状态重置 -->
-                <TextView
-                    style="@style/tv_bottom_btn"
-                    android:layout_marginRight="10dp"
-                    android:background="@drawable/bg_blue_radius_4"
-                    android:onClick="@{()-> viewModel.resetStatusClick()}"
-                    android:text="状态重置" />
+            <!-- 补充信息按钮 (蓝色) -->
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:onClick="@{()-> viewModel.supplementInfoClick()}"
+                android:text="补充信息" />
 
-                <!-- 补充信息 -->
-                <TextView
-                    style="@style/tv_bottom_btn"
-                    android:layout_marginRight="10dp"
-                    android:background="@drawable/bg_blue_radius_4"
-                    android:onClick="@{()-> viewModel.supplementInfoClick()}"
-                    android:text="补充信息" />
+            <!-- 删除申报按钮 (蓝色) -->
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:onClick="@{()-> viewModel.deleteDeclarationClick()}"
+                android:text="删除申报" />
 
-                <!-- 删除申报 -->
-                <TextView
-                    style="@style/tv_bottom_btn"
-                    android:layout_marginRight="10dp"
-                    android:background="@drawable/bg_blue_radius_4"
-                    android:onClick="@{()-> viewModel.deleteDeclarationClick()}"
-                    android:text="删除申报" />
-
-                <!-- 舱单申报 -->
-                <TextView
-                    style="@style/tv_bottom_btn"
-                    android:background="@drawable/bg_red_radius_4"
-                    android:onClick="@{()-> viewModel.declareClick()}"
-                    android:text="舱单申报" />
-
-            </LinearLayout>
+            <!-- 舱单申报按钮 (红色) -->
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/bg_red_btn_bottom"
+                android:gravity="center"
+                android:onClick="@{()-> viewModel.declareClick()}"
+                android:text="舱单申报"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
 
         </LinearLayout>