From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/fragment_house_list.xml | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 5109c5a..55aef9d 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -5,7 +5,7 @@
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FF161616">
+ android:background="@color/text_FF000000">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
@@ -97,7 +97,7 @@
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_17"
android:layout_toStartOf="@+id/power_station_default_condition_iv"
- android:background="@drawable/search_bj_ff333738">
+ android:background="@drawable/search_bj_ff1c1c1e">
<ImageView
@@ -127,7 +127,7 @@
android:layout_height="@dimen/dp_31"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:src="@drawable/default_condition" />
+ android:src="@drawable/condition_screening" />
</RelativeLayout>
@@ -405,7 +405,7 @@
android:id="@+id/station_month_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/month_power_generation"
+ android:text="@string/battery_capacity_indicator"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
@@ -478,7 +478,7 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/search_bj_ff333738"
+ android:background="@drawable/search_bj_ff1c1c1e"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -541,9 +541,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0