Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -20,7 +20,7 @@
            android:layout_height="150.5dp"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            android:background="@drawable/bj_ff333738">
            android:background="@drawable/bj_ff1c1c1e">

            <ImageView
                android:id="@+id/device_details_image_iv"
@@ -128,7 +128,7 @@
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/power_kwp_unit"
                            android:id="@+id/power_kw_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"
@@ -186,12 +186,12 @@


                        <TextView
                            android:id="@+id/day_kwp_unit"
                            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="kW"
                            android:text="kWh"
                            android:textColor="@color/text_66FFFFFF"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>
@@ -242,12 +242,12 @@
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/month_kwp_unit"
                            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="kW"
                            android:text="kWh"
                            android:textColor="@color/text_66FFFFFF"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>
@@ -259,7 +259,7 @@
                        android:layout_height="@dimen/dp_15"
                        android:layout_marginTop="3dp"
                        android:gravity="center_vertical|start"
                        android:text="@string/month_power_generation"
                        android:text="@string/battery_capacity_indicator"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />

@@ -311,5 +311,4 @@

    </RelativeLayout>

</com.hdl.photovoltaic.widget.SwipeLayout>

</com.hdl.photovoltaic.widget.SwipeLayout>