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_meeting_detail.xml | 71 ++++++++---------------------------
1 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/app/src/main/res/layout/activity_meeting_detail.xml b/app/src/main/res/layout/activity_meeting_detail.xml
index 503af42..357a39c 100644
--- a/app/src/main/res/layout/activity_meeting_detail.xml
+++ b/app/src/main/res/layout/activity_meeting_detail.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
+ <import type="com.android.app_base.utils.DateTimeConverter"/>
<variable
name="viewModel"
type="com.application.zhangshi_app_android.ui.function.MeetingDetailActivityViewModel" />
@@ -185,38 +186,20 @@
android:textColor="#DE000000"
android:textSize="16sp"
>
+ <EditText
+ android:id="@+id/et_start_time"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ紑濮嬫椂闂碻:``}"
+ android:inputType="text"
+ android:text="@={viewModel.beanLiveData.startTime}"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ app:isEditable="@{false}" />
- <EditText
- android:id="@+id/et_date1"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ紑濮嬫椂闂寸殑骞存湀鏃:``}"
- android:inputType="text"
- android:text="@={viewModel.beanLiveData.date1}"
- android:textColor="#DE000000"
- android:textColorHint="#6b000000"
- android:textSize="16sp"
- app:isEditable="@{false}" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=" "
- />
- <EditText
- android:id="@+id/et_time1"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ紑濮嬫椂闂寸殑鏃跺垎绉抈:``}"
- android:inputType="text"
- android:text="@={viewModel.beanLiveData.time1}"
- android:textColor="#DE000000"
- android:textColorHint="#6b000000"
- android:textSize="16sp"
- app:isEditable="@{false}" />
</LinearLayout>
@@ -239,38 +222,18 @@
>
<EditText
- android:id="@+id/et_date2"
+ android:id="@+id/et_end_time"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ粨鏉熸椂闂寸殑骞存湀鏃:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ粨鏉熸椂闂碻:``}"
android:inputType="text"
- android:text="@={viewModel.beanLiveData.date2}"
+ android:text="@={viewModel.beanLiveData.endTime}"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="16sp"
app:isEditable="@{false}" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=" "
- />
- <EditText
- android:id="@+id/et_time2"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:enabled="@{viewModel.typeLiveData}"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ粨鏉熸椂闂寸殑鏃跺垎绉抈:``}"
- android:inputType="text"
- android:text="@={viewModel.beanLiveData.time2}"
- android:textColor="#DE000000"
- android:textColorHint="#6b000000"
- android:textSize="16sp"
- app:isEditable="@{false}" />
-
-
</LinearLayout>
<TextView
--
Gitblit v1.9.1