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/activity_privacy_detail.xml | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/activity_privacy_detail.xml b/app/src/main/res/layout/activity_privacy_detail.xml
index a612368..2198d52 100644
--- a/app/src/main/res/layout/activity_privacy_detail.xml
+++ b/app/src/main/res/layout/activity_privacy_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
@@ -68,7 +68,7 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.time}"
+ android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -84,7 +84,7 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
- android:text="@={viewModel.beanLiveData.account}"
+ android:text="@={viewModel.beanLiveData.accNo}"
android:textColor="#DE000000"
android:textSize="16sp" />
<TextView
@@ -119,7 +119,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.effectiveTime}"
+ android:text="@={viewModel.beanLiveData.validityDate}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -136,7 +136,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@{viewModel.beanLiveData.isFingerprint==1?`鏄痐:`鍚}"
+ android:text="@{viewModel.beanLiveData.isFinger}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -153,7 +153,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@{viewModel.beanLiveData.isFace==1?`鏄痐:`鍚}"
+ android:text="@{viewModel.beanLiveData.isFace}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -170,7 +170,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@{viewModel.beanLiveData.isPublic==1?`鍏湁`:`绉佹湁`}"
+ android:text="@{viewModel.beanLiveData.isPrivate}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -206,6 +206,41 @@
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"
--
Gitblit v1.9.1