From d5bc14f0f11c81cb8137c3571ca9694b48b38c91 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Fri, 5 Dec 2025 12:55:32 +0800
Subject: [PATCH] feat: ui opt

---
 .../layout/activity_gjc_box_weighing_add.xml  | 10 ++++----
 .../res/layout/activity_gjc_inspection.xml    | 14 ++++++-----
 .../activity_gjc_inspection_details.xml       |  4 ++--
 .../res/layout/activity_gjc_weighing_list.xml | 20 ++++++++--------
 .../activity_gjc_weighing_record_list.xml     | 13 ++++++-----
 .../layout/activity_gjc_weighing_start.xml    | 23 +++++++++----------
 6 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml
index b281f91..c8a582a 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml
@@ -374,15 +374,15 @@
                         android:id="@+id/sCenter"
                         android:layout_width="32dp"
                         android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"/>
+                        android:layout_centerInParent="true" />
 
                     <CheckBox
-                        android:layout_toStartOf="@+id/btnReset"
                         android:id="@+id/cbPrint"
-                        android:layout_centerVertical="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
                         android:layout_marginEnd="32dp"
+                        android:layout_toStartOf="@+id/btnReset"
                         android:checked="@={viewModel.printTag}"
                         android:text="打印挂签"
                         android:textColor="@color/black"
@@ -390,9 +390,9 @@
 
                     <TextView
                         android:id="@+id/btnReset"
-                        android:layout_toStartOf="@+id/sCenter"
                         android:layout_width="120dp"
                         android:layout_height="50dp"
+                        android:layout_toStartOf="@+id/sCenter"
                         android:background="@drawable/bg_primary_radius_4"
                         android:gravity="center"
                         android:onClick="@{(v)-> viewModel.resetClick()}"
@@ -401,9 +401,9 @@
                         android:textSize="18sp" />
 
                     <TextView
-                        android:layout_toEndOf="@+id/sCenter"
                         android:layout_width="120dp"
                         android:layout_height="50dp"
+                        android:layout_toEndOf="@+id/sCenter"
                         android:background="@drawable/bg_primary_radius_4"
                         android:gravity="center"
                         android:onClick="@{(v)-> viewModel.confirmClick()}"
diff --git a/module_gjc/src/main/res/layout/activity_gjc_inspection.xml b/module_gjc/src/main/res/layout/activity_gjc_inspection.xml
index b5b5426..ea4e98a 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_inspection.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_inspection.xml
@@ -83,10 +83,12 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
                 android:layout_weight="1">
 
                 <ImageView
-                    style="@style/iv_search_action"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
                     android:onClick="@{()-> viewModel.searchClick()}"
                     android:src="@drawable/img_search" />
 
@@ -116,7 +118,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/color_bottom_layout"
+            android:background="@color/white"
             android:gravity="center_vertical"
             android:paddingHorizontal="15dp">
 
@@ -131,7 +133,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="全选"
-                    android:textColor="@color/white"
+                    android:textColor="@color/c666666"
                     android:textSize="16sp" />
 
                 <ImageView
@@ -156,7 +158,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text='@{"合计："+viewModel.totalCount+"票"}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="16sp"
                     android:textStyle="bold"
                     tools:text="合计：11票" />
@@ -166,7 +168,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总件数："+viewModel.totalPc}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="16sp"
                     android:textStyle="bold"
                     tools:text="总件数：100" />
@@ -176,7 +178,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总重量："+viewModel.totalWeight}'
-                    android:textColor="@color/white"
+                    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/activity_gjc_inspection_details.xml b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
index 0db2014..39296a3 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
@@ -95,7 +95,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="15dp"
+                        android:layout_marginBottom="12dp"
                         android:text="运单信息"
                         android:textColor="@color/color_33"
                         android:textSize="16sp"
@@ -315,7 +315,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="56dp"
-                    android:layout_marginTop="24dp"
+                    android:layout_marginTop="12dp"
                     android:gravity="center"
                     android:paddingHorizontal="15dp">
 
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 392f620..bac435f 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
@@ -87,17 +87,17 @@
                 android:gravity="center">
 
                 <ImageView
-                    style="@style/iv_search_action"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
                     android:onClick="@{()-> viewModel.searchClick()}"
                     android:src="@drawable/img_search" />
 
                 <!-- 添加按钮 -->
                 <ImageView
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginLeft="10dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_marginLeft="15dp"
                     android:onClick="@{()-> viewModel.addClick()}"
-                    android:padding="5dp"
                     android:src="@drawable/img_add" />
 
             </LinearLayout>
@@ -126,7 +126,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/color_bottom_layout"
+            android:background="@color/white"
             android:gravity="center_vertical"
             android:paddingHorizontal="15dp">
 
@@ -142,7 +142,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text='@{"合计："+viewModel.totalCount+"票"}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="合计：1票" />
@@ -152,7 +152,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总件数："+viewModel.totalPc}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="总件数：100" />
@@ -162,7 +162,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总重量："+viewModel.totalWeight}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="总重量：100" />
@@ -172,7 +172,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总货重："+viewModel.cargoWeight}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="总货重：100" />
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
index 479841c..6c32851 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
@@ -87,7 +87,8 @@
                 android:gravity="center">
 
                 <ImageView
-                    style="@style/iv_search_action"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
                     android:onClick="@{()-> viewModel.searchClick()}"
                     android:src="@drawable/img_search" />
 
@@ -117,7 +118,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/color_bottom_layout"
+            android:background="@color/white"
             android:gravity="center_vertical"
             android:paddingHorizontal="15dp">
 
@@ -133,7 +134,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text='@{"合计："+viewModel.totalCount+"票"}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="合计：1票" />
@@ -143,7 +144,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总件数："+viewModel.totalPc}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="总件数：100" />
@@ -153,7 +154,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总重量："+viewModel.totalWeight}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="总重量：100" />
@@ -163,7 +164,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总货重："+viewModel.cargoWeight}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="总货重：100" />
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
index 799bd45..392c8da 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
@@ -30,12 +30,13 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:padding="15dp">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_white_radius_8"
                     android:orientation="vertical"
-                    android:padding="20dp">
+                    android:padding="15dp">
 
                     <!-- 第一部分：前2行表单（左侧2列）+ 地磅称重（右侧） -->
                     <LinearLayout
@@ -84,7 +85,7 @@
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
+                                android:layout_marginTop="8dp"
                                 android:orientation="horizontal">
 
                                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
@@ -173,7 +174,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="8dp"
                         android:orientation="horizontal">
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
@@ -214,7 +215,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="8dp"
                         android:orientation="horizontal">
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
@@ -255,7 +256,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="8dp"
                         android:orientation="horizontal">
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
@@ -296,7 +297,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="8dp"
                         android:orientation="horizontal">
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
@@ -337,7 +338,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="8dp"
                         android:orientation="horizontal">
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
@@ -385,7 +386,7 @@
                         value='@={viewModel.dataBean.remark}'
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp" />
+                        android:layout_marginTop="8dp" />
 
                 </LinearLayout>
 
@@ -394,9 +395,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:paddingTop="15dp"
                     android:orientation="horizontal"
-                    android:padding="15dp">
+                    android:padding="15dp"
+                    android:paddingTop="15dp">
 
                     <TextView
                         android:layout_width="150dp"
@@ -423,10 +424,8 @@
             </LinearLayout>
 
 
-
         </ScrollView>
 
 
-
     </LinearLayout>
 </layout>