From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'

---
 app/src/main/res/layout/dialog_default_filtering.xml |  597 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 357 insertions(+), 240 deletions(-)

diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 6af9e25..cd50b72 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -1,334 +1,451 @@
 <?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:id="@+id/default_filtering_cl"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:background="@drawable/dalog_bj_13_ff222222">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/default_filtering_cl"
+    <RelativeLayout
+        android:id="@+id/cancel_affirm_cl"
         android:layout_width="match_parent"
-        android:layout_height="405dp"
-        android:background="@color/ffffff"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="@dimen/dp_52"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <RelativeLayout
-            android:id="@+id/cancel_affirm_cl"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_52"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <LinearLayout
-                android:id="@+id/cancel_ll"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentStart="true"
-                android:layout_marginStart="@dimen/dp_20"
-                android:orientation="horizontal">
-
-                <TextView
-
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:text="@string/loading_cancel"
-                    android:textColor="@color/text_66000000"
-                    android:textSize="@dimen/text_18" />
-            </LinearLayout>
+        <LinearLayout
+            android:id="@+id/cancel_ll"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="@dimen/dp_20"
+            android:orientation="horizontal">
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_toStartOf="@+id/affirm_ll"
-                android:layout_toEndOf="@+id/cancel_ll"
-                android:gravity="center"
-                android:text="@string/filtering"
-                android:textColor="@color/text_E6000000"
-                android:textSize="@dimen/dp_18" />
 
-            <LinearLayout
-                android:id="@+id/affirm_ll"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical|start"
-                    android:text="@string/loading_affirm"
-                    android:textColor="@color/text_38C494"
-                    android:textSize="@dimen/text_18" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_1"
-                android:layout_alignParentBottom="true"
-                android:background="@color/text_E1E1E1" />
-
-        </RelativeLayout>
-
+                android:gravity="center_vertical"
+                android:text="@string/loading_cancel"
+                android:textColor="@color/text_FFACACAC"
+                android:textSize="@dimen/text_14" />
+        </LinearLayout>
 
         <TextView
-
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_23"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_18"
-            android:text="@string/string_capacity"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_16"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
-
-        <ImageView
-            android:layout_width="@dimen/dp_19"
-            android:layout_height="@dimen/dp_17"
-            android:layout_marginTop="@dimen/dp_21"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:src="@drawable/reset"
-            app:layout_constraintEnd_toStartOf="@+id/reset_tv"
-            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
-
-        <TextView
-            android:id="@+id/reset_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_23"
-            android:layout_marginTop="@dimen/dp_18"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:text="@string/reset"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_16"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
-
-        <RelativeLayout
-            android:id="@+id/min_max_rl"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginTop="@dimen/dp_54"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl">
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_toStartOf="@+id/affirm_ll"
+            android:layout_toEndOf="@+id/cancel_ll"
+            android:gravity="center"
+            android:text="@string/filtering"
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/dp_18"
+            android:visibility="gone" />
 
-            <EditText
-                android:id="@+id/min_et"
-                android:layout_width="@dimen/dp_135"
-                android:layout_height="@dimen/dp_35"
-                android:layout_marginStart="@dimen/dp_20"
-                android:background="@drawable/search_bj_ff05000000"
-                android:gravity="center"
-                android:inputType="number"
-                android:textColor="@color/text_E6000000"
-                android:textColorHint="@color/text_66000000"
+        <LinearLayout
+            android:id="@+id/affirm_ll"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="@dimen/dp_20"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical|start"
+                android:text="@string/loading_affirm"
+                android:textColor="@color/text_FFACACAC"
                 android:textSize="@dimen/text_14" />
+        </LinearLayout>
 
-            <View
-                android:layout_width="@dimen/dp_16"
-                android:layout_height="1dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginStart="@dimen/dp_180"
-                android:layout_marginTop="@dimen/dp_19"
-                android:background="@color/text_E1E1E1" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_alignParentBottom="true"
+            android:background="@color/text_1AFFFFFF" />
 
-            <EditText
-                android:id="@+id/max_et"
-                android:layout_width="@dimen/dp_135"
-                android:layout_height="@dimen/dp_35"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="@dimen/dp_20"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:background="@drawable/search_bj_ff05000000"
-                android:gravity="center"
-                android:inputType="number"
-                android:textColor="@color/text_E6000000"
-                android:textColorHint="@color/text_66000000"
-                android:textSize="@dimen/text_14" />
-        </RelativeLayout>
+    </RelativeLayout>
+
+
+    <TextView
+        android:id="@+id/capacity_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_23"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_18"
+        android:text="@string/string_capacity"
+        android:textColor="@color/text_FFACACAC"
+        android:textSize="@dimen/text_14"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
+
+
+    <LinearLayout
+        android:id="@+id/min_max_rl"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_54"
+        android:layout_marginEnd="@dimen/dp_20"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl">
+
+        <EditText
+            android:id="@+id/min_et"
+            android:layout_width="@dimen/dp_135"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
+            android:gravity="center"
+            android:hint="@string/min"
+            android:inputType="number"
+            android:textColor="@color/text_FFACACAC"
+            android:textColorHint="@color/text_FF5B5B5B"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+
+        <View
+            android:layout_width="@dimen/dp_15"
+            android:layout_height="0.5dp"
+            android:background="@color/text_E1E1E1" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <EditText
+            android:id="@+id/max_et"
+            android:layout_width="@dimen/dp_135"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
+            android:gravity="center"
+            android:hint="@string/max"
+            android:inputType="number"
+            android:textColor="@color/text_FFACACAC"
+            android:textColorHint="@color/text_FF5B5B5B"
+            android:textSize="@dimen/text_12" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/line1_ll"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_18"
+        android:layout_marginEnd="@dimen/dp_20"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/min_max_rl">
 
         <TextView
             android:id="@+id/text1_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_18"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="0-5"
             android:text="0 ~ 5"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
         <TextView
             android:id="@+id/text2_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_18"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="5-10"
             android:text="5 ~ 10"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toEndOf="@+id/text1_tv"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
         <TextView
             android:id="@+id/text3_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_18"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="10-15"
             android:text="10 ~ 15"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toEndOf="@+id/text2_tv"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/line2_ll"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_11"
