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"
@@ -105,14 +105,13 @@
                android:layout_below="@+id/device_details_image_iv"
                android:layout_alignStart="@+id/device_details_image_iv"
                android:layout_marginTop="@dimen/dp_16"
                android:layout_marginEnd="@dimen/dp_16"
                android:layout_marginEnd="@dimen/dp_32"
                android:orientation="horizontal">

                <LinearLayout
                    android:id="@+id/power_ll"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:orientation="vertical">

                    <LinearLayout
@@ -129,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"
@@ -151,17 +150,24 @@

                </LinearLayout>

                <View
                    android:layout_width="0.5dp"
                    android:layout_height="17.5dp"
                    android:layout_gravity="center"
                    android:background="@color/text_1AFFFFFF" />
                <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="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:orientation="vertical">

                    <LinearLayout
@@ -174,20 +180,18 @@
                            android:layout_height="match_parent"
                            android:layout_gravity="center_horizontal"
                            android:gravity="start|center_horizontal"
                            android:paddingStart="@dimen/dp_26"
                            android:paddingEnd="@dimen/dp_0"
                            android:text="0"
                            android:textColor="@color/text_E6FFFFFF"
                            android:textSize="@dimen/text_14" />


                        <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>
@@ -199,25 +203,29 @@
                        android:layout_height="@dimen/dp_15"
                        android:layout_marginTop="3dp"
                        android:gravity="start|center_horizontal"
                        android:paddingStart="@dimen/dp_26"
                        android:paddingEnd="@dimen/dp_0"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>

                <View
                    android:layout_width="0.5dp"
                    android:layout_height="17.5dp"
                    android:layout_gravity="center"
                    android:background="@color/text_1AFFFFFF" />
                <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/month_ll"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:orientation="vertical">

                    <LinearLayout
@@ -229,19 +237,17 @@
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:gravity="center_vertical|start"
                            android:paddingStart="@dimen/dp_26"
                            android:paddingEnd="@dimen/dp_0"
                            android:text="0"
                            android:textColor="@color/text_E6FFFFFF"
                            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>
@@ -253,9 +259,7 @@
                        android:layout_height="@dimen/dp_15"
                        android:layout_marginTop="3dp"
                        android:gravity="center_vertical|start"
                        android:paddingStart="@dimen/dp_26"
                        android:paddingEnd="@dimen/dp_0"
                        android:text="@string/month_power_generation"
                        android:text="@string/battery_capacity_indicator"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />

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

    </RelativeLayout>

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

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