From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/activity_house_search.xml | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 158 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml
index e4c352c..c17c4a5 100644
--- a/app/src/main/res/layout/activity_house_search.xml
+++ b/app/src/main/res/layout/activity_house_search.xml
@@ -4,6 +4,164 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.powerstation.HouseSearchActivity">
+ <!--鎼滅储-->
+ <RelativeLayout
+ android:id="@+id/power_station_search_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_35"
+ android:layout_marginTop="@dimen/dp_48"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <RelativeLayout
+ android:id="@+id/back_rl"
+ android:layout_width="@dimen/dp_50"
+ android:layout_height="match_parent">
+
+ <ImageView
+ android:id="@+id/power_station_back_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_17"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_16"
+ android:src="@drawable/search_back" />
+ </RelativeLayout>
+
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_7"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:layout_toStartOf="@+id/power_station_search_tv"
+ android:layout_toEndOf="@+id/back_rl"
+ android:background="@drawable/search_bj_ff05000000">
+
+ <ImageView
+ android:id="@+id/power_station_search_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_13"
+ android:src="@drawable/search_path" />
+
+ <EditText
+ android:id="@+id/power_station_search_et"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_11"
+ android:layout_marginEnd="@dimen/dp_40"
+ android:layout_toEndOf="@+id/power_station_search_iv"
+ android:background="@null"
+ android:gravity="start|center_vertical"
+ android:hint="@string/search_station"
+ android:textColor="@color/text_E6000000"
+ android:textColorHint="@color/text_66000000"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/power_station_clear_iv"
+ android:layout_width="@dimen/dp_20"
+ android:layout_height="@dimen/dp_20"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13"
+ android:src="@drawable/clear" />
+ </RelativeLayout>
+
+ <TextView
+ android:id="@+id/power_station_search_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:gravity="center"
+ android:text="@string/search"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_16" />
+
+
+ </RelativeLayout>
+ <!--鍘嗗彶璁板綍-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/history_list_parent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
+
+ <TextView
+ android:id="@+id/history_list_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_23"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_23"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:text="@string/history_search"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_16"
+ android:textStyle="bold"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <ImageView
+ android:id="@+id/power_station_del_iv"
+ android:layout_width="@dimen/dp_26"
+ android:layout_height="@dimen/dp_26"
+ android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:src="@drawable/history_del"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/history_list_rcv"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginTop="67dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <!--鎼滅储鏁版嵁-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/list_parent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginTop="@dimen/dp_30"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/list_srl"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/list_rcv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0