From 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期一, 02 九月 2024 13:52:17 +0800
Subject: [PATCH] 对新接口进行了适配
---
app/src/main/res/layout/activity_meeting_sta_detail.xml | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/activity_meeting_sta_detail.xml b/app/src/main/res/layout/activity_meeting_sta_detail.xml
index a142235..43aad00 100644
--- a/app/src/main/res/layout/activity_meeting_sta_detail.xml
+++ b/app/src/main/res/layout/activity_meeting_sta_detail.xml
@@ -6,7 +6,7 @@
<data>
<variable
name="viewModel"
- type="com.application.zhangshi_app_android.ui.function.MeetingDetailActivityViewModel" />
+ type="com.application.zhangshi_app_android.ui.function.MeetingStaDetailActivityViewModel" />
</data>
<LinearLayout
@@ -67,13 +67,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ爣棰榒:``}"
- android:text="@={viewModel.beanLiveData.title}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ搴彿`:``}"
+ android:text="@={viewModel.beanLiveData.familyId}"
android:enabled="@{viewModel.typeLiveData}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
/>
+
+
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_10"
@@ -89,8 +91,8 @@
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ湴鐐筦:``}"
- android:text="@={viewModel.beanLiveData.place}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ娇鐢ㄦ椂闂碻:``}"
+ android:text="@={viewModel.beanLiveData.useTime}"
android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
@@ -109,8 +111,8 @@
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ彲瀹圭撼浜烘暟`:``}"
- android:text="@={viewModel.beanLiveData.conPeople}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ細璁鍚嶇О`:``}"
+ android:text="@={viewModel.beanLiveData.conferenceRoom}"
android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
@@ -125,11 +127,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
- android:hint="@{viewModel.typeLiveData ? `璇疯緭鍏ュ弬涓庝汉鏁癭 : ``}"
+ android:hint="@{viewModel.typeLiveData ? `璇疯緭鍏ユ爣棰榒 : ``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanLiveData.partPeople}"
+ android:text="@={viewModel.beanLiveData.title}"
android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
@@ -163,11 +165,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ敵璇烽儴闂ㄦ垨瀹跺涵`:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ敵璇蜂汉`:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanLiveData.applyApart}"
+ android:text="@={viewModel.beanLiveData.applyPerson}"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -190,7 +192,7 @@
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanLiveData.statu}"
+ android:text="@={viewModel.beanLiveData.status}"
android:enabled="@{viewModel.typeLiveData}"
android:clickable="false"
android:focusable="false"
--
Gitblit v1.9.1