fix: 11模块设计稿全量走查修正——时间线状态pill/手机短标题/ULD字段顺序/计重卡片图标

设计稿逐态渲染对照走查（01~11 全模块）后的修正： - 运单追踪竖排时间线为已发生节点补状态pill（绿底展示该环节日志content，超长省略） - 11 页手机端标题按设计稿改短标题（DeviceUtil.isPhone 分支，平板长标题零变化）：出库交接/出港待计重/计重记录/计重明细/开始计重/出港运抵/出港移库/出港查询/ 出港货物/进港查询/进港货物 - ULD 编辑表单「来源」移至「所在港」之后（设计稿顺序） - 出港计重列表卡片与计重记录卡片补字段小图标（airplane/location/person/tag）接口缺口台账复核：#31 进港移库整模块缺失成立（api-doc 全模块清单+报价单双重印证）； #19 修正定性——IntExpArrive/declare 入参已含收发货人全套字段，改登记为待确认提交口径； #10 成立（单条 deleteUld 在、批量无）。双端抽验：手机短标题三页生效（出港待计重/出库交接/进港货物），平板保持长标题，零崩溃。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-31 23:12:14 +08:00
parent a33776d959
commit eb0655d3fc
17 changed files with 1124 additions and 1009 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,14 @@
  表头）、`bg_phone_photo_add`（虚线加号槽位）、色值 `phone_amber`

 ### 修复 (Fixed)
+- 【11 模块全量设计稿走查】修正 4 类差异（2026-07-31，3 个并行审计 + 逐态渲染比对）：
+  ① 运单追踪手机竖排时间线补齐已发生节点的状态 pill（绿底标签展示该环节日志 content，
+  如「放行状态：01」，超长省略，设计稿 06/08 运单追踪均有此元素）；
+  ② 11 个页面手机端标题对齐设计稿短标题（出库交接/出港待计重/计重记录/计重明细/开始计重/
+  出港运抵/出港移库/出港查询/出港货物/进港查询/进港货物），平板保持原长标题零变化；
+  ③ ULD 编辑表单「来源」字段移至「所在港」之后（设计稿顺序）；
+  ④ 出港计重列表卡片（日期/航程/代理/特码）与计重记录卡片（代理）补齐字段小图标
+  （复用 ic_phone_airplane/location/person/tag，与其余模块卡片风格统一）
 - 出港查询/进港查询卡片「代理人」空值兜底失效：转换器把 JSON null 归一成空串，DataBinding
  `??` 只判 null 不判空串导致 agentCode 回退永不生效；改用 Bean 计算属性 `agentDisplay`
  （isNullOrEmpty 双兜底），已同步修正 06 出港查询（`item_gjc_query.xml`）
--- a/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailActivity.kt
+++ b/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailActivity.kt
@@ -91,7 +91,9 @@ class LogDetailActivity : BaseBindingActivity<ActivityLogDetailBinding, LogDetai
            val step = steps[i]
            val isActive = step.code in activeCodes
            val isLast = i == steps.size - 1
-            val time = logs.lastOrNull { it.status == step.code }?.opDate ?: ""
+            val stepLog = logs.lastOrNull { it.status == step.code }
+            val time = stepLog?.opDate ?: ""
+            val statusContent = stepLog?.content ?: ""

            val row = LinearLayout(this).apply {
                orientation = LinearLayout.HORIZONTAL
@@ -141,12 +143,41 @@ class LogDetailActivity : BaseBindingActivity<ActivityLogDetailBinding, LogDetai
                }
                setPadding(0, 0, 0, if (isLast) 0 else dp(24))
            }
-            content.addView(TextView(this).apply {
+            // 名称行：步骤名（左）+ 已发生节点的状态 pill（右，设计稿如「放行状态：01」）
+            val nameRow = LinearLayout(this).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_VERTICAL
+                layoutParams = LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT
+                )
+            }
+            nameRow.addView(TextView(this).apply {
                text = step.name
                setTextSize(TypedValue.COMPLEX_UNIT_SP, 15f)
                setTextColor(if (isActive) colorGreen else colorGray)
                if (isActive) setTypeface(typeface, android.graphics.Typeface.BOLD)
+                layoutParams = LinearLayout.LayoutParams(
+                    0, LinearLayout.LayoutParams.WRAP_CONTENT
+                ).apply { weight = 1f }
            })
