From 30678a54be4eec6bac10796ee86612ea53a4715e Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Mon, 5 Jan 2026 11:29:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF-?=
 =?UTF-8?q?=E5=87=BA=E6=B8=AF=E8=BF=90=E6=8A=B5=20sub=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gjc/holder/IntExpArriveViewHolder.kt      |  18 ++
 .../main/res/layout/item_int_exp_arrive.xml   | 171 +++++++++++++++++-
 .../src/main/res/layout/item_int_exp_load.xml |  16 +-
 3 files changed, 192 insertions(+), 13 deletions(-)

diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpArriveViewHolder.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpArriveViewHolder.kt
index 3d57bdd..b1a9ac4 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpArriveViewHolder.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpArriveViewHolder.kt
@@ -1,9 +1,12 @@
 package com.lukouguoji.gjc.holder
 
 import android.view.View
+import com.lukouguoji.gjc.R
 import com.lukouguoji.gjc.databinding.ItemIntExpArriveBinding
+import com.lukouguoji.module_base.adapter.setCommonAdapter
 import com.lukouguoji.module_base.base.BaseViewHolder
 import com.lukouguoji.module_base.bean.GjcMaWb
+import com.lukouguoji.module_base.ktx.refresh
 
 /**
  * 国际出港-出港运抵 列表项ViewHolder
@@ -25,5 +28,20 @@ class IntExpArriveViewHolder(view: View) :
             // 立即更新UI（图片自动切换）
             binding.executePendingBindings()
         }
+
+        // ========== 展开按钮点击事件 ==========
+        binding.ivShow.setOnClickListener {
+            bean.showMore.set(!bean.showMore.get())
+        }
+
+        // ========== 初始化子列表 RecyclerView ==========
+        setCommonAdapter(
+            binding.rvSub,
+            IntExpTallySubViewHolder::class.java,
+            R.layout.item_int_exp_tally_sub
+        )
+
+        // 刷新子列表数据
+        binding.rvSub.refresh(bean.haWbList ?: emptyList())
     }
 }
diff --git a/module_gjc/src/main/res/layout/item_int_exp_arrive.xml b/module_gjc/src/main/res/layout/item_int_exp_arrive.xml
index 4af8eca..a8b10f4 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_arrive.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_arrive.xml
@@ -18,11 +18,24 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/bg_white_radius_8"
-        android:orientation="horizontal"
-        android:padding="15dp"
-        android:gravity="center_vertical">
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="10dp"
+        android:orientation="vertical">
+
+        <!-- 白色卡片 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_white_radius_8"
+            android:orientation="vertical">
+
+            <!-- 主要内容区域 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="15dp"
+                android:gravity="center_vertical">
 
         <!-- 选中图标 (飞机图标，根据选择状态切换图片) -->
         <ImageView
@@ -316,6 +329,154 @@
 
         </LinearLayout>
 
+            </LinearLayout>
+
+            <!-- 展开按钮 -->
+            <ImageView
+                android:id="@+id/iv_show"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                android:padding="5dp"
+                android:src="@mipmap/img_down" />
+
+        </LinearLayout>
+
+        <!-- 子订单列表容器 -->
+        <LinearLayout
+            visible="@{bean.showMore}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:background="#e3f6e0"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <!-- 表头 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="10dp"
+                android:paddingHorizontal="10dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:gravity="center"
+                    android:text="选项"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center"
+                    android:text="分单号"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center"
+                    android:text="件数"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center"
+                    android:text="重量(KG)"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="申报状态"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="品名（中）"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.9"
+                    android:gravity="center"
+                    android:text="申报次数"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.9"
+                    android:gravity="center"
+                    android:text="申报费率"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.9"
+                    android:gravity="center"
+                    android:text="删除次数"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.9"
+                    android:gravity="center"
+                    android:text="删除费率"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <com.google.android.material.divider.MaterialDivider
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/c999999" />
+
+            <!-- 子列表 RecyclerView -->
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_sub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </layout>
diff --git a/module_gjc/src/main/res/layout/item_int_exp_load.xml b/module_gjc/src/main/res/layout/item_int_exp_load.xml
index 3e5a94e..7624eb5 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_load.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_load.xml
@@ -62,7 +62,7 @@
                         android:text="运单号："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp"
-                        completeSpace="@{5}" />
+                        completeSpace="@{4}" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -78,7 +78,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -103,7 +103,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -128,7 +128,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -173,7 +173,7 @@
                         android:text="特码："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp"
-                        completeSpace="@{5}" />
+                        completeSpace="@{4}" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -188,7 +188,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -213,7 +213,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -238,7 +238,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">