Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -25,7 +25,7 @@
            android:layout_centerVertical="true"
            android:gravity="center"
            android:text="@string/power_station"
            android:textColor="@color/text_FFACACAC"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_18" />

        <TextView
@@ -37,11 +37,19 @@
            android:layout_toEndOf="@+id/power_station_label"
            android:gravity="center"
            android:text="@string/device"
            android:textColor="@color/text_FF5B5B5B"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"

            />

        <ImageView
            android:id="@+id/edit_iv"
            android:layout_width="@dimen/dp_31"
            android:layout_height="@dimen/dp_31"
            android:layout_marginEnd="@dimen/dp_13"
            android:layout_toStartOf="@+id/add_iv"
            android:src="@drawable/edit"
            android:visibility="gone" />

        <ImageView
            android:id="@+id/add_iv"
@@ -109,7 +117,7 @@
                        android:layout_marginStart="@dimen/dp_11"
                        android:layout_toEndOf="@+id/power_station_search_iv"
                        android:text="@string/search_station"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_14" />
                </RelativeLayout>

@@ -153,7 +161,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_FFACACAC"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                    <TextView
@@ -164,7 +172,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/message_all"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

@@ -190,7 +198,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_FFACACAC"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                    <TextView
@@ -201,7 +209,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/my_power_station_malfunction"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

@@ -227,7 +235,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_FFACACAC"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                    <TextView
@@ -238,7 +246,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/my_power_station_off_line"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

@@ -264,7 +272,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_FFACACAC"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                    <TextView
@@ -275,7 +283,7 @@
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/to_be_added"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

@@ -305,8 +313,8 @@
                        android:id="@+id/station_name_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="@string/pv"
                        android:textColor="@color/text_FFACACAC"
                        android:text="@string/station_name"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14"

                        />
@@ -338,8 +346,8 @@
                        android:id="@+id/station_power_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="@string/output"
                        android:textColor="@color/text_FFACACAC"
                        android:text="@string/generated_power"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />

                    <ImageView
@@ -348,6 +356,36 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_power_tv"
                        android:background="@drawable/ascending_descending_order_select" />

                </RelativeLayout>

                <View
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1" />

                <RelativeLayout
                    android:id="@+id/station_day_rl"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_gravity="center_horizontal"
                    android:orientation="horizontal">

                    <TextView
                        android:id="@+id/station_day_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />

                    <ImageView
                        android:id="@+id/station_day_iv"
                        android:layout_width="@dimen/dp_18"
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_day_tv"
                        android:background="@drawable/ascending_descending_order_select" />


                </RelativeLayout>

@@ -368,7 +406,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="@string/battery_capacity_indicator"
                        android:textColor="@color/text_FFACACAC"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />

                    <ImageView
@@ -378,37 +416,6 @@
                        android:layout_toEndOf="@+id/station_month_tv"
                        android:background="@drawable/ascending_descending_order_select" />
                </RelativeLayout>

                <View
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1" />

                <RelativeLayout
                    android:id="@+id/station_day_rl"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_gravity="center_horizontal"
                    android:orientation="horizontal">

                    <TextView
                        android:id="@+id/station_day_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="@string/day_generation"
                        android:textColor="@color/text_FFACACAC"
                        android:textSize="@dimen/text_14" />

                    <ImageView
                        android:id="@+id/station_day_iv"
                        android:layout_width="@dimen/dp_18"
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_day_tv"
                        android:background="@drawable/ascending_descending_order_select" />


                </RelativeLayout>


            </LinearLayout>

@@ -493,7 +500,7 @@
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/device_search_iv"
                    android:text="@string/enter_the_device_sn_and_device_name"
                    android:textColor="@color/text_FF5B5B5B"
                    android:textColor="@color/text_66FFFFFF"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>

@@ -534,9 +541,4 @@
    </androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>





</androidx.constraintlayout.widget.ConstraintLayout>