From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）
---
app/src/main/res/layout/activity_family_memorabilia_detail.xml | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/layout/activity_family_memorabilia_detail.xml b/app/src/main/res/layout/activity_family_memorabilia_detail.xml
index 790056b..4f038a2 100644
--- a/app/src/main/res/layout/activity_family_memorabilia_detail.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia_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/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{viewModel.beanMutableLiveData.id==0?`鏂板瀹跺ぇ浜嬭`:viewModel.beanMutableLiveData.title}"
+ app:title="@{viewModel.beanLiveData.id==0?`鏂板瀹跺ぇ浜嬭`:viewModel.beanLiveData.title}"
app:titleGravity="left"
>
<FrameLayout
@@ -27,6 +27,7 @@
android:layout_height="24dp"
android:layout_marginHorizontal="16dp"
android:layout_gravity="center_vertical|end"
+ android:visibility="@{viewModel.beanLiveData.ownData==1}"
>
<ImageView
android:id="@+id/iv_operate"
@@ -69,7 +70,7 @@
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanMutableLiveData.title}"
+ android:text="@={viewModel.beanLiveData.title}"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -88,13 +89,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ椂闂�(鏍煎紡锛�2001-01-01)`:``}"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃堕棿`:``}"
android:inputType="text"
- android:text="@={viewModel.beanMutableLiveData.happenTime}"
+ android:text="@={viewModel.beanLiveData.happenTime}"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
app:isEditable="@{false}"
/>
@@ -117,7 +118,7 @@
android:inputType="text"
android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ汉鐗ー:``}"
android:textColorHint="#6b000000"
- android:text="@={viewModel.beanMutableLiveData.people}"
+ android:text="@={viewModel.beanLiveData.people}"
android:textColor="#DE000000"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
@@ -141,7 +142,7 @@
android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ湴鐐筦:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanMutableLiveData.address}"
+ android:text="@={viewModel.beanLiveData.address}"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -165,7 +166,7 @@
android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ娉╜:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanMutableLiveData.remark}"
+ android:text="@={viewModel.beanLiveData.remark}"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
/>
--
Gitblit v1.9.1