From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54
---
app/src/main/res/layout/item_device_details.xml | 89 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index dd13f17..2ab825c 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -66,87 +66,86 @@
android:orientation="horizontal">
<LinearLayout
- android:id="@+id/power_ll"
+ android:id="@+id/device_label_run_state_ll"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
- android:id="@+id/power_value_tv"
+ android:id="@+id/device_label_run_state_value_tv"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_15"
android:textStyle="bold" />
<TextView
- android:id="@+id/power_type_tv"
+ android:id="@+id/device_label_run_state_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center"
- android:text="@string/generated_power"
+ android:text="@string/device_run_state"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
</LinearLayout>
<LinearLayout
- android:id="@+id/day_ll"
+ android:id="@+id/device_label_power_ll"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
- android:id="@+id/day_value_tv"
+ android:id="@+id/device_label_power_value_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
+ android:text="0"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_15"
android:textStyle="bold" />
<TextView
- android:id="@+id/day_type_tv"
+ android:id="@+id/device_label_power_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
+ android:layout_height="@dimen/dp_17"
+ android:layout_marginTop="3dp"
+ android:gravity="center"
+ android:text="@string/active_power"
+ android:textColor="@color/text_66000000"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/device_label_day_ll"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/device_label_day_value_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_18"
+ android:gravity="center"
+ android:text="0"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_15"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/device_label_day_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/day_power_generation"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/month_ll"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/month_value_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/month_type_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
- android:layout_marginTop="3dp"
- android:gravity="center"
- android:text="@string/month_power_generation"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -166,7 +165,7 @@
android:background="@color/text_E1E1E1" />
<ImageView
- android:id="@+id/plant_details_location_iv"
+ android:id="@+id/device_label_location_iv"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_below="@+id/line"
@@ -175,13 +174,13 @@
android:src="@drawable/location" />
<TextView
- android:id="@+id/plant_details_location_tv"
+ android:id="@+id/device_label_location_tv"
android:layout_width="290dp"
android:layout_height="@dimen/dp_19"
android:layout_below="@+id/line"
android:layout_marginStart="@dimen/dp_3"
android:layout_marginTop="@dimen/dp_8"
- android:layout_toEndOf="@+id/plant_details_location_iv"
+ android:layout_toEndOf="@+id/device_label_location_iv"
android:ellipsize="end"
android:gravity="center_vertical|start"
android:singleLine="true"
@@ -190,7 +189,7 @@
android:textSize="@dimen/text_12" />
<TextView
- android:id="@+id/fragment_house_list_line_state_tv"
+ android:id="@+id/device_label_state_tv"
android:layout_width="69dp"
android:layout_height="@dimen/dp_33"
android:layout_alignParentTop="true"
--
Gitblit v1.8.0