From e1e16fbd9e52a953e1b3abf16db3aa663f2dbfab Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Fri, 5 Dec 2025 11:54:49 +0800
Subject: [PATCH] feat: ui opt

---
 .../aerologic/ui/fragment/HomeFragment.kt     | 37 ++++++++++---------
 .../layout/activity_gjc_assemble_allocate.xml | 14 ++++---
 .../main/res/layout/activity_int_exp_move.xml | 13 ++++---
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt
index 6651e89..3db4959 100644
--- a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt
@@ -360,12 +360,14 @@ class HomeFragment : Fragment() {
                     }
                     // 组装分配
                     Constant.AuthName.GjcAssembleAllocateActivity -> {
-                        ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_GJC_ASSEMBLE_ALLOCATE)
+                        ARouter.getInstance()
+                            .build(ARouterConstants.ACTIVITY_URL_GJC_ASSEMBLE_ALLOCATE)
                             .navigation()
                     }
                     // 出库交接
                     Constant.AuthName.GjcIntExpOutHandover -> {
-                        ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_EXP_OUT_HANDOVER)
+                        ARouter.getInstance()
+                            .build(ARouterConstants.ACTIVITY_URL_INT_EXP_OUT_HANDOVER)
                             .navigation()
                     }
                     // 出港运抵
@@ -655,6 +657,22 @@ class HomeFragment : Fragment() {
                     )
                 )
 
+                list.add(
+                    RightMenu(
+                        Constant.AuthName.GjcQueryListActivity,
+                        R.mipmap.gjc_query_icon,
+                        "出港查询"
+                    )
+                )
+
+                list.add(
+                    RightMenu(
+                        Constant.AuthName.GjcYiKuListActivity,
+                        R.mipmap.gjc_yi_ku_icon,
+                        "出港移库"
+                    )
+                )
+
                 list.add(
                     RightMenu(
                         Constant.AuthName.GjcAssembleAllocateActivity,
@@ -687,21 +705,6 @@ class HomeFragment : Fragment() {
 //                    )
 //                )
 
-                list.add(
-                    RightMenu(
-                        Constant.AuthName.GjcYiKuListActivity,
-                        R.mipmap.gjc_yi_ku_icon,
-                        "出港移库"
-                    )
-                )
-
-                list.add(
-                    RightMenu(
-                        Constant.AuthName.GjcQueryListActivity,
-                        R.mipmap.gjc_query_icon,
-                        "出港查询"
-                    )
-                )
 
 //                list.add(
 //                    RightMenu(
diff --git a/module_gjc/src/main/res/layout/activity_gjc_assemble_allocate.xml b/module_gjc/src/main/res/layout/activity_gjc_assemble_allocate.xml
index 8014fc9..d02dc40 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_assemble_allocate.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_assemble_allocate.xml
@@ -79,10 +79,12 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:gravity="center"
                 android:layout_weight="1">
 
                 <ImageView
-                    style="@style/iv_search_action"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
                     android:onClick="@{()-> viewModel.searchClick()}"
                     android:src="@drawable/img_search" />
 
@@ -112,7 +114,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">
 
@@ -127,7 +129,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
@@ -152,7 +154,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="合计：1票" />
@@ -162,7 +164,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" />
@@ -172,7 +174,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_int_exp_move.xml b/module_gjc/src/main/res/layout/activity_int_exp_move.xml
index 0dbca20..7e7c52b 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_move.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_move.xml
@@ -92,7 +92,8 @@
                 android:orientation="horizontal">
 
                 <ImageView
-                    style="@style/iv_search_action"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
                     android:onClick="@{()-> viewModel.searchClick()}"
                     android:src="@drawable/img_search" />
             </LinearLayout>
@@ -121,7 +122,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">
 
@@ -132,7 +133,7 @@
                 android:layout_height="wrap_content"
                 android:onClick="@{()-> viewModel.toggleSelectAll()}"
                 android:text="全选"
-                android:textColor="@color/white"
+                android:textColor="@color/c666666"
                 android:textSize="16sp" />
 
             <!-- 统计信息 -->
@@ -148,7 +149,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" />
 
@@ -157,7 +158,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:text='@{"总件数："+viewModel.totalPieces}'
-                    android:textColor="@color/white"
+                    android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
 
@@ -166,7 +167,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" />
             </LinearLayout>