eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: 优化国际出港运抵列表状态展示并替换出库交接字段

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

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
杨建宽
2026-07-11 16:22:15 +08:00
parent de0f4a67d5
commit 00ea0bbb68
10 changed files with 85 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -26,8 +26,8 @@ android {
applicationId "com.lukouguoji.aerologic" applicationId "com.lukouguoji.aerologic"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 30
versionCode 85 versionCode 87
versionName "1.8.5" versionName "1.8.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

8
module_gjc/src/main/res/drawable/bg_arrive_sub_header.xml Normal file
View File

@@ -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>

6
module_gjc/src/main/res/drawable/tag_status_blue.xml Normal file
View File

@@ -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>

6
module_gjc/src/main/res/drawable/tag_status_gray.xml Normal file
View File

@@ -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>

6
module_gjc/src/main/res/drawable/tag_status_green.xml Normal file
View File

@@ -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>

6
module_gjc/src/main/res/drawable/tag_status_orange.xml Normal file
View File

@@ -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>

37
module_gjc/src/main/res/layout/item_int_exp_arrive.xml
View File

@@ -108,9 +108,13 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:text="@{bean.declareStatus}"
android:textColor="@{`01`.equals(bean.declareStatus) ? @color/text_green : (`W`.equals(bean.declareStatus) ? @color/text_blue : @color/text_normal)}" android:textColor="@{`01`.equals(bean.declareStatus) ? @color/text_green : (`W`.equals(bean.declareStatus) ? @color/colorPrimary : @color/text_gray)}"
android:textSize="15sp" /> android:textSize="14sp"
android:visibility="@{bean.declareStatus != null &amp;&amp; !bean.declareStatus.isEmpty() ? View.VISIBLE : View.GONE}" />
</LinearLayout> </LinearLayout>
@@ -246,9 +250,13 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:text="@{bean.checkInText}"
android:textColor="@color/text_normal" android:textColor="@{`1`.equals(bean.checkIn) ? @color/text_green : (`2`.equals(bean.checkIn) ? @color/colorPrimary : @color/text_gray)}"
android:textSize="15sp" /> android:textSize="14sp"
android:visibility="@{bean.checkIn != null &amp;&amp; !bean.checkIn.isEmpty() ? View.VISIBLE : View.GONE}" />
</LinearLayout> </LinearLayout>
@@ -271,9 +279,13 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:text="@{bean.arriveFlagText}"
android:textColor="@color/text_normal" android:textColor="@{`0`.equals(bean.arriveFlag) ? @color/text_green : (`1`.equals(bean.arriveFlag) ? @color/text_orange : @color/text_gray)}"
android:textSize="15sp" /> android:textSize="14sp"
android:visibility="@{bean.arriveFlag != null &amp;&amp; !bean.arriveFlag.isEmpty() ? View.VISIBLE : View.GONE}" />
</LinearLayout> </LinearLayout>
@@ -345,13 +357,13 @@
</LinearLayout> </LinearLayout>
<!-- 子订单列表容器 --> <!-- 子订单列表容器（白色圆角卡片，圆角同主单） -->
<LinearLayout <LinearLayout
visible="@{bean.showMore}" visible="@{bean.showMore}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="10dp"
android:background="#e3f6e0" android:background="@drawable/bg_white_radius_8"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
@@ -367,14 +379,15 @@
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" /> android:visibility="gone" />
<!-- 表头 --> <!-- 表头（浅蓝色背景，仅 Title 有背景色，顶部圆角同卡片） -->
<LinearLayout <LinearLayout
android:id="@+id/ll_header" android:id="@+id/ll_header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="10dp" android:background="@drawable/bg_arrive_sub_header"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingHorizontal="10dp"> android:paddingHorizontal="10dp"
android:paddingVertical="10dp">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

23
module_gjc/src/main/res/layout/item_int_exp_arrive_sub.xml
View File

@@ -5,6 +5,8 @@
<data> <data>
<import type="android.view.View" />
<variable <variable
name="bean" name="bean"
type="com.lukouguoji.module_base.bean.GjcHaWb" /> type="com.lukouguoji.module_base.bean.GjcHaWb" />
@@ -67,15 +69,26 @@
android:textColor="@color/text_normal" android:textColor="@color/text_normal"
android:textSize="14sp" /> android:textSize="14sp" />
<!-- 申报状态 --> <!-- 申报状态（Tag 形式，根据语义着色） -->
<TextView <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="@{bean.arrivalStatus ?? ``}" android:orientation="horizontal">
android:textColor="@color/text_normal"
android:textSize="14sp" /> <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 <TextView

14
module_gjc/src/main/res/layout/item_int_exp_out_handover.xml
View File

@@ -43,7 +43,7 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<!-- 第一行：ULD编码、架子车号、总重、货重、航班信息 --> <!-- 第一行：ULD编码、架子车号、装机重、版型、航班信息 -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
</LinearLayout> </LinearLayout>
<!-- 总重 --> <!-- 装机重 -->
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -108,18 +108,18 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
completeSpace="@{5}" completeSpace="@{5}"
android:text="总重：" android:text="装机重："
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{String.valueOf((int)bean.totalWeight)}" android:text="@{String.valueOf((int)bean.netWeight)}"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
<!-- 货重 --> <!-- 板型 -->
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -131,13 +131,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
completeSpace="@{4}" completeSpace="@{4}"
android:text="货重：" android:text="板型："
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{String.valueOf((int)bean.cargoWeight)}" android:text="@{bean.boardType}"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>

2
module_p/src/main/java/com/sixin/module_p/ui/guobang/PdaGuoBangViewModel.kt
View File

@@ -28,7 +28,7 @@ class PdaGuoBangViewModel : BaseViewModel() {
val channelList = MutableLiveData(emptyList<KeyValue>()) val channelList = MutableLiveData(emptyList<KeyValue>())
private var channel = KeyValue("", "") private var channel = KeyValue("", "")
// 版型 // 板型
val version = MutableLiveData("") val version = MutableLiveData("")
// 高度 // 高度