Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -4,7 +4,7 @@
    android:id="@+id/default_filtering_cl"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/dalog_bj_13_ff222222">
    android:background="@drawable/dalog_bj_13_ff1c1c1c">

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

@@ -41,7 +41,7 @@
            android:layout_toEndOf="@+id/cancel_ll"
            android:gravity="center"
            android:text="@string/filtering"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/dp_18"
            android:visibility="gone" />

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

@@ -78,7 +78,7 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_18"
        android:text="@string/string_capacity"
        android:textColor="@color/text_E6FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
@@ -104,8 +104,8 @@
            android:gravity="center"
            android:hint="@string/min"
            android:inputType="number"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textColorHint="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12" />

        <View
@@ -132,8 +132,8 @@
            android:gravity="center"
            android:hint="@string/max"
            android:inputType="number"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textColorHint="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12" />
    </LinearLayout>

@@ -156,7 +156,7 @@
            android:gravity="center"
            android:tag="0-5"
            android:text="0 ~ 5"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -172,7 +172,7 @@
            android:gravity="center"
            android:tag="5-10"
            android:text="5 ~ 10"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -188,7 +188,7 @@
            android:gravity="center"
            android:tag="10-15"
            android:text="10 ~ 15"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />


@@ -213,7 +213,7 @@
            android:gravity="center"
            android:tag="15-30"
            android:text="15 ~ 30"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -229,7 +229,7 @@
            android:gravity="center"
            android:tag="30-100"
            android:text="30 ~ 100"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -245,7 +245,7 @@
            android:gravity="center"
            android:tag="100-300"
            android:text="100 ~ 300"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />


@@ -270,7 +270,7 @@
            android:gravity="center"
            android:tag="300-500"
            android:text="300 ~ 500"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -286,7 +286,7 @@
            android:gravity="center"
            android:tag="500+"
            android:text="500+"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -308,7 +308,7 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="37dp"
        android:text="@string/grid_connected_state"
        android:textColor="@color/text_E6FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/line3_ll" />
@@ -332,7 +332,7 @@
            android:background="@drawable/config_129"
            android:gravity="center"
            android:text="@string/message_all"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -347,7 +347,7 @@
            android:background="@drawable/config_129"
            android:gravity="center"
            android:text="@string/be_debugging"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -362,7 +362,7 @@
            android:background="@drawable/config_129"
            android:gravity="center"
            android:text="@string/debugging_completed"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

    </LinearLayout>
@@ -385,7 +385,7 @@
            android:background="@drawable/config_129"
            android:gravity="center"
            android:text="@string/delivered"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -400,7 +400,7 @@
            android:background="@drawable/config_129"
            android:gravity="center"
            android:text="@string/authorization_debugging"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_12" />

        <View
@@ -444,7 +444,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/reset"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14" />
        </LinearLayout>
    </RelativeLayout>