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 | 482 +++++++++++++++++++++++++++++++----------------------
1 files changed, 279 insertions(+), 203 deletions(-)
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 9288dfe..cd50b72 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -4,11 +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"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent">
-
+ android:background="@drawable/dalog_bj_13_ff222222">
<RelativeLayout
android:id="@+id/cancel_affirm_cl"
@@ -32,7 +28,7 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/loading_cancel"
- android:textColor="@color/text_FF8E8E8E"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -45,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" />
@@ -62,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>
@@ -82,17 +78,20 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_18"
android:text="@string/string_capacity"
- android:textColor="@color/text_FF8E8E8E"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
- <RelativeLayout
+ <LinearLayout
android:id="@+id/min_max_rl"
- android:layout_width="match_parent"
+ 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">
@@ -100,241 +99,319 @@
<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:layout_height="match_parent"
android:background="@drawable/config_129"
android:gravity="center"
android:hint="@string/min"
android:inputType="number"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
<View
- android:layout_width="@dimen/dp_16"
+ 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:layout_alignParentStart="true"
- android:layout_marginStart="@dimen/dp_180"
- android:layout_marginTop="@dimen/dp_19"
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="@dimen/dp_35"
- android:layout_alignParentEnd="true"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
+ android:layout_height="match_parent"
android:background="@drawable/config_129"
android:gravity="center"
android:hint="@string/max"
android:inputType="number"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14" />
- </RelativeLayout>
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
- <TextView
- android:id="@+id/text1_tv"
- android:layout_width="102dp"
+ <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:background="@drawable/config_129"
- android:gravity="center"
- android:tag="0-5"
- android:text="0 ~ 5"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
+ android:layout_marginEnd="@dimen/dp_20"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/min_max_rl">
- <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/config_129"
- android:gravity="center"
- android:tag="5-10"
- android:text="5 ~ 10"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/text1_tv"
- app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+ <TextView
+ android:id="@+id/text1_tv"
+ android:layout_width="102dp"
+ 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_FFACACAC"
+ android:textSize="@dimen/text_12" />
- <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/config_129"
- android:gravity="center"
- android:tag="10-15"
- android:text="10 ~ 15"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/text2_tv"
- app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
- <TextView
- android:id="@+id/text4_tv"
- android:layout_width="102dp"
+ <TextView
+ android:id="@+id/text2_tv"
+ android:layout_width="102dp"
+ 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_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="match_parent"
+ android:background="@drawable/config_129"
+ android:gravity="center"
+ android:tag="10-15"
+ android:text="10 ~ 15"
+ 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_66"
- android:background="@drawable/config_129"
- android:gravity="center"
- android:tag="15-30"
- android:text="15 ~ 30"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
+ 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/min_max_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/line1_ll">
- <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/config_129"
- android:gravity="center"
- android:tag="30-100"
- android:text="30 ~ 100"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/text4_tv"
- app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+ <TextView
+ android:id="@+id/text4_tv"
+ android:layout_width="102dp"
+ android:layout_height="@dimen/dp_35"
+ android:background="@drawable/config_129"
+ android:gravity="center"
+ android:tag="15-30"
+ android:text="15 ~ 30"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_12" />
- <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/config_129"
- android:gravity="center"
- android:tag="100-300"
- android:text="100 ~ 300"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/text5_tv"
- app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
- <TextView
- android:id="@+id/text7_tv"
- android:layout_width="102dp"
+ <TextView
+ android:id="@+id/text5_tv"
+ android:layout_width="102dp"
+ 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_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="match_parent"
+ android:background="@drawable/config_129"
+ android:gravity="center"
+ android:tag="100-300"
+ android:text="100 ~ 300"
+ 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="114dp"
- android:background="@drawable/config_129"
- android:gravity="center"
- android:tag="300-500"
- android:text="300 ~ 500"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
+ 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/min_max_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/line2_ll">
- <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/config_129"
- android:gravity="center"
- android:tag="500+"
- android:text="500+"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/text7_tv"
- app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
+ <TextView
+ android:id="@+id/text7_tv"
+ android:layout_width="102dp"
+ 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_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="match_parent"
+ android:background="@drawable/config_129"
+ android:gravity="center"
+ android:tag="500+"
+ android:text="500+"
+ 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>
+
<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:layout_marginTop="37dp"
android:text="@string/grid_connected_state"
- android:textColor="@color/text_FF8E8E8E"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
- <!--鍏ㄩ儴-->
- <TextView
- android:id="@+id/all_tv"
- android:layout_width="102dp"
+ 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="13dp"
- android:background="@drawable/config_129"
- android:gravity="center"
- android:text="@string/message_all"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toStartOf="@+id/min_max_rl"
- app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
- <!--璋冭瘯涓�-->
- <TextView
- android:id="@+id/be_debugging_tv"
- android:layout_width="102dp"
- android:layout_height="@dimen/dp_35"
- android:layout_marginStart="@dimen/dp_15"
- android:layout_marginTop="13dp"
- android:background="@drawable/config_129"
- android:gravity="center"
- android:text="@string/be_debugging"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/all_tv"
- app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
- <!--璋冭瘯瀹屾垚-->
- <TextView
- android:id="@+id/debuggingc_ompleted_tv"
- android:layout_width="102dp"
- android:layout_height="@dimen/dp_35"
- android:layout_marginStart="@dimen/dp_15"
- android:layout_marginTop="13dp"
- android:background="@drawable/config_129"
- android:gravity="center"
- android:text="@string/debugging_completed"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/be_debugging_tv"
- app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
+ 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/delivered_tv"
- android:layout_width="102dp"
+ <!--鍏ㄩ儴-->
+ <TextView
+ android:id="@+id/all_tv"
+ android:layout_width="102dp"
+ android:layout_height="match_parent"
+ android:background="@drawable/config_129"
+ android:gravity="center"
+ android:text="@string/message_all"
+ 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/be_debugging_tv"
+ android:layout_width="102dp"
+ android:layout_height="match_parent"
+ android:background="@drawable/config_129"
+ android:gravity="center"
+ 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/debuggingc_ompleted_tv"
+ android:layout_width="102dp"
+ android:layout_height="match_parent"
+ android:background="@drawable/config_129"
+ android:gravity="center"
+ android:text="@string/debugging_completed"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/line5_ll"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_35"
- android:layout_marginTop="13dp"
- android:background="@drawable/config_129"
- android:gravity="center"
- android:text="@string/delivered"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toStartOf="@+id/all_tv"
- app:layout_constraintTop_toBottomOf="@+id/all_tv" />
- <!--鎺堟潈璋冭瘯-->
- <TextView
- android:id="@+id/authorization_debugging_tv"
- android:layout_width="102dp"
- android:layout_height="@dimen/dp_35"
- android:layout_marginStart="@dimen/dp_15"
- android:layout_marginTop="13dp"
- android:background="@drawable/config_129"
- android:gravity="center"
- android:text="@string/authorization_debugging"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/delivered_tv"
- app:layout_constraintTop_toBottomOf="@+id/all_tv" />
+ 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" />
+
+ <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"
@@ -344,7 +421,7 @@
android:background="@color/text_FF39383D"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/delivered_tv">
+ app:layout_constraintTop_toBottomOf="@+id/line5_ll">
<LinearLayout
android:layout_width="wrap_content"
@@ -367,9 +444,8 @@
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>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
--
Gitblit v1.8.0