From 00ea0bbb686009fee18a92ae1feb4a39b093df37 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Sat, 11 Jul 2026 16:22:15 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=87=BA=E6=B8=AF=E8=BF=90=E6=8A=B5=E5=88=97=E8=A1=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E5=B9=B6=E6=9B=BF=E6=8D=A2=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E4=BA=A4=E6=8E=A5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 运抵列表主单/分单状态改为全圆角胶囊 Tag，按语义着色
- 分单改为白色圆角卡片，仅表头浅蓝底(#dbeafe)
- 出库交接列表"总重/货重"替换为"装机重/板型"
- 版本号升至 1.8.7

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 app/build.gradle                              |  4 +-
 .../res/drawable/bg_arrive_sub_header.xml     |  8 ++++
 .../src/main/res/drawable/tag_status_blue.xml |  6 +++
 .../src/main/res/drawable/tag_status_gray.xml |  6 +++
 .../main/res/drawable/tag_status_green.xml    |  6 +++
 .../main/res/drawable/tag_status_orange.xml   |  6 +++
 .../main/res/layout/item_int_exp_arrive.xml   | 37 +++++++++++++------
 .../res/layout/item_int_exp_arrive_sub.xml    | 23 +++++++++---
 .../res/layout/item_int_exp_out_handover.xml  | 14 +++----
 .../ui/guobang/PdaGuoBangViewModel.kt         |  2 +-
 10 files changed, 85 insertions(+), 27 deletions(-)
 create mode 100644 module_gjc/src/main/res/drawable/bg_arrive_sub_header.xml
 create mode 100644 module_gjc/src/main/res/drawable/tag_status_blue.xml
 create mode 100644 module_gjc/src/main/res/drawable/tag_status_gray.xml
 create mode 100644 module_gjc/src/main/res/drawable/tag_status_green.xml
 create mode 100644 module_gjc/src/main/res/drawable/tag_status_orange.xml

diff --git a/app/build.gradle b/app/build.gradle
index 11f419d..794d215 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.lukouguoji.aerologic"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 85
-        versionName "1.8.5"
+        versionCode 87
+        versionName "1.8.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/module_gjc/src/main/res/drawable/bg_arrive_sub_header.xml b/module_gjc/src/main/res/drawable/bg_arrive_sub_header.xml
new file mode 100644
index 0000000..b51d20f
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_arrive_sub_header.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#DBEAFE" />
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+</shape>
diff --git a/module_gjc/src/main/res/drawable/tag_status_blue.xml b/module_gjc/src/main/res/drawable/tag_status_blue.xml
new file mode 100644
index 0000000..dba1356
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/tag_status_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#DBEAFE" />
+    <corners android:radius="999dp" />
+</shape>
diff --git a/module_gjc/src/main/res/drawable/tag_status_gray.xml b/module_gjc/src/main/res/drawable/tag_status_gray.xml
new file mode 100644
index 0000000..bfc9978
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/tag_status_gray.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ECEDEF" />
+    <corners android:radius="999dp" />
+</shape>
diff --git a/module_gjc/src/main/res/drawable/tag_status_green.xml b/module_gjc/src/main/res/drawable/tag_status_green.xml
new file mode 100644
index 0000000..498cba8
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/tag_status_green.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E7F6EA" />
+    <corners android:radius="999dp" />
+</shape>
diff --git a/module_gjc/src/main/res/drawable/tag_status_orange.xml b/module_gjc/src/main/res/drawable/tag_status_orange.xml
new file mode 100644
index 0000000..d0b60ba
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/tag_status_orange.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFF1E0" />
+    <corners android:radius="999dp" />
+</shape>
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 ba11b74..e5e230b 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
@@ -108,9 +108,13 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:background="@{`01`.equals(bean.declareStatus) ? @drawable/tag_status_green : (`W`.equals(bean.declareStatus) ? @drawable/tag_status_blue : @drawable/tag_status_gray)}"
+                                android:paddingHorizontal="8dp"
+                                android:paddingVertical="2dp"
                                 android:text="@{bean.declareStatus}"
-                                android:textColor="@{`01`.equals(bean.declareStatus) ? @color/text_green : (`W`.equals(bean.declareStatus) ? @color/text_blue : @color/text_normal)}"
-                                android:textSize="15sp" />
+                                android:textColor="@{`01`.equals(bean.declareStatus) ? @color/text_green : (`W`.equals(bean.declareStatus) ? @color/colorPrimary : @color/text_gray)}"
+                                android:textSize="14sp"
+                                android:visibility="@{bean.declareStatus != null &amp;&amp; !bean.declareStatus.isEmpty() ? View.VISIBLE : View.GONE}" />
 
                         </LinearLayout>
 
@@ -246,9 +250,13 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:background="@{`1`.equals(bean.checkIn) ? @drawable/tag_status_green : (`2`.equals(bean.checkIn) ? @drawable/tag_status_blue : @drawable/tag_status_gray)}"
+                                android:paddingHorizontal="8dp"
+                                android:paddingVertical="2dp"
                                 android:text="@{bean.checkInText}"
-                                android:textColor="@color/text_normal"
-                                android:textSize="15sp" />
+                                android:textColor="@{`1`.equals(bean.checkIn) ? @color/text_green : (`2`.equals(bean.checkIn) ? @color/colorPrimary : @color/text_gray)}"
+                                android:textSize="14sp"
+                                android:visibility="@{bean.checkIn != null &amp;&amp; !bean.checkIn.isEmpty() ? View.VISIBLE : View.GONE}" />
 
                         </LinearLayout>
 
@@ -271,9 +279,13 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:background="@{`0`.equals(bean.arriveFlag) ? @drawable/tag_status_green : (`1`.equals(bean.arriveFlag) ? @drawable/tag_status_orange : @drawable/tag_status_gray)}"
+                                android:paddingHorizontal="8dp"
+                                android:paddingVertical="2dp"
                                 android:text="@{bean.arriveFlagText}"
-                                android:textColor="@color/text_normal"
-                                android:textSize="15sp" />
+                                android:textColor="@{`0`.equals(bean.arriveFlag) ? @color/text_green : (`1`.equals(bean.arriveFlag) ? @color/text_orange : @color/text_gray)}"
+                                android:textSize="14sp"
+                                android:visibility="@{bean.arriveFlag != null &amp;&amp; !bean.arriveFlag.isEmpty() ? View.VISIBLE : View.GONE}" />
 
                         </LinearLayout>
 
@@ -345,13 +357,13 @@
 
         </LinearLayout>
 
-        <!-- 子订单列表容器 -->
+        <!-- 子订单列表容器（白色圆角卡片，圆角同主单） -->
         <LinearLayout
             visible="@{bean.showMore}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:background="#e3f6e0"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/bg_white_radius_8"
             android:orientation="vertical"
             android:visibility="gone">
 
@@ -367,14 +379,15 @@
                 android:textSize="14sp"
                 android:visibility="gone" />
 
-            <!-- 表头 -->
+            <!-- 表头（浅蓝色背景，仅 Title 有背景色，顶部圆角同卡片） -->
             <LinearLayout
                 android:id="@+id/ll_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginVertical="10dp"
+                android:background="@drawable/bg_arrive_sub_header"
                 android:orientation="horizontal"
-                android:paddingHorizontal="10dp">
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="10dp">
 
                 <TextView
                     android:layout_width="0dp"
diff --git a/module_gjc/src/main/res/layout/item_int_exp_arrive_sub.xml b/module_gjc/src/main/res/layout/item_int_exp_arrive_sub.xml
index d8ddb57..aa00463 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_arrive_sub.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_arrive_sub.xml
@@ -5,6 +5,8 @@
 
     <data>
 
+        <import type="android.view.View" />
+
         <variable
             name="bean"
             type="com.lukouguoji.module_base.bean.GjcHaWb" />
@@ -67,15 +69,26 @@
                 android:textColor="@color/text_normal"
                 android:textSize="14sp" />
 
-            <!-- 申报状态 -->
-            <TextView
+            <!-- 申报状态（Tag 形式，根据语义着色） -->
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@{bean.arrivalStatus ?? ``}"
-                android:textColor="@color/text_normal"
-                android:textSize="14sp" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@{`未申报`.equals(bean.arrivalStatus) ? @drawable/tag_status_gray : @drawable/tag_status_green}"
+                    android:paddingHorizontal="8dp"
+                    android:paddingVertical="2dp"
+                    android:text="@{bean.arrivalStatus ?? ``}"
+                    android:textColor="@{`未申报`.equals(bean.arrivalStatus) ? @color/text_gray : @color/text_green}"
+                    android:textSize="13sp"
+                    android:visibility="@{bean.arrivalStatus != null &amp;&amp; !bean.arrivalStatus.isEmpty() ? View.VISIBLE : View.GONE}" />
+
+            </LinearLayout>
 
             <!-- 品名（中） -->
             <TextView
diff --git a/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml b/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml
index 4e8911d..de4737a 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml
@@ -43,7 +43,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <!-- 第一行：ULD编码、架子车号、总重、货重、航班信息 -->
+            <!-- 第一行：ULD编码、架子车号、装机重、版型、航班信息 -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
 
                 </LinearLayout>
 
-                <!-- 总重 -->
+                <!-- 装机重 -->
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -108,18 +108,18 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         completeSpace="@{5}"
-                        android:text="总重："
+                        android:text="装机重："
                         android:textSize="15sp" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{String.valueOf((int)bean.totalWeight)}"
+                        android:text="@{String.valueOf((int)bean.netWeight)}"
                         android:textSize="15sp" />
 
                 </LinearLayout>
 
-                <!-- 货重 -->
+                <!-- 板型 -->
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -131,13 +131,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         completeSpace="@{4}"
-                        android:text="货重："
+                        android:text="板型："
                         android:textSize="15sp" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{String.valueOf((int)bean.cargoWeight)}"
+                        android:text="@{bean.boardType}"
                         android:textSize="15sp" />
 
                 </LinearLayout>
diff --git a/module_p/src/main/java/com/sixin/module_p/ui/guobang/PdaGuoBangViewModel.kt b/module_p/src/main/java/com/sixin/module_p/ui/guobang/PdaGuoBangViewModel.kt
index 0949cdd..09fbeab 100644
--- a/module_p/src/main/java/com/sixin/module_p/ui/guobang/PdaGuoBangViewModel.kt
+++ b/module_p/src/main/java/com/sixin/module_p/ui/guobang/PdaGuoBangViewModel.kt
@@ -28,7 +28,7 @@ class PdaGuoBangViewModel : BaseViewModel() {
     val channelList = MutableLiveData(emptyList<KeyValue>())
     private var channel = KeyValue("", "")
 
-    // 版型
+    // 板型
     val version = MutableLiveData("")
 
     // 高度