From 9a5e12883dc80df47c7a8b0558adaa5cf5ec3d1f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 03 七月 2024 18:54:15 +0800
Subject: [PATCH] 2024年07月03日18:54:08

---
 app/src/main/res/layout/item_plant_details.xml |   95 +++++++++++++++++++++++++----------------------
 1 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 1b7cf5e..673daee 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -33,10 +33,12 @@
 
             <TextView
                 android:id="@+id/device_details_name_tv"
-                android:layout_width="170dp"
+                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"
@@ -58,13 +60,26 @@
                 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:layout_width="match_parent"
-                android:layout_height="@dimen/dp_36"
+                android:layout_height="@dimen/dp_37"
                 android:layout_below="@+id/device_details_image_iv"
-                android:layout_marginStart="@dimen/dp_16"
+                android:layout_alignStart="@+id/device_details_image_iv"
                 android:layout_marginTop="@dimen/dp_17"
+                android:layout_marginEnd="@dimen/dp_16"
                 android:orientation="horizontal">
 
                 <LinearLayout
@@ -78,7 +93,7 @@
                         android:id="@+id/power_value_tv"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_18"
-                        android:gravity="center"
+                        android:gravity="center_vertical|start"
                         android:text="0"
                         android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_15" />
@@ -88,7 +103,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_15"
                         android:layout_marginTop="3dp"
-                        android:gravity="center"
+                        android:gravity="center_vertical|start"
                         android:text="@string/generated_power"
                         android:textColor="@color/text_66000000"
                         android:textSize="@dimen/text_12" />
@@ -134,7 +149,7 @@
                         android:id="@+id/month_value_tv"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_18"
-                        android:gravity="center"
+                        android:gravity="center_vertical|end"
                         android:text="0"
                         android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_15" />
@@ -144,7 +159,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_15"
                         android:layout_marginTop="3dp"
-                        android:gravity="center"
+                        android:gravity="center_vertical|end"
                         android:text="@string/month_power_generation"
                         android:textColor="@color/text_66000000"
                         android:textSize="@dimen/text_12" />
@@ -159,46 +174,38 @@
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_below="@+id/screening_condition_ll"
-                android:layout_marginStart="@dimen/dp_17"
-                android:layout_marginTop="@dimen/dp_8"
+                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" />
-
-            <ImageView
-                android:id="@+id/plant_details_location_iv"
-                android:layout_width="@dimen/dp_19"
-                android:layout_height="@dimen/dp_19"
-                android:layout_below="@+id/line"
-                android:layout_marginStart="@dimen/dp_11"
-                android:layout_marginTop="@dimen/dp_7"
-                android:src="@drawable/location" />
-
-            <TextView
-                android:id="@+id/plant_details_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: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" />
-
-            <TextView
-                android:id="@+id/fragment_house_list_line_state_tv"
-                android:layout_width="69dp"
+            <!--鐢电珯鍦板潃-->
+            <RelativeLayout
+                android:layout_width="match_parent"
                 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" />
+                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