Merge branch '1.5.1' into dev

wjc

2025-02-07 a1c880c476327032fe174af8c80d6f78a590dae9

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

@@ -1,26 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <RelativeLayout
        android:id="@+id/click_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_0"
        app:layout_constraintBottom_toTopOf="@+id/default_filtering_cl"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/default_filtering_cl"
        android:layout_width="match_parent"
        android:layout_height="447dp"
        android:background="@drawable/l_r_13"
    android:layout_height="wrap_content"
    android:background="@drawable/dalog_bj_13_ff222222"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">


        <RelativeLayout
            android:id="@+id/cancel_affirm_cl"
@@ -44,7 +32,7 @@
                    android:layout_height="match_parent"
                    android:gravity="center_vertical"
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_66FFFFFF"
                android:textColor="@color/text_FF8E8E8E"
                    android:textSize="@dimen/text_14" />
            </LinearLayout>

@@ -94,8 +82,8 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_18"
            android:text="@string/string_capacity"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_16"
        android:textColor="@color/text_FF8E8E8E"
        android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />

@@ -273,8 +261,8 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="167dp"
            android:text="@string/grid_connected_state"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_16"
        android:textColor="@color/text_FF8E8E8E"
        android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <!--全部-->
@@ -324,10 +312,11 @@
            android:id="@+id/reset_rl"
            android:layout_width="0dp"
            android:layout_height="@dimen/dp_52"
            android:background="@color/text_FF555859"
            app:layout_constraintBottom_toBottomOf="parent"
        android:layout_marginTop="@dimen/dp_26"
        android:background="@color/text_FF39383D"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent">
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/off_network_tv">

            <LinearLayout
                android:layout_width="wrap_content"
@@ -354,8 +343,5 @@
                    android:textSize="@dimen/text_14" />
            </LinearLayout>
        </RelativeLayout>


    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>