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_family_member.xml | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/item_family_member.xml b/app/src/main/res/layout/item_family_member.xml
index 173e952..d5ed7a1 100644
--- a/app/src/main/res/layout/item_family_member.xml
+++ b/app/src/main/res/layout/item_family_member.xml
@@ -1,22 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
-
+ <variable
+ name="bean"
+ type="com.application.zhangshi_app_android.bean.HomeRootBean" />
</data>
<androidx.cardview.widget.CardView
+ android:id="@+id/cv_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="10dp"
app:cardElevation="5dp"
+ app:cardBackgroundColor="@color/white"
android:layout_margin="1dp">
+ <androidx.constraintlayout.utils.widget.ImageFilterView
+ android:id="@+id/iv_myself"
+ android:layout_width="18dp"
+ android:layout_height="18dp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginHorizontal="2dp"
+ android:background="@drawable/ic_myself"
+ app:roundPercent="1"
+ android:elevation="10dp"
+ android:visibility="gone"
+ tools:visibility="visible"
+ />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginHorizontal="12dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginStart="20dp"
android:layout_marginVertical="5dp"
android:orientation="horizontal"
android:gravity="center"
@@ -27,9 +45,13 @@
android:id="@+id/tv_generation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="1"
+ android:text="@{bean.identity+``}"
android:textSize="18sp"
android:textColor="#FFEBA4AA"
+ android:gravity="center"
+ android:maxLines="1"
+ tools:text="2"
+
/>
<!-- 澶村儚 -->
@@ -37,19 +59,21 @@
android:id="@+id/iv_avatar"
android:layout_width="30dp"
android:layout_height="30dp"
- android:layout_marginStart="8dp"
+ android:layout_marginStart="5dp"
android:layout_marginEnd="10dp"
- android:background="@drawable/img_sakura"
+ android:scaleType="fitCenter"
app:roundPercent="1"
+ app:imageUrl="@{bean.img}"
/>
<!-- 鍚嶅瓧 -->
<TextView
android:id="@+id/tv_name"
android:layout_width="70dp"
android:layout_height="wrap_content"
- android:text="鏋椾匠鏋椾匠"
+ android:text="@{bean.nickName}"
android:textSize="16sp"
- android:textColor="#FF5F6980"
+ android:textStyle="bold"
+ android:textColor="#FFF6739F"
android:ellipsize="marquee"
android:singleLine="true"
android:focusable="true"
--
Gitblit v1.9.1