From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/res/layout/item_plant_details.xml | 480 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 321 insertions(+), 159 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 673daee..2572852 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -3,7 +3,7 @@
<com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_parent_swipeLayout"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_164">
+ android:layout_height="wrap_content">
<include
android:id="@+id/swipe_layout_il"
@@ -12,200 +12,362 @@
<RelativeLayout
android:id="@+id/item_parent_rl"
android:layout_width="match_parent"
- android:layout_height="164dp">
+ android:layout_height="204.5dp">
<RelativeLayout
android:id="@+id/device_details_info_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_148"
+ android:layout_height="194.5dp"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/ffffff_13">
-
+ android:background="@drawable/bj_ff1c1c1e">
+ <!--鐢电珯鍥剧墖-->
<ImageView
- android:id="@+id/device_details_image_iv"
+ android:id="@+id/home_image_iv"
android:layout_width="44dp"
android:layout_height="42dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_13"
- android:background="@drawable/default_user"
android:scaleType="centerCrop" />
-
- <TextView
- android:id="@+id/device_details_name_tv"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_19"
- android:layout_marginStart="@dimen/dp_11"
- android:layout_marginTop="@dimen/dp_15"
- android:layout_marginEnd="10dp"
- android:layout_toStartOf="@+id/fragment_house_list_line_state_tv"
- android:layout_toEndOf="@+id/device_details_image_iv"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:singleLine="true"
- android:text="@string/power_station"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/device_details_sn_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/device_details_name_tv"
- android:layout_alignStart="@+id/device_details_name_tv"
- android:layout_marginTop="@dimen/dp_3"
- android:gravity="center_vertical"
- android:text="@string/string_capacity"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/fragment_house_list_line_state_tv"
- android:layout_width="69dp"
- android:layout_height="@dimen/dp_33"
- android:layout_alignParentTop="true"
- android:layout_alignParentEnd="true"
- android:background="@drawable/state_ffb300"
- android:gravity="center"
- android:text="@string/my_power_station_connecting"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12" />
-
+ <!--鐢电珯鍚嶇О浠ュ強鍦板潃-->
<LinearLayout
- android:id="@+id/screening_condition_ll"
+ android:id="@+id/home_name_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_37"
- android:layout_below="@+id/device_details_image_iv"
- android:layout_alignStart="@+id/device_details_image_iv"
- android:layout_marginTop="@dimen/dp_17"
- android:layout_marginEnd="@dimen/dp_16"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_5"
+ android:layout_marginTop="13.5dp"
+ android:layout_toStartOf="@+id/home_debug_state_ll"
+ android:layout_toEndOf="@+id/home_image_iv"
+ android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
- android:id="@+id/power_ll"
- android:layout_width="0dp"
+ android:layout_width="@dimen/dp_19"
+ android:layout_height="@dimen/dp_19"
+ android:gravity="center">
+
+ <TextView
+ android:id="@+id/home_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:background="@drawable/device_state_ff38c494" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/home_name_tv"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
+ android:ellipsize="end"
+ android:gravity="center_vertical|start"
+ android:paddingStart="0dp"
+ android:paddingEnd="@dimen/dp_5"
+ android:singleLine="true"
+ android:text="@string/power_station"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+ </LinearLayout>
+ <!--鐢电珯鐘舵��-->
+ <LinearLayout
+ android:id="@+id/home_debug_state_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginTop="@dimen/dp_15"
+ android:orientation="horizontal">
- <TextView
- android:id="@+id/power_value_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18"
- android:gravity="center_vertical|start"
- android:text="0"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15" />
+ <ImageView
+ android:id="@+id/home_debug_state_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18" />
- <TextView
- android:id="@+id/power_type_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
- android:layout_marginTop="3dp"
- android:gravity="center_vertical|start"
- android:text="@string/generated_power"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
+ <TextView
+ android:id="@+id/home_debug_state_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingStart="0dp"
+ android:paddingEnd="@dimen/dp_16"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
+ <!--鐢电珯鍦板潃-->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_19"
+ android:layout_below="@+id/home_name_ll"
+ android:layout_alignStart="@+id/home_name_ll">
+ <ImageView
+ android:layout_width="@dimen/dp_19"
+ android:layout_height="@dimen/dp_19"
+ android:src="@drawable/location" />
+
+ <TextView
+ android:id="@+id/home_location_tv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:ellipsize="end"
+ android:gravity="center_vertical|start"
+ android:paddingStart="0dp"
+ android:paddingEnd="@dimen/dp_5"
+ android:singleLine="true"
+ android:text="@string/power_station"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/home_image_iv"
+ android:layout_alignStart="@+id/home_image_iv"
+ android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:orientation="horizontal">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/pv" />
+
+ <LinearLayout
+ android:id="@+id/pv_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+ <!--缁勪覆瀹归噺鍊�-->
+ <TextView
+ android:id="@+id/pv_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/pv_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kWp"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/pv_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/pv"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/generation_today" />
+
+ <LinearLayout
+ android:id="@+id/generation_today_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+
+ <TextView
+ android:id="@+id/generation_today_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/generation_today_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kW"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/generation_today_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/day_generation"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+ </LinearLayout>
</LinearLayout>
<LinearLayout
- android:id="@+id/day_ll"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_32">
- <TextView
- android:id="@+id/day_value_tv"
+ <View
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" />
-
- <TextView
- android:id="@+id/day_type_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
- android:layout_marginTop="3dp"
- android:gravity="center"
- android:text="@string/day_power_generation"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
-
+ android:layout_height="0.5dp"
+ android:layout_gravity="center"
+ android:background="@color/text_1AFFFFFF" />
</LinearLayout>
<LinearLayout
- android:id="@+id/month_ll"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:orientation="horizontal">
- <TextView
- android:id="@+id/month_value_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18"
- android:gravity="center_vertical|end"
- android:text="0"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15" />
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
- <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_vertical|end"
- android:text="@string/month_power_generation"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/output" />
+ <LinearLayout
+ android:id="@+id/output_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+ <!--缁勪覆瀹归噺鍊�-->
+ <TextView
+ android:id="@+id/output_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/output_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kWh"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/output_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/output"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/battery_storage" />
+
+ <LinearLayout
+ android:id="@+id/battery_storage_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+
+ <TextView
+ android:id="@+id/battery_storage_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/battery_storage_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kWh"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/battery_storage_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/battery_capacity_indicator"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
-
- <View
- android:id="@+id/line"
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_below="@+id/screening_condition_ll"
- android:layout_alignStart="@+id/device_details_image_iv"
- android:layout_marginTop="@dimen/dp_7"
- android:layout_marginEnd="@dimen/dp_16"
- android:background="@color/text_E1E1E1" />
- <!--鐢电珯鍦板潃-->
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33"
- android:layout_below="@+id/line"
- android:layout_marginStart="11dp">
-
- <ImageView
- android:id="@+id/plant_details_location_iv"
- android:layout_width="@dimen/dp_19"
- android:layout_height="@dimen/dp_19"
- android:layout_centerVertical="true"
- android:src="@drawable/location" />
-
- <TextView
- android:id="@+id/plant_details_location_tv"
- android:layout_width="290dp"
- android:layout_height="@dimen/dp_17"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_5"
- android:layout_toEndOf="@+id/plant_details_location_iv"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:singleLine="true"
- android:text="@string/power_station"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
- </RelativeLayout>
</RelativeLayout>
--
Gitblit v1.8.0