From 5800f29b81907bebf493cbc968c6a671439a352d Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 10 三月 2025 17:52:33 +0800 Subject: [PATCH] 2025年03月10日17:52:31 --- app/src/main/res/layout/dialog_default_filtering.xml | 84 ++++++++++++++++++++++++++++-------------- 1 files changed, 56 insertions(+), 28 deletions(-) diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml index ea29aff..d8933e7 100644 --- a/app/src/main/res/layout/dialog_default_filtering.xml +++ b/app/src/main/res/layout/dialog_default_filtering.xml @@ -32,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> @@ -82,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" /> @@ -108,7 +108,7 @@ android:inputType="number" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" - android:textSize="@dimen/text_14" /> + android:textSize="@dimen/text_12" /> <View android:layout_width="@dimen/dp_16" @@ -131,7 +131,7 @@ android:inputType="number" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" - android:textSize="@dimen/text_14" /> + android:textSize="@dimen/text_12" /> </RelativeLayout> <TextView @@ -145,7 +145,7 @@ android:tag="0-5" android:text="0 ~ 5" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -160,7 +160,7 @@ android:tag="5-10" android:text="5 ~ 10" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toEndOf="@+id/text1_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -175,7 +175,7 @@ android:tag="10-15" android:text="10 ~ 15" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toEndOf="@+id/text2_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -190,7 +190,7 @@ android:tag="15-30" android:text="15 ~ 30" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -205,7 +205,7 @@ android:tag="30-100" android:text="30 ~ 100" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toEndOf="@+id/text4_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -220,7 +220,7 @@ android:tag="100-300" android:text="100 ~ 300" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toEndOf="@+id/text5_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -235,7 +235,7 @@ android:tag="300-500" android:text="300 ~ 500" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -250,7 +250,7 @@ android:tag="500+" android:text="500+" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toEndOf="@+id/text7_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -261,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" /> <!--鍏ㄩ儴--> @@ -276,37 +276,65 @@ android:gravity="center" android:text="@string/message_all" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/min_max_rl" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> - <!--骞剁綉--> + <!--璋冭瘯涓�--> <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_marginStart="@dimen/dp_15" android:layout_marginTop="13dp" android:background="@drawable/config_129" android:gravity="center" - android:text="@string/grid_connected" + android:text="@string/be_debugging" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_12" app:layout_constraintStart_toEndOf="@+id/all_tv" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> - <!--绂荤綉--> + <!--璋冭瘯瀹屾垚--> <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_marginStart="@dimen/dp_15" android:layout_marginTop="13dp" android:background="@drawable/config_129" android:gravity="center" - android:text="@string/off_network" + android:text="@string/debugging_completed" android:textColor="@color/text_E6FFFFFF" - android:textSize="@dimen/text_14" - app:layout_constraintStart_toEndOf="@+id/grid_connected_tv" + android:textSize="@dimen/text_12" + app:layout_constraintStart_toEndOf="@+id/be_debugging_tv" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> + + <!--宸蹭氦浠�--> + <TextView + android:id="@+id/delivered_tv" + android:layout_width="102dp" + 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_12" + 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_12" + app:layout_constraintStart_toEndOf="@+id/delivered_tv" + app:layout_constraintTop_toBottomOf="@+id/all_tv" /> <RelativeLayout android:id="@+id/reset_rl" @@ -316,7 +344,7 @@ android:background="@color/text_FF39383D" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/off_network_tv"> + app:layout_constraintTop_toBottomOf="@+id/delivered_tv"> <LinearLayout android:layout_width="wrap_content" -- Gitblit v1.8.0