From 48d331f05dde4bf27c6da22ecf067f0bc4a49649 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Tue, 2 Jun 2026 11:14:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E6=B7=BB=E5=8A=A0=E9=A4=90?=
=?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E5=92=8C=E5=A5=97=E9=A4=90=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E9=A3=9F=E6=9D=90=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 AndroidManifest.xml 中注册 MealListActivity 和 PackActivity
- 在 FoodMaterialAdapter 中添加溯源码显示功能
- 修改 GoodsItem 模型中 goodsName 和 materCode 为可变属性
- 更新 list_item_food_material 布局文件以支持溯源码显示
- 在 NutritionModels 中为 NutFoodComposition 添加 isMain 字段
- 将设置页面中的餐包功能重定向到 MealListActivity
---
app/src/main/AndroidManifest.xml | 10 +++++++
.../dish/match/adapter/FoodMaterialAdapter.kt | 2 ++
.../com/shuwei/dish/match/model/GoodsItem.kt | 4 +--
.../dish/match/model/NutritionModels.kt | 3 ++-
.../shuwei/dish/match/ui/SettingActivity.kt | 4 +--
.../res/layout/list_item_food_material.xml | 26 ++++++++++++++-----
6 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c6b3410..3aa6ed2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,6 +69,16 @@
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
+
+
+
) :
//} else {
// tvDishName.text = data.goodsName + "-${data.rawMaterialsType}"
//}
+ val showGoodsCode = (data.materCode ?: "").ifBlank { "-" }
+ tvGoodsCode.text = "溯源码：$showGoodsCode"
tvDishType.text = if (data.materialType == 1) "主辅材：主材" else if (data.materialType == 2) "主辅材：辅材" else ""
tvDishWeight.text =
if (data.useWeight == null || data.useWeight == 0.toDouble()) "" else "${data.useWeight!!.roundedOneDecimalPlace()}克"
diff --git a/app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt b/app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt
index 05eda21..942ec27 100644
--- a/app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt
@@ -11,11 +11,11 @@ import java.io.Serializable
data class GoodsItem(
// 接口返回字段
var goodsId: String = "",
- val goodsName: String? = null,
+ var goodsName: String? = null,
val popularName: String? = null,
val zjmCode: String? = null,
var materId: String? = null,
- val materCode: String? = null,
+ var materCode: String? = null,
// 从 CookFoodGoodsEntity 迁移的数据字段（DishPartAdapter 显示及转换用）
var materialType: Int = 0,
diff --git a/app/src/main/java/com/shuwei/dish/match/model/NutritionModels.kt b/app/src/main/java/com/shuwei/dish/match/model/NutritionModels.kt
index eba0780..a9ba561 100644
--- a/app/src/main/java/com/shuwei/dish/match/model/NutritionModels.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/NutritionModels.kt
@@ -73,7 +73,8 @@ data class NutFoodOptionVO(
@Parcelize
data class NutFoodComposition(
val materId: Long?,
- val ingredientName: String?
+ val ingredientName: String?,
+ val isMain: Int?
) : Parcelable
/**
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
index 0c114d0..d35ecd2 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
@@ -113,9 +113,7 @@ class SettingActivity : BaseActivity() {
SettingItem(
type = SettingItem.Type.MEAL_PACKAGE,
onClick = {
- //startActivity {
- // putExtra(CleanPackActivity.EXTRA_TYPE, CleanPackActivity.TYPE_MEAL)
- //}
+ startActivity { }
}
),
SettingItem(
diff --git a/app/src/main/res/layout/list_item_food_material.xml b/app/src/main/res/layout/list_item_food_material.xml
index f7a06d3..bd715e8 100644
--- a/app/src/main/res/layout/list_item_food_material.xml
+++ b/app/src/main/res/layout/list_item_food_material.xml
@@ -17,12 +17,11 @@
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:ellipsize="end"
- android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toTopOf="@+id/tvDishType"
+ app:layout_constraintBottom_toTopOf="@+id/tvGoodsCode"
app:layout_constraintEnd_toStartOf="@+id/tvDishWeight"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -30,19 +29,32 @@
tools:text="雪菜" />
+
+