From 590c1cff46b105d774271f950caa9f65523f05c1 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 29 十二月 2023 20:20:40 +0800
Subject: [PATCH] 1、增加护眼模式主题\n2、修复显示问题

---
 app/src/main/res/layout/activity_pet_memo_detail.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/activity_pet_memo_detail.xml b/app/src/main/res/layout/activity_pet_memo_detail.xml
index 39609c0..1701cf8 100644
--- a/app/src/main/res/layout/activity_pet_memo_detail.xml
+++ b/app/src/main/res/layout/activity_pet_memo_detail.xml
@@ -12,14 +12,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_normal_background"
+        android:background="?attr/pageBackgroundColor"
         android:orientation="vertical">
 
         <com.android.app_base.widget.ExtendTitleBar
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:leftIcon="@drawable/ic_back"
-            app:title="@{viewModel.beanLiveData.name+`(浠呬緵鏌ョ湅)`}"
+            app:title="@{viewModel.beanLiveData.title+`(浠呬緵鏌ョ湅)`}"
             app:titleGravity="left"
             />
         <ScrollView
@@ -51,7 +51,7 @@
                     android:textColorHint="#6b000000"
                     android:textColor="#DE000000"
                     android:textSize="16sp"
-                    android:text="@={viewModel.beanLiveData.name}"
+                    android:text="@={viewModel.beanLiveData.title}"
                     />
 
                 <TextView
@@ -69,7 +69,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"
@@ -85,7 +85,7 @@
                     android:layout_marginTop="2dp"
                     android:inputType="text"
                     android:textColorHint="#6b000000"
-                    android:text="@={viewModel.beanLiveData.reminderTime}"
+                    android:text="@={viewModel.beanLiveData.remindTime}"
                     android:textColor="#DE000000"
                     android:textSize="16sp" />
                 <TextView

--
Gitblit v1.9.1