+            if (isActive && statusContent.isNotEmpty()) {
+                nameRow.addView(TextView(this).apply {
+                    text = statusContent
+                    setTextSize(TypedValue.COMPLEX_UNIT_SP, 11f)
+                    setTextColor(colorGreen)
+                    setBackgroundResource(com.lukouguoji.module_base.R.drawable.bg_phone_tag_green)
+                    setPadding(dp(8), dp(3), dp(8), dp(3))
+                    maxLines = 1
+                    ellipsize = android.text.TextUtils.TruncateAt.END
+                    maxWidth = dp(180)
+                    layoutParams = LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.WRAP_CONTENT,
+                        LinearLayout.LayoutParams.WRAP_CONTENT
+                    ).apply { leftMargin = dp(8) }
+                })
+            }
+            content.addView(nameRow)
            if (time.isNotEmpty()) {
                content.addView(TextView(this).apply {
                    text = time
--- a/app/src/main/res/layout/activity_uld_edit.xml
+++ b/app/src/main/res/layout/activity_uld_edit.xml
@@ -160,17 +160,6 @@
                        type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.SELECT}"
                        value="@={viewModel.uldBean.carrier}" />

-                    <!-- 来源（后端字段暂不支持，已登记清单；提交后端忽略） -->
-                    <com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        enable="@{viewModel.pageType != DetailsPageType.Details}"
-                        hint='@{"请选择来源"}'
-                        list="@{viewModel.sourceEditList}"
-                        title='@{"来源"}'
-                        type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.SELECT}"
-                        value="@={viewModel.uldBean.source}" />
-
                    <!-- 自重(kg) -->
                    <com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
                        android:layout_width="match_parent"
@@ -221,6 +210,17 @@
                        type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.INPUT}"
                        value="@={viewModel.uldBean.airport}" />

+                    <!-- 来源（设计稿顺序位于所在港之后；后端字段暂不支持，已登记清单，提交后端忽略） -->
+                    <com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        enable="@{viewModel.pageType != DetailsPageType.Details}"
+                        hint='@{"请选择来源"}'
+                        list="@{viewModel.sourceEditList}"
+                        title='@{"来源"}'
+                        type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.SELECT}"
+                        value="@={viewModel.uldBean.source}" />
+
                    <!-- 入库时间（绑 checkInDate，筛选/格式语义待后端确认，已登记清单） -->
                    <com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
                        android:layout_width="match_parent"
--- a/documents/后端接口对接问题清单.xlsx
+++ b/documents/后端接口对接问题清单.xlsx
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryActivity.kt
@@ -32,7 +32,7 @@ class GjcQueryActivity :
    override fun viewModelClass() = GjcQueryViewModel::class.java

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港查询")
+        setBackArrow(if (DeviceUtil.isPhone()) "出港查询" else "国际出港查询")

        binding.viewModel = viewModel

