From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成
---
app/src/main/res/layout/activity_family_assets_detail.xml | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/layout/activity_family_assets_detail.xml b/app/src/main/res/layout/activity_family_assets_detail.xml
index fb54eb1..934a442 100644
--- a/app/src/main/res/layout/activity_family_assets_detail.xml
+++ b/app/src/main/res/layout/activity_family_assets_detail.xml
@@ -10,7 +10,7 @@
</data>
<LinearLayout
- tools:context=".ui.function.CreateFamilyProjectActivity"
+ tools:context=".ui.function.FamilyMemorabiliaDetailActivity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_normal_background"
@@ -19,8 +19,8 @@
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="鍝堝搱鍝�"
app:titleGravity="left"
+ app:title="@{viewModel.beanLiveData.holder + `鐨刞 + viewModel.beanLiveData.type}"
/>
<ScrollView
android:layout_width="match_parent"
@@ -69,7 +69,7 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.createTime}"
+ android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -156,9 +156,45 @@
android:textColor="#DE000000"
android:text="@={viewModel.beanLiveData.remark}"
android:textSize="16sp" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="澶囧繕鏈�"
+ android:textColor="#FF000000"
+ android:textSize="20sp"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_tourism_add"
+ android:layout_marginEnd="15dp"
+ android:visibility="gone"
+ />
+ </LinearLayout>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_memo"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/item_memo"
+ tools:itemCount="2"
+ />
+ </RelativeLayout>
+
<TextView
android:layout_width="wrap_content"
- android:layout_marginTop="10dp"
+ android:layout_marginTop="15dp"
android:layout_height="wrap_content"
android:text="鐢靛瓙鏂囦欢"
android:textColor="#767375"
@@ -167,24 +203,23 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="20dp"
- android:background="@drawable/shape_6b0000_stroke"
>
<com.android.app_base.widget.WrapRecyclerView
android:id="@+id/rv_image"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
- android:layout_marginTop="2sp"
+ android:background="@drawable/shape_6b0000_stroke"
+ android:layout_marginBottom="20dp"
+ android:layout_marginTop="2dp"
android:paddingStart="10dp"
android:paddingEnd="5dp"
android:paddingVertical="10dp"
/>
-
</RelativeLayout>
+
</LinearLayout>
</ScrollView>
--
Gitblit v1.9.1