+        android:layout_marginEnd="@dimen/dp_20"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line1_ll">
 
         <TextView
             android:id="@+id/text4_tv"
             android:layout_width="102dp"
             android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_66"
-            android:background="@drawable/search_bj_ff05000000"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="15-30"
             android:text="15 ~ 30"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
         <TextView
             android:id="@+id/text5_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_66"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="30-100"
             android:text="30 ~ 100"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toEndOf="@+id/text4_tv"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
         <TextView
             android:id="@+id/text6_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_66"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="100-300"
             android:text="100 ~ 300"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toEndOf="@+id/text5_tv"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/line3_ll"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_11"
+        android:layout_marginEnd="@dimen/dp_20"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line2_ll">
 
         <TextView
             android:id="@+id/text7_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="114dp"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="300-500"
             android:text="300 ~ 500"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
         <TextView
             android:id="@+id/text8_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_15"
-            android:layout_marginTop="114dp"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:tag="500+"
             android:text="500+"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toEndOf="@+id/text7_tv"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
         <TextView
-            android:id="@+id/grid_connected_state_title_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_23"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="167dp"
-            android:text="@string/grid_connected_state"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_16"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+            android:layout_width="102dp"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+
+    <TextView
+        android:id="@+id/grid_connected_state_title_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_23"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="37dp"
+        android:text="@string/grid_connected_state"
+        android:textColor="@color/text_FFACACAC"
+        android:textSize="@dimen/text_14"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line3_ll" />
+
+    <LinearLayout
+        android:id="@+id/line4_ll"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_8"
+        android:layout_marginEnd="@dimen/dp_20"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv">
+
         <!--鍏ㄩ儴-->
         <TextView
             android:id="@+id/all_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="13dp"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
             android:text="@string/message_all"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toStartOf="@+id/min_max_rl"
-            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
-        <!--骞剁綉-->
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+        <!--璋冭瘯涓�-->
         <TextView
-            android:id="@+id/grid_connected_tv"
+            android:id="@+id/be_debugging_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="13dp"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
-            android:text="@string/grid_connected"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toEndOf="@+id/all_tv"
-            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
-        <!--绂荤綉-->
+            android:text="@string/be_debugging"
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+        <!--璋冭瘯瀹屾垚-->
         <TextView
-            android:id="@+id/off_network_tv"
+            android:id="@+id/debuggingc_ompleted_tv"
             android:layout_width="102dp"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="13dp"
-            android:background="@drawable/search_bj_ff05000000"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
             android:gravity="center"
-            android:text="@string/off_network"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_14"
-            app:layout_constraintStart_toEndOf="@+id/grid_connected_tv"
-            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
+            android:text="@string/debugging_completed"
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
 
+    </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <LinearLayout
+        android:id="@+id/line5_ll"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_11"
+        android:layout_marginEnd="@dimen/dp_20"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line4_ll">
+        <!--宸蹭氦浠�-->
+        <TextView
+            android:id="@+id/delivered_tv"
+            android:layout_width="102dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
+            android:gravity="center"
+            android:text="@string/delivered"
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+        <!--鎺堟潈璋冭瘯-->
+        <TextView
+            android:id="@+id/authorization_debugging_tv"
+            android:layout_width="102dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/config_129"
+            android:gravity="center"
+            android:text="@string/authorization_debugging"
+            android:textColor="@color/text_FFACACAC"
+            android:textSize="@dimen/text_12" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <TextView
+            android:layout_width="102dp"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/reset_rl"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_52"
+        android:layout_marginTop="@dimen/dp_26"
+        android:background="@color/text_FF39383D"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line5_ll">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/dp_19"
+                android:layout_height="@dimen/dp_19"
+                android:src="@drawable/reset" />
+
+            <View
+                android:layout_width="@dimen/dp_7"
+                android:layout_height="match_parent" />
+
+            <TextView
+                android:id="@+id/reset_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/reset"
+                android:textColor="@color/text_FFACACAC"
+                android:textSize="@dimen/text_14" />
+        </LinearLayout>
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

--
Gitblit v1.8.0