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 | 82 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 16b7882..55aef9d 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -42,6 +42,14 @@
/>
+ <ImageView
+ android:id="@+id/edit_iv"
+ android:layout_width="@dimen/dp_31"
+ android:layout_height="@dimen/dp_31"
+ android:layout_marginEnd="@dimen/dp_13"
+ android:layout_toStartOf="@+id/add_iv"
+ android:src="@drawable/edit"
+ android:visibility="gone" />
<ImageView
android:id="@+id/add_iv"
@@ -119,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>
@@ -305,7 +313,7 @@
android:id="@+id/station_name_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/pv"
+ android:text="@string/station_name"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
@@ -338,7 +346,7 @@
android:id="@+id/station_power_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/output"
+ android:text="@string/generated_power"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
@@ -348,6 +356,36 @@
android:layout_height="@dimen/dp_18"
android:layout_toEndOf="@+id/station_power_tv"
android:background="@drawable/ascending_descending_order_select" />
+
+ </RelativeLayout>
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+
+ <RelativeLayout
+ android:id="@+id/station_day_rl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_day_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="@string/day_power_generation"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/station_day_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_day_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+
</RelativeLayout>
@@ -378,37 +416,6 @@
android:layout_toEndOf="@+id/station_month_tv"
android:background="@drawable/ascending_descending_order_select" />
</RelativeLayout>
-
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1" />
-
- <RelativeLayout
- android:id="@+id/station_day_rl"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/station_day_tv"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:text="@string/day_generation"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
-
- <ImageView
- android:id="@+id/station_day_iv"
- android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:layout_toEndOf="@+id/station_day_tv"
- android:background="@drawable/ascending_descending_order_select" />
-
-
- </RelativeLayout>
-
</LinearLayout>
@@ -534,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