--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryDetailsActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryDetailsActivity.kt
@@ -16,6 +16,7 @@ import com.lukouguoji.module_base.base.BaseBindingActivity
 import com.lukouguoji.module_base.base.CustomVP2Adapter
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.router.ARouterConstants
+import com.lukouguoji.module_base.util.DeviceUtil

 /**
 * 国际出港查询详情页面
@@ -28,7 +29,7 @@ class GjcQueryDetailsActivity :
    override fun viewModelClass() = GjcQueryDetailsViewModel::class.java

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港查询详情")
+        setBackArrow(if (DeviceUtil.isPhone()) "出港货物" else "国际出港查询详情")
        binding.viewModel = viewModel

        // 初始化ViewModel(传入maWbId)
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingListActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingListActivity.kt
@@ -36,7 +36,7 @@ class GjcWeighingListActivity :
    val filterPanelVisible = ObservableBoolean(false)

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港待计重")
+        setBackArrow(if (DeviceUtil.isPhone()) "出港待计重" else "国际出港待计重")

        binding.viewModel = viewModel
        binding.activity = this
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingRecordDetailsActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingRecordDetailsActivity.kt
@@ -16,6 +16,7 @@ import com.lukouguoji.module_base.bean.GjcCheckInRecord
 import com.lukouguoji.module_base.bean.GjcWeighingRecordBean
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.router.ARouterConstants
+import com.lukouguoji.module_base.util.DeviceUtil

 /**
 * 国际出港计重明细页
@@ -38,7 +39,7 @@ class GjcWeighingRecordDetailsActivity :
    override fun viewModelClass() = GjcWeighingRecordDetailsViewModel::class.java

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港计重明细")
+        setBackArrow(if (DeviceUtil.isPhone()) "计重明细" else "国际出港计重明细")

        binding.viewModel = viewModel

--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingRecordListActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingRecordListActivity.kt
@@ -35,7 +35,7 @@ class GjcWeighingRecordListActivity :
    val filterPanelVisible = ObservableBoolean(false)

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港计重记录")
+        setBackArrow(if (DeviceUtil.isPhone()) "计重记录" else "国际出港计重记录")

        binding.viewModel = viewModel
        binding.activity = this
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingStartActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingStartActivity.kt
@@ -31,7 +31,7 @@ class GjcWeighingStartActivity :
    override fun viewModelClass() = GjcWeighingStartViewModel::class.java

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港开始计重")
+        setBackArrow(if (DeviceUtil.isPhone()) "开始计重" else "国际出港开始计重")
        binding.viewModel = viewModel

        // 手机版专属：提交体携带托盘数量/托盘自重（平板不调用，请求体与改造前完全一致）
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpArriveActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpArriveActivity.kt
@@ -51,7 +51,7 @@ class IntExpArriveActivity :
        // 注入 ARouter 参数
        ARouter.getInstance().inject(this)

-        setBackArrow("国际出港运抵")
+        setBackArrow(if (DeviceUtil.isPhone()) "出港运抵" else "国际出港运抵")
        binding.viewModel = viewModel
        binding.activity = this

--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpOutHandoverActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpOutHandoverActivity.kt
@@ -35,7 +35,7 @@ class IntExpOutHandoverActivity :
    val filterPanelVisible = ObservableBoolean(false)

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港出库交接")
+        setBackArrow(if (DeviceUtil.isPhone()) "出库交接" else "国际出港出库交接")
        binding.viewModel = viewModel
        binding.activity = this

--- a/module_gjc/src/main/java/com/lukouguoji/gjc/page/move/IntExpMoveActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/page/move/IntExpMoveActivity.kt
@@ -37,7 +37,7 @@ class IntExpMoveActivity : BaseBindingActivity<ActivityIntExpMoveBinding, IntExp
    val filterPanelVisible = ObservableBoolean(false)

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港移库")
+        setBackArrow(if (DeviceUtil.isPhone()) "出港移库" else "国际出港移库")
        binding.viewModel = viewModel
        binding.activity = this

--- a/module_gjc/src/main/res/layout/item_gjc_weighing.xml
+++ b/module_gjc/src/main/res/layout/item_gjc_weighing.xml
@@ -75,19 +75,45 @@
            android:layout_marginTop="12dp"
            android:orientation="horizontal">

-            <TextView
+            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:src="@drawable/ic_phone_airplane" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
                    android:text='@{"日期： " + bean.fdate}'
                    android:textColor="@color/phone_text_body"
                    android:textSize="13sp"
                    tools:text="日期： 20260721" />

-            <TextView
+            </LinearLayout>
+
+            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:src="@drawable/ic_phone_location" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
                    android:text='@{"航程： " + bean.range}'
                    android:textColor="@color/phone_text_body"
                    android:textSize="13sp"
@@ -95,6 +121,8 @@

            </LinearLayout>

+        </LinearLayout>
+
        <!-- 字段网格：代理 / 特码 -->
        <LinearLayout
            android:layout_width="match_parent"
@@ -102,19 +130,48 @@
            android:layout_marginTop="8dp"
            android:orientation="horizontal">

-            <TextView
+            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:src="@drawable/ic_phone_person" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                    android:text='@{"代理： " + bean.agentName}'
                    android:textColor="@color/phone_text_body"
                    android:textSize="13sp"
                    tools:text="代理： 中外运" />

-            <TextView
+            </LinearLayout>
+
+            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:src="@drawable/ic_phone_tag" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
                    android:text='@{"特码： " + bean.spCode}'
                    android:textColor="@color/phone_text_body"
                    android:textSize="13sp"
@@ -122,6 +179,8 @@

            </LinearLayout>

+        </LinearLayout>
+
        <!-- 单票提前运抵（已提前运抵置灰，ViewHolder 判空绑定点击） -->
        <TextView
            android:id="@+id/btn_pre_arrive"
--- a/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml
+++ b/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml
@@ -56,15 +56,29 @@
        </LinearLayout>

        <!-- 代理 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:src="@drawable/ic_phone_person" />
+
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+                android:layout_marginStart="6dp"
                android:text='@{"代理： " + bean.agentName}'
                android:textColor="@color/phone_text_body"
                android:textSize="13sp"
                tools:text="代理： 马道" />

+        </LinearLayout>
+
        <!-- 运抵统计框 -->
        <com.lukouguoji.module_base.ui.weight.phone.PhoneStatBox
            android:layout_width="match_parent"
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt
@@ -33,7 +33,7 @@ class IntImpQueryActivity :
    override fun viewModelClass() = IntImpQueryViewModel::class.java

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际进港查询")
+        setBackArrow(if (DeviceUtil.isPhone()) "进港查询" else "国际进港查询")

        binding.viewModel = viewModel

--- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryDetailsActivity.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryDetailsActivity.kt
@@ -16,6 +16,7 @@ import com.lukouguoji.module_base.base.BaseBindingActivity
 import com.lukouguoji.module_base.base.CustomVP2Adapter
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.router.ARouterConstants
+import com.lukouguoji.module_base.util.DeviceUtil

 /**
 * 国际进港查询详情页面
@@ -28,7 +29,7 @@ class IntImpQueryDetailsActivity :
    override fun viewModelClass() = IntImpQueryDetailsViewModel::class.java

    override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际进港查询详情")
+        setBackArrow(if (DeviceUtil.isPhone()) "进港货物" else "国际进港查询详情")
        binding.viewModel = viewModel

        // 初始化ViewModel(传入maWbId)