- #7 状态维持两态:移除「占用」预留映射与橙色标签 - #8 来源 source(空运/陆运)出参与保存入参已支持;查询入参不支持 source,筛选弹层移除来源 - #9 查询参数与平板一致(uld/status/uldSuffix):筛选弹层改为 状态 + 所属航司,移除入库时间/进港航班号 - #10 批量删除改为一次调用 /eqm/uld/deleteUldBatch(请求体 ULD 编号数组) - #11 入库时间改绑 inStoreTime;所在港改绑 nowPort(与平板端一致);手机日期行只产出 yyyy-MM-dd, 保存时补齐 00:00:00(仅日期后端返回 400,内网实测) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
268 lines
14 KiB
XML
268 lines
14 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
||
<!--
|
||
ULD新增 / 修改 / 详情 —— 手机版布局(5.5 寸手持端,最小宽度 < 600dp 时生效)
|
||
|
||
平板版为同名文件 layout-sw600dp/activity_uld_edit.xml(PadDataLayoutNew 三列表单),
|
||
两者是同一布局的资源变体,DataBinding 生成同一个 ActivityUldEditBinding 类。
|
||
|
||
变体之间必须满足:
|
||
· DataBinding 变量完全一致:viewModel / activity
|
||
→ UldEditViewModel 的加载/保存逻辑全部复用,平板端行为不受影响
|
||
|
||
一套布局覆盖设计稿三个页面(标题由 Activity 按 pageType 设置):
|
||
· ULD新增(Add) :可编辑 + 底部保存;所在港默认 HFE、必填星(编号/自重/入库时间)
|
||
· ULD修改(Modify):编号只读,其余可编辑 + 底部保存
|
||
· ULD详情(Details):全只读右对齐 + 顶栏右侧铅笔进入修改 + 额外展示最大装载容积/最大载重
|
||
|
||
字段与平板端一致:来源 source(空运/陆运)、入库时间 inStoreTime、所在港 nowPort;
|
||
状态维持两态(0 可用 / 1 维修,后端不新增「占用」)。
|
||
-->
|
||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||
|
||
<data>
|
||
|
||
<import type="android.view.View" />
|
||
|
||
<import type="com.lukouguoji.module_base.common.DetailsPageType" />
|
||
|
||
<import type="com.lukouguoji.module_base.ui.weight.phone.PhoneFormRowType" />
|
||
|
||
<variable
|
||
name="viewModel"
|
||
type="com.lukouguoji.aerologic.page.uld.edit.UldEditViewModel" />
|
||
|
||
<variable
|
||
name="activity"
|
||
type="com.lukouguoji.aerologic.page.uld.edit.UldEditActivity" />
|
||
</data>
|
||
|
||
<LinearLayout
|
||
android:layout_width="match_parent"
|
||
android:layout_height="match_parent"
|
||
android:background="@color/phone_page_bg"
|
||
android:orientation="vertical">
|
||
|
||
<!-- 标题栏 + 详情态右侧铅笔(编辑入口) -->
|
||
<FrameLayout
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content">
|
||
|
||
<include layout="@layout/title_tool_bar" />
|
||
|
||
<ImageView
|
||
android:layout_width="48dp"
|
||
android:layout_height="48dp"
|
||
android:layout_gravity="end"
|
||
android:onClick="@{()-> activity.onEditClick()}"
|
||
android:padding="14dp"
|
||
android:src="@drawable/ic_phone_edit"
|
||
android:visibility="@{viewModel.pageType == DetailsPageType.Details ? View.VISIBLE : View.GONE}" />
|
||
|
||
</FrameLayout>
|
||
|
||
<ScrollView
|
||
android:layout_width="match_parent"
|
||
android:layout_height="0dp"
|
||
android:layout_weight="1"
|
||
android:fillViewport="true"
|
||
android:overScrollMode="never">
|
||
|
||
<LinearLayout
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
android:orientation="vertical"
|
||
android:padding="16dp">
|
||
|
||
<!-- ==================== 表单卡片 ==================== -->
|
||
<LinearLayout
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
android:background="@drawable/bg_phone_card"
|
||
android:orientation="vertical"
|
||
android:paddingHorizontal="16dp">
|
||
|
||
<!-- ULD编号:新增可输,修改/详情只读 -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
enable="@{viewModel.pageType == DetailsPageType.Add}"
|
||
hint='@{"请输入ULD编号"}'
|
||
required="@{viewModel.pageType == DetailsPageType.Add}"
|
||
title='@{"ULD编号"}'
|
||
type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.INPUT}"
|
||
value="@={viewModel.uldBean.uld}" />
|
||
|
||
<!-- 状态:彩色标签 + 底部选择面板(详情态右对齐、无箭头) -->
|
||
<LinearLayout
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
android:gravity="center_vertical"
|
||
android:minHeight="54dp"
|
||
android:onClick="@{()-> activity.onStatusRowClick()}"
|
||
android:orientation="horizontal">
|
||
|
||
<TextView
|
||
android:layout_width="110dp"
|
||
android:layout_height="wrap_content"
|
||
android:text="状态"
|
||
android:textColor="@color/phone_text_label"
|
||
android:textSize="15sp" />
|
||
|
||
<!-- 详情态用这个占位把标签推到右侧 -->
|
||
<Space
|
||
android:layout_width="0dp"
|
||
android:layout_height="1dp"
|
||
android:layout_weight="1"
|
||
android:visibility="@{viewModel.pageType == DetailsPageType.Details ? View.VISIBLE : View.GONE}" />
|
||
|
||
<TextView
|
||
android:layout_width="wrap_content"
|
||
android:layout_height="22dp"
|
||
android:background="@{viewModel.uldBean.status.empty ? null : (viewModel.uldBean.isStatusAvailable ? @drawable/bg_phone_tag_green : @drawable/bg_phone_tag_red_light)}"
|
||
android:gravity="center"
|
||
android:paddingHorizontal="8dp"
|
||
android:text='@{viewModel.uldBean.status.empty ? "请选择状态" : viewModel.uldBean.statusPhoneName}'
|
||
android:textColor="@{viewModel.uldBean.status.empty ? @color/phone_text_hint : (viewModel.uldBean.isStatusAvailable ? @color/phone_tag_green_text : @color/phone_danger_text)}"
|
||
android:textSize="12sp" />
|
||
|
||
<!-- 编辑态右箭头 -->
|
||
<LinearLayout
|
||
android:layout_width="0dp"
|
||
android:layout_height="wrap_content"
|
||
android:layout_weight="1"
|
||
android:gravity="end|center_vertical"
|
||
android:orientation="horizontal"
|
||
android:visibility="@{viewModel.pageType == DetailsPageType.Details ? View.GONE : View.VISIBLE}">
|
||
|
||
<ImageView
|
||
android:layout_width="16dp"
|
||
android:layout_height="16dp"
|
||
android:src="@drawable/ic_phone_chevron_right" />
|
||
|
||
</LinearLayout>
|
||
|
||
</LinearLayout>
|
||
|
||
<View
|
||
android:layout_width="match_parent"
|
||
android:layout_height="1px"
|
||
android:background="@color/phone_divider" />
|
||
|
||
<!-- 所属航司 -->
|
||
<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.carrierList}"
|
||
title='@{"所属航司"}'
|
||
type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.SELECT}"
|
||
value="@={viewModel.uldBean.carrier}" />
|
||
|
||
<!-- 自重(kg) -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
enable="@{viewModel.pageType != DetailsPageType.Details}"
|
||
hint='@{"请输入自重"}'
|
||
numeric="@{true}"
|
||
required="@{viewModel.pageType == DetailsPageType.Add}"
|
||
title='@{"自重(kg)"}'
|
||
type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.INPUT}"
|
||
value="@={viewModel.uldBean.uldWeight}" />
|
||
|
||
<!-- 最大装载容积(仅详情展示,与设计稿一致) -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
title='@{"最大装载容积(m³)"}'
|
||
type="@{PhoneFormRowType.TEXT}"
|
||
value="@{viewModel.uldBean.maxVolume}"
|
||
android:visibility="@{viewModel.pageType == DetailsPageType.Details ? View.VISIBLE : View.GONE}" />
|
||
|
||
<!-- 最大载重(仅详情展示,与设计稿一致) -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
title='@{"最大载重(kg)"}'
|
||
type="@{PhoneFormRowType.TEXT}"
|
||
value="@{viewModel.uldBean.maxWeight}"
|
||
android:visibility="@{viewModel.pageType == DetailsPageType.Details ? View.VISIBLE : View.GONE}" />
|
||
|
||
<!-- 进港航班号(ifNo) -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
enable="@{viewModel.pageType != DetailsPageType.Details}"
|
||
hint='@{"请输入进港航班号"}'
|
||
title='@{"进港航班号"}'
|
||
type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.INPUT}"
|
||
value="@={viewModel.uldBean.ifNo}" />
|
||
|
||
<!-- 所在港(nowPort,与平板端一致;新增默认 HFE,由 ViewModel 手机开关预填) -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
enable="@{viewModel.pageType != DetailsPageType.Details}"
|
||
hint='@{"请输入所在港"}'
|
||
title='@{"所在港"}'
|
||
type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.INPUT}"
|
||
value="@={viewModel.uldBean.nowPort}" />
|
||
|
||
<!-- 来源(source:空运/陆运,设计稿顺序位于所在港之后) -->
|
||
<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}" />
|
||
|
||
<!-- 入库时间(inStoreTime,与平板端一致) -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
enable="@{viewModel.pageType != DetailsPageType.Details}"
|
||
hint='@{"请输入入库时间"}'
|
||
required="@{viewModel.pageType == DetailsPageType.Add}"
|
||
title='@{"入库时间"}'
|
||
type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.DATE}"
|
||
value="@={viewModel.uldBean.inStoreTime}" />
|
||
|
||
<!-- 备注 -->
|
||
<com.lukouguoji.module_base.ui.weight.phone.PhoneFormRow
|
||
android:layout_width="match_parent"
|
||
android:layout_height="wrap_content"
|
||
enable="@{viewModel.pageType != DetailsPageType.Details}"
|
||
hint='@{"请输入备注"}'
|
||
title='@{"备注"}'
|
||
type="@{viewModel.pageType == DetailsPageType.Details ? PhoneFormRowType.TEXT : PhoneFormRowType.INPUT}"
|
||
value="@={viewModel.uldBean.remark}" />
|
||
|
||
</LinearLayout>
|
||
|
||
<!-- ==================== 保存按钮(详情态隐藏) ==================== -->
|
||
<TextView
|
||
android:layout_width="match_parent"
|
||
android:layout_height="48dp"
|
||
android:layout_marginTop="24dp"
|
||
android:background="@drawable/bg_phone_btn_primary"
|
||
android:gravity="center"
|
||
android:onClick="@{()-> viewModel.onSaveClick()}"
|
||
android:text="保存"
|
||
android:textColor="@color/white"
|
||
android:textSize="16sp"
|
||
android:textStyle="bold"
|
||
android:visibility="@{viewModel.pageType == DetailsPageType.Details ? View.GONE : View.VISIBLE}" />
|
||
|
||
</LinearLayout>
|
||
|
||
</ScrollView>
|
||
|
||
</LinearLayout>
|
||
|
||
</layout>
|