From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成
---
app/src/main/res/layout/activity_tourism_detail.xml | 345 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 280 insertions(+), 65 deletions(-)
diff --git a/app/src/main/res/layout/activity_tourism_detail.xml b/app/src/main/res/layout/activity_tourism_detail.xml
index d0f9eb1..e806b06 100644
--- a/app/src/main/res/layout/activity_tourism_detail.xml
+++ b/app/src/main/res/layout/activity_tourism_detail.xml
@@ -16,11 +16,27 @@
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{viewModel.beanLiveData.title}"
+ app:title="@{viewModel.beanLiveData.title==null?`鏂板鏃呮父璐圭敤璁板綍`:viewModel.beanLiveData.title}"
app:titleGravity="left"
- />
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}"
+ />
+ </FrameLayout>
+ </com.android.app_base.widget.ExtendTitleBar>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -47,10 +63,12 @@
android:layout_height="wrap_content"
android:inputType="text"
android:autofillHints="creditCardNumber"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ爣棰榒:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@{viewModel.beanLiveData.title}"
+ android:text="@={viewModel.beanLiveData.title}"
+ android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
@@ -63,13 +81,21 @@
/>
<EditText
+ android:id="@+id/et_start_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
- android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨寮�濮嬫椂闂碻:``}"
android:textColor="#DE000000"
android:text="@={viewModel.beanLiveData.startTime}"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:focusable="false"
+ android:cursorVisible="false"
+ android:longClickable="false"
+ android:clickable="@{viewModel.typeLiveData}"
+ android:backgroundTint="#6B000000"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -79,14 +105,21 @@
android:textSize="12sp"
/>
<EditText
+ android:id="@+id/et_end_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
- android:inputType="text"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨缁撴潫鏃堕棿`:``}"
android:text="@={viewModel.beanLiveData.endTime}"
android:textColor="#DE000000"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:clickable="@{viewModel.typeLiveData}"
+ android:focusable="false"
+ android:cursorVisible="false"
+ android:longClickable="false"
+ android:backgroundTint="#6B000000"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -95,15 +128,38 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalDay}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_total_day"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="number"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.totalDay}"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_total_day"
+ app:layout_constraintStart_toStartOf="@id/et_total_day"
+ app:layout_constraintBottom_toBottomOf="@id/et_total_day"
+ app:layout_constraintEnd_toEndOf="@id/et_total_day"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -112,15 +168,37 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalMoney}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_total_cost"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.totalCost}"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_total_cost"
+ app:layout_constraintStart_toStartOf="@id/et_total_cost"
+ app:layout_constraintBottom_toBottomOf="@id/et_total_cost"
+ app:layout_constraintEnd_toEndOf="@id/et_total_cost"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -139,15 +217,37 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="aaa"
- android:text="@={viewModel.beanLiveData.totalMoney}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_total_cost1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:text="@={viewModel.beanLiveData.totalCost}"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_total_cost1"
+ app:layout_constraintStart_toStartOf="@id/et_total_cost1"
+ app:layout_constraintBottom_toBottomOf="@id/et_total_cost1"
+ app:layout_constraintEnd_toEndOf="@id/et_total_cost1"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
</LinearLayout>
<LinearLayout
@@ -164,14 +264,37 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.mealMoney}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_eat"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.eat}"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_eat"
+ app:layout_constraintStart_toStartOf="@id/et_eat"
+ app:layout_constraintBottom_toBottomOf="@id/et_eat"
+ app:layout_constraintEnd_toEndOf="@id/et_eat"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
</LinearLayout>
</LinearLayout>
@@ -193,15 +316,36 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="aaa"
- android:text="@={viewModel.beanLiveData.hotelMoney}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_stay"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.stay}"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_stay"
+ app:layout_constraintStart_toStartOf="@id/et_stay"
+ app:layout_constraintBottom_toBottomOf="@id/et_stay"
+ app:layout_constraintEnd_toEndOf="@id/et_stay"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
@@ -218,14 +362,36 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.trafficMoney}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_traffic"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.traffic}"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_traffic"
+ app:layout_constraintStart_toStartOf="@id/et_traffic"
+ app:layout_constraintBottom_toBottomOf="@id/et_traffic"
+ app:layout_constraintEnd_toEndOf="@id/et_traffic"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
@@ -247,15 +413,36 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="aaa"
- android:text="@={viewModel.beanLiveData.ticketMoney}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_entrance"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.entrance}"
+ android:textSize="16sp"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_entrance"
+ app:layout_constraintStart_toStartOf="@id/et_entrance"
+ app:layout_constraintBottom_toBottomOf="@id/et_entrance"
+ app:layout_constraintEnd_toEndOf="@id/et_entrance"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
@@ -272,14 +459,36 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.shoppingMoney}"
- android:textSize="16sp" />
+ >
+ <EditText
+ android:id="@+id/et_shopping"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.shopping}"
+ android:textSize="16sp"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_shopping"
+ app:layout_constraintStart_toStartOf="@id/et_shopping"
+ app:layout_constraintBottom_toBottomOf="@id/et_shopping"
+ app:layout_constraintEnd_toEndOf="@id/et_shopping"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
@@ -298,19 +507,25 @@
android:textColor="@color/black"
/>
<ImageView
+ android:id="@+id/iv_add_daily_consume_record"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/ic_tourism_add"
+ android:background="@{viewModel.typeLiveData?@drawable/ic_tourism_add:null}"
/>
</LinearLayout>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/rv_daily_consume_record"
- android:orientation="vertical"
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
- />
+ >
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_daily_consume_record"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+ </RelativeLayout>
</LinearLayout>
--
Gitblit v1.9.1