From cf2204a85fa951dd9ce2698378101d822e6edbc8 Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期六, 06 七月 2024 10:31:02 +0800
Subject: [PATCH] 会议审批显示成功

---
 app/src/main/res/layout/activity_webcast_detail.xml |   50 ++++++--------------------------------------------
 1 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/layout/activity_webcast_detail.xml b/app/src/main/res/layout/activity_webcast_detail.xml
index 634e0dd..01c1e10 100644
--- a/app/src/main/res/layout/activity_webcast_detail.xml
+++ b/app/src/main/res/layout/activity_webcast_detail.xml
@@ -4,7 +4,6 @@
     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.WebcastDetailActivityViewModel" />
@@ -151,37 +150,18 @@
                     >
 
                     <EditText
-                        android:id="@+id/et_date1"
+                        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:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ紑濮嬫椂闂碻:``}"
                         android:inputType="text"
-                        android:text="@={DateTimeConverter.dateFromString(viewModel.beanLiveData.startTime)}"
+                        android:text="@={viewModel.beanLiveData.startTime}"
                         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="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.startTime)}"
-                        android:textColor="#DE000000"
-                        android:textColorHint="#6b000000"
-                        android:textSize="16sp"
-                        app:isEditable="@{false}" />
-
 
                 </LinearLayout>
 
@@ -203,32 +183,14 @@
                     >
 
                     <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="@={DateTimeConverter.dateFromString(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="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.endTime)}"
+                        android:text="@={viewModel.beanLiveData.endTime}"
                         android:textColor="#DE000000"
                         android:textColorHint="#6b000000"
                         android:textSize="16sp"

--
Gitblit v1.9.1