From ce9298417731c02a1b41b83049f637abc356fc02 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 11:38:03 +0800
Subject: [PATCH] 2025年04月30日11:38:01

---
 app/src/main/res/layout/item_plant_details.xml |  398 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 224 insertions(+), 174 deletions(-)

diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 89b01b4..6074fcf 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -12,26 +12,25 @@
     <RelativeLayout
         android:id="@+id/item_parent_rl"
         android:layout_width="match_parent"
-        android:layout_height="160.5dp">
+        android:layout_height="204.5dp">
 
         <RelativeLayout
             android:id="@+id/device_details_info_rl"
             android:layout_width="match_parent"
-            android:layout_height="150.5dp"
+            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/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:scaleType="centerCrop" />
-
-
+            <!--鐢电珯鍚嶇О浠ュ強鍦板潃-->
             <LinearLayout
                 android:id="@+id/home_name_ll"
                 android:layout_width="match_parent"
@@ -43,28 +42,34 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/device_state_tv"
-                    android:layout_width="7dp"
-                    android:layout_height="7dp"
-                    android:background="@drawable/device_state_ff38c494" />
+                <LinearLayout
+                    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/device_details_name_tv"
+                    android:id="@+id/home_name_tv"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:ellipsize="end"
                     android:gravity="center_vertical|start"
-                    android:paddingStart="@dimen/dp_6"
-                    android:paddingEnd="@dimen/dp_20"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="@dimen/dp_5"
                     android:singleLine="true"
                     android:text="@string/power_station"
-                    android:textColor="@color/text_E6FFFFFF"
+                    android:textColor="@color/text_FFACACAC"
                     android:textSize="@dimen/text_14" />
             </LinearLayout>
-
-            <TextView
-                android:id="@+id/device_details_sn_tv"
+            <!--鐢电珯鐘舵��-->
+            <LinearLayout
+                android:id="@+id/home_debug_state_ll"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_18"
                 android:layout_alignParentTop="true"
@@ -123,201 +128,246 @@
                 android:orientation="vertical">
 
                 <LinearLayout
-                    android:id="@+id/power_ll"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:layout_width="match_parent"
+                    android:layout_height="37.5dp"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_18">
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
 
-                        <TextView
-                            android:id="@+id/power_value_tv"
+                        <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:gravity="center_vertical|start"
-                            android:text="0"
-                            android:textColor="@color/text_E6FFFFFF"
-                            android:textSize="@dimen/text_14" />
+                            android:orientation="vertical">
 
-                        <TextView
-                            android:id="@+id/power_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_66FFFFFF"
-                            android:textSize="@dimen/text_10" />
+                            <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>
-
-                    <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_66FFFFFF"
-                        android:textSize="@dimen/text_12" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="@dimen/dp_0"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center">
-
-                    <View
-                        android:layout_width="0.5dp"
-                        android:layout_height="17.5dp"
-                        android:layout_gravity="center"
-                        android:background="@color/text_1AFFFFFF" />
-                </LinearLayout>
-
-
-                <LinearLayout
-                    android:id="@+id/day_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_18">
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
 
-                        <TextView
-                            android:id="@+id/day_value_tv"
+                        <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:layout_gravity="center_horizontal"
-                            android:gravity="start|center_horizontal"
-                            android:text="0"
-                            android:textColor="@color/text_E6FFFFFF"
-                            android:textSize="@dimen/text_14" />
+                            android:orientation="vertical">
 
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/dp_20">
 
-                        <TextView
-                            android:id="@+id/day_kwh_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_66FFFFFF"
-                            android:textSize="@dimen/text_10" />
+                                <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>
-
-
-                    <TextView
-                        android:id="@+id/day_type_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_15"
-                        android:layout_marginTop="3dp"
-                        android:gravity="start|center_horizontal"
-                        android:text="@string/day_power_generation"
-                        android:textColor="@color/text_66FFFFFF"
-                        android:textSize="@dimen/text_12" />
-
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="@dimen/dp_0"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center">
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_32">
 
                     <View
-                        android:layout_width="0.5dp"
-                        android:layout_height="17.5dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="0.5dp"
                         android:layout_gravity="center"
                         android:background="@color/text_1AFFFFFF" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:id="@+id/month_ll"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:layout_width="match_parent"
+                    android:layout_height="37.5dp"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_18">
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
 
-                        <TextView
-                            android:id="@+id/month_value_tv"
+                        <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:gravity="center_vertical|start"
-                            android:text="0"
-                            android:textColor="@color/text_E6FFFFFF"
-                            android:textSize="@dimen/text_14" />
+                            android:orientation="vertical">
 
-                        <TextView
-                            android:id="@+id/month_kwh_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_66FFFFFF"
-                            android:textSize="@dimen/text_10" />
+                            <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">
 
-                    <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|start"
-                        android:text="@string/battery_capacity_indicator"
-                        android:textColor="@color/text_66FFFFFF"
-                        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/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="0.5dp"
-                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_1AFFFFFF" />
-            <!--鐢电珯鍦板潃-->
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_35"
-                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_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_66FFFFFF"
-                    android:textSize="@dimen/text_12" />
-            </RelativeLayout>
 
 
         </RelativeLayout>

--
Gitblit v1.8.0