Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -28,7 +28,7 @@
            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"
@@ -43,7 +43,7 @@
                android:layout_height="@dimen/dp_20"
                android:layout_marginStart="@dimen/dp_11"
                android:layout_marginTop="14.5dp"
                android:layout_toEndOf="@+id/device_details_image_iv"
                android:layout_toEndOf="@+id/home_image_iv"
                android:gravity="center_vertical"
                android:orientation="horizontal">

@@ -54,7 +54,7 @@
                    android:background="@drawable/device_state_ff38c494" />

                <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"
@@ -63,7 +63,7 @@
                    android:paddingEnd="@dimen/dp_20"
                    android:singleLine="true"
                    android:text="@string/power_station"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />
            </LinearLayout>

@@ -77,7 +77,7 @@
                android:layout_marginTop="2.5dp"
                android:gravity="center_vertical"
                android:text="SN:"
                android:textColor="@color/text_66FFFFFF"
                android:textColor="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_12" />

            <TextView
@@ -88,14 +88,14 @@
                android:layout_marginStart="3dp"
                android:layout_marginTop="1.5dp"
                android:layout_toEndOf="@+id/device_details_sn_tv"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14" />

            <LinearLayout
                android:id="@+id/screening_condition_ll"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_37"
                android:layout_below="@+id/device_details_image_iv"
                android:layout_below="@+id/home_image_iv"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_16"
                android:layout_marginEnd="@dimen/dp_32"
@@ -113,7 +113,7 @@
                        android:layout_height="@dimen/dp_18"
                        android:gravity="start"
                        android:text="0"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textColor="@color/text_FFACACAC"
                        android:textSize="@dimen/text_15" />

                    <TextView
@@ -123,7 +123,7 @@
                        android:layout_marginTop="3dp"
                        android:gravity="start"
                        android:text="@string/device_run_state"
                        android:textColor="@color/text_66FFFFFF"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>
@@ -158,7 +158,7 @@
                            android:layout_height="match_parent"
                            android:layout_gravity="center_horizontal"
                            android:text="0"
                            android:textColor="@color/text_E6FFFFFF"
                            android:textColor="@color/text_FFACACAC"
                            android:textSize="@dimen/text_14" />

                        <TextView
@@ -168,7 +168,7 @@
                            android:layout_marginStart="3dp"
                            android:gravity="bottom"
                            android:text="kW"
                            android:textColor="@color/text_66FFFFFF"
                            android:textColor="@color/text_FF5B5B5B"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>

@@ -179,7 +179,7 @@
                        android:layout_marginTop="3dp"
                        android:gravity="start|center_horizontal"
                        android:text="@string/active_power"
                        android:textColor="@color/text_66FFFFFF"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>
@@ -213,7 +213,7 @@
                            android:layout_height="match_parent"
                            android:gravity="center_vertical|start"
                            android:text="0"
                            android:textColor="@color/text_E6FFFFFF"
                            android:textColor="@color/text_FFACACAC"
                            android:textSize="@dimen/text_14" />

                        <TextView
@@ -223,7 +223,7 @@
                            android:layout_marginStart="3dp"
                            android:gravity="bottom"
                            android:text="kW"
                            android:textColor="@color/text_66FFFFFF"
                            android:textColor="@color/text_FF5B5B5B"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>

@@ -235,7 +235,7 @@
                        android:layout_marginTop="3dp"
                        android:gravity="start"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_66FFFFFF"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>
@@ -276,7 +276,7 @@
                    android:gravity="center_vertical|start"
                    android:singleLine="true"
                    android:text="@string/power_station"
                    android:textColor="@color/text_66FFFFFF"
                    android:textColor="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_12" />
            </RelativeLayout>