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

feat: ui

Browse Source
This commit is contained in:
杨建宽
2025-11-27 18:07:14 +08:00
parent d69f964464
commit f797767919
4 changed files with 64 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt
View File

@@ -5,9 +5,11 @@ package com.lukouguoji.module_base.bean
*/ */
class UldInfoBean { class UldInfoBean {
var uldNo: String = "" // ULD编号 var uldNo: String = "" // ULD编号
var materialWeight: String = "" // 耗材重量
var uldStatus: String = "" // ULD状态
var planeType: String = "" // 机型 var planeType: String = "" // 机型
var weightLimit: String = "" // 限重 var weightLimit: String = "" // 限重
var totalPieces: String = "" // 总件数 var totalPieces: String = "" // 总件数
var totalWeight: String = "" // 总重量 var totalWeight: String = "" // 总重量
var status: String = "" // 状态 var status: String = "" // 状态(旧字段，保留兼容)
} }

9
module_base/src/main/java/com/lukouguoji/module_base/bean/WaybillInfoBean.kt
View File

@@ -5,8 +5,13 @@ package com.lukouguoji.module_base.bean
*/ */
class WaybillInfoBean { class WaybillInfoBean {
var waybillNo: String = "" // 运单号 var waybillNo: String = "" // 运单号
var pieces: String = "" // 件数 var waybillPieces: String = "" // 运单件数
var weight: String = "" // 重量 var waybillWeight: String = "" // 运单重量
var assembleCount: String = "" // 组装件数
var assembleWeight: String = "" // 组装重量
var operator: String = "" // 操作人
var pieces: String = "" // 件数(旧字段，保留兼容)
var weight: String = "" // 重量(旧字段，保留兼容)
var destination: String = "" // 目的港 var destination: String = "" // 目的港
var specialCode: String = "" // 特码 var specialCode: String = "" // 特码
var goodsName: String = "" // 品名 var goodsName: String = "" // 品名

21
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
View File

@@ -34,22 +34,19 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
// ========== ULD信息 ========== // ========== ULD信息 ==========
val uldInfo = MutableLiveData(UldInfoBean().apply { val uldInfo = MutableLiveData(UldInfoBean().apply {
uldNo = "AKE12345HK" uldNo = "PMC12345MU"
planeType = "B777" materialWeight = ""
weightLimit = "1500" uldStatus = "正常"
totalPieces = "120"
totalWeight = "2450.5"
status = "进行中"
}) })
// ========== 运单信息 ========== // ========== 运单信息 ==========
val waybillInfo = MutableLiveData(WaybillInfoBean().apply { val waybillInfo = MutableLiveData(WaybillInfoBean().apply {
waybillNo = "99912345678" waybillNo = "78112345678"
pieces = "25" waybillPieces = "100"
weight = "350.5" waybillWeight = "200"
destination = "LAX" assembleCount = ""
specialCode = "GEN" assembleWeight = ""
goodsName = "ELECTRONICS" operator = "张三"
}) })
/** /**

112
module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
View File

@@ -150,21 +150,21 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:background="@drawable/bg_white_radius_8" android:background="@drawable/bg_white_radius_8"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:padding="12dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ULD信息" android:text="ULD信息"
android:textColor="@color/text_normal" android:textColor="@color/text_normal"
android:textSize="16sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
<com.google.android.material.divider.MaterialDivider <com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="4dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="4dp"
app:dividerColor="@color/line" /> app:dividerColor="@color/line" />
<!-- ULD信息字段 - 使用PadDataLayoutNew横向排列 --> <!-- ULD信息字段 - 使用PadDataLayoutNew横向排列 -->
@@ -188,12 +188,12 @@
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"
enable="@{false}" enable="@{true}"
required="@{false}" required="@{true}"
title='@{"机型："}' title='@{"耗材重量："}'
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value="@={viewModel.uldInfo.planeType}" /> value="@={viewModel.uldInfo.materialWeight}" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp" android:layout_width="0dp"
@@ -201,50 +201,10 @@
android:layout_weight="1" android:layout_weight="1"
enable="@{false}" enable="@{false}"
required="@{false}" required="@{false}"
title='@{"限重："}' title='@{"ULD状态："}'
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value="@={viewModel.uldInfo.weightLimit}" /> value="@={viewModel.uldInfo.uldStatus}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
required="@{false}"
title='@{"总件数："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value="@={viewModel.uldInfo.totalPieces}" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
required="@{false}"
title='@{"总重量："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value="@={viewModel.uldInfo.totalWeight}" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
required="@{false}"
title='@{"状态："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value="@={viewModel.uldInfo.status}" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -254,21 +214,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_white_radius_8" android:background="@drawable/bg_white_radius_8"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:padding="12dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="运单信息" android:text="运单信息"
android:textColor="@color/text_normal" android:textColor="@color/text_normal"
android:textSize="16sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
<com.google.android.material.divider.MaterialDivider <com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="4dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="4dp"
app:dividerColor="@color/line" /> app:dividerColor="@color/line" />
<!-- 运单信息字段 --> <!-- 运单信息字段 -->
@@ -294,10 +254,10 @@
android:layout_weight="1" android:layout_weight="1"
enable="@{false}" enable="@{false}"
required="@{false}" required="@{false}"
title='@{"件数："}' title='@{"运单件数："}'
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value="@={viewModel.waybillInfo.pieces}" /> value="@={viewModel.waybillInfo.waybillPieces}" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp" android:layout_width="0dp"
@@ -305,10 +265,10 @@
android:layout_weight="1" android:layout_weight="1"
enable="@{false}" enable="@{false}"
required="@{false}" required="@{false}"
title='@{"重量："}' title='@{"运单重量："}'
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value="@={viewModel.waybillInfo.weight}" /> value="@={viewModel.waybillInfo.waybillWeight}" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -321,12 +281,23 @@
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"
enable="@{false}" enable="@{true}"
required="@{false}" required="@{false}"
title='@{"目的港："}' title='@{"组装件数："}'
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value="@={viewModel.waybillInfo.destination}" /> value="@={viewModel.waybillInfo.assembleCount}" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{true}"
required="@{true}"
title='@{"组装重量："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value="@={viewModel.waybillInfo.assembleWeight}" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp" android:layout_width="0dp"
@@ -334,21 +305,10 @@
android:layout_weight="1" android:layout_weight="1"
enable="@{false}" enable="@{false}"
required="@{false}" required="@{false}"
title='@{"特码："}' title='@{"操作人："}'
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value="@={viewModel.waybillInfo.specialCode}" /> value="@={viewModel.waybillInfo.operator}" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
required="@{false}"
title='@{"品名："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value="@={viewModel.waybillInfo.goodsName}" />
</LinearLayout> </LinearLayout>
@@ -356,9 +316,9 @@
<!-- 底部操作按钮 --> <!-- 底部操作按钮 -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="56dp"
android:gravity="center" android:gravity="center"
android:layout_marginTop="15dp" android:layout_marginTop="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingHorizontal="16dp"> android:paddingHorizontal="16dp">