From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段

---
 app/src/main/res/layout/item_honor_collection.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/app/src/main/res/layout/item_honor_collection.xml b/app/src/main/res/layout/item_honor_collection.xml
index f5d3a31..67c38ff 100644
--- a/app/src/main/res/layout/item_honor_collection.xml
+++ b/app/src/main/res/layout/item_honor_collection.xml
@@ -19,7 +19,7 @@
             android:layout_height="40dp"
             android:layout_margin="@dimen/dp_2"
             app:cardCornerRadius="@dimen/dp_10"
-            app:cardBackgroundColor="@color/color_card_pink"
+            app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
             tools:layout_height="wrap_content"
             >
             <LinearLayout
@@ -33,6 +33,17 @@
                     android:layout_height="40dp"
                     android:gravity="center_vertical">
 
+                    <ImageView
+                        android:id="@+id/iv_flower"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="3dp"
+                        android:layout_centerVertical="true"
+                        android:background="?attr/icIsOwnFamilyDataFlower"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        />
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/textView1"
                         android:layout_width="0dp"

--
Gitblit v1.9.1