Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

 app/src/main/res/layout/item_plant_details.xml

@@ -19,9 +19,10 @@
            android:layout_width="match_parent"
            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/home_image_iv"
                android:layout_width="44dp"
@@ -29,14 +30,14 @@
                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"
                android:layout_height="@dimen/dp_20"
                android:layout_marginStart="@dimen/dp_5"
                android:layout_marginTop="14.5dp"
                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">
@@ -47,7 +48,7 @@
                    android:gravity="center">

                    <TextView
                        android:id="@+id/device_state_tv"
                        android:id="@+id/home_state_tv"
                        android:layout_width="7dp"
                        android:layout_height="7dp"
                        android:background="@drawable/device_state_ff38c494" />
@@ -59,13 +60,37 @@
                    android:layout_height="match_parent"
                    android:ellipsize="end"
                    android:gravity="center_vertical|start"
                    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_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">

                <ImageView
                    android:id="@+id/home_debug_state_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18" />

                <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"
@@ -80,10 +105,12 @@

                <TextView
                    android:id="@+id/home_location_tv"
                    android:layout_width="280dp"
                    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"