From 9129ccfb880617cf3192a417a413102dc2fd29ad Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Mon, 15 Dec 2025 09:58:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20opt=20=E5=9B=BD=E9=99=85=E5=87=BA?=
 =?UTF-8?q?=E6=B8=AF=20=E5=87=BA=E6=B8=AF=E8=BF=90=E6=8A=B5=20item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lukouguoji/module_base/bean/GjcMaWb.kt    | 24 +++++++++++++++++++
 .../main/res/layout/item_int_exp_arrive.xml   | 22 ++++++++---------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt
index f5cd4d1..2ef49aa 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt
@@ -116,6 +116,30 @@ data class GjcMaWb(
     var isSelected: Boolean
         get() = checked.get()
         set(value) = checked.set(value)
+
+    // ==================== 状态转换扩展属性 ====================
+    /**
+     * 计重状态中文
+     * 0-待收运，1-已计重，2-计重中
+     */
+    val checkInText: String
+        get() = when (checkIn) {
+            "0" -> "待收运"
+            "1" -> "已计重"
+            "2" -> "计重中"
+            else -> checkIn ?: ""
+        }
+
+    /**
+     * 运抵状态中文
+     * 0-正常运抵，1-提前运抵
+     */
+    val arriveFlagText: String
+        get() = when (arriveFlag) {
+            "0" -> "正常运抵"
+            "1" -> "提前运抵"
+            else -> arriveFlag ?: ""
+        }
 }
 
 /**
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 dcb764f..5968bfc 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
@@ -52,14 +52,14 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.5"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{5}"
+                        completeSpace="@{4}"
                         android:text="运单号："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -67,7 +67,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.no}"
+                        android:text="@{bean.wbNo}"
                         android:textColor="@color/colorPrimary"
                         android:textSize="16sp"
                         android:textStyle="bold" />
@@ -85,7 +85,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{5}"
                         android:text="状态："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -110,7 +110,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{5}"
                         android:text="代理："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -135,7 +135,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{5}"
                         android:text="件数："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -160,7 +160,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{4}"
                         android:text="重量："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -188,14 +188,14 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.5"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{4}"
                         android:text="航程："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -228,7 +228,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="-"
+                        android:text="@{bean.checkInText}"
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
 
@@ -253,7 +253,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.arriveFlag}"
+                        android:text="@{bean.arriveFlagText}"
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />