From 7d0657f65c4f27e89e07bf936b586a00a8574779 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Thu, 4 Jan 2024 15:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=9C=A8=20Android?= =?UTF-8?q?=204.4=20=E4=B8=8A=E4=BD=BF=E7=94=A8=E7=9F=A2=E9=87=8F=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../res/color/selector_tab_text_color.xml | 7 +- .../res/drawable/auto_task_icon_battery.xml | 17 +++-- .../drawable/auto_task_icon_battery_grey.xml | 17 +++-- .../res/drawable/auto_task_icon_charge.xml | 17 +++-- .../drawable/auto_task_icon_charge_grey.xml | 17 +++-- .../res/drawable/auto_task_icon_cleaner.xml | 2 +- .../drawable/auto_task_icon_cleaner_grey.xml | 12 ++-- .../drawable/auto_task_icon_custom_time.xml | 17 +++-- .../auto_task_icon_custom_time_grey.xml | 4 +- .../main/res/drawable/auto_task_icon_frpc.xml | 2 +- .../res/drawable/auto_task_icon_frpc_grey.xml | 4 +- .../drawable/auto_task_icon_http_server.xml | 2 +- .../auto_task_icon_http_server_grey.xml | 4 +- .../res/drawable/auto_task_icon_incall.xml | 17 +++-- .../drawable/auto_task_icon_leave_address.xml | 22 ++++-- .../auto_task_icon_leave_address_grey.xml | 22 ++++-- .../drawable/auto_task_icon_left_arrow.xml | 13 +++- .../auto_task_icon_left_arrow_grey.xml | 13 +++- .../res/drawable/auto_task_icon_location.xml | 16 +++-- .../drawable/auto_task_icon_lock_screen.xml | 17 +++-- .../auto_task_icon_lock_screen_grey.xml | 17 +++-- .../res/drawable/auto_task_icon_network.xml | 22 ++++-- .../drawable/auto_task_icon_network_grey.xml | 22 ++++-- .../drawable/auto_task_icon_notification.xml | 2 +- .../auto_task_icon_notification_grey.xml | 4 +- .../main/res/drawable/auto_task_icon_rule.xml | 2 +- .../res/drawable/auto_task_icon_rule_grey.xml | 8 +-- .../res/drawable/auto_task_icon_sender.xml | 2 +- .../drawable/auto_task_icon_sender_grey.xml | 4 +- .../res/drawable/auto_task_icon_settings.xml | 2 +- .../drawable/auto_task_icon_settings_grey.xml | 4 +- .../main/res/drawable/auto_task_icon_sim.xml | 2 +- .../res/drawable/auto_task_icon_sim_grey.xml | 4 +- .../main/res/drawable/auto_task_icon_sms.xml | 2 +- .../res/drawable/auto_task_icon_sms_grey.xml | 4 +- .../auto_task_icon_start_activity.xml | 2 +- .../drawable/auto_task_icon_to_address.xml | 2 +- .../auto_task_icon_to_address_grey.xml | 22 ++++-- app/src/main/res/drawable/bg_bottom_sheet.xml | 2 +- .../bg_dialog_common_tip_corner_white.xml | 3 +- app/src/main/res/drawable/ic_logcat.xml | 4 +- .../res/drawable/ic_menu_logs_selected.xml | 2 +- .../res/drawable/ic_menu_rule_selected.xml | 2 +- .../res/drawable/ic_menu_send_selected.xml | 2 +- .../drawable/ic_menu_settings_selected.xml | 2 +- app/src/main/res/layout/dialog_guide_tips.xml | 2 +- app/src/main/res/layout/fragment_settings.xml | 70 +++++++++++++++++-- .../main/res/layout/include_toolbar_web.xml | 4 +- 49 files changed, 339 insertions(+), 127 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5dc44a96..8528d609 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,7 +43,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true - vectorDrawables.useSupportLibrary = true + //vectorDrawables.useSupportLibrary = true javaCompileOptions { annotationProcessorOptions { @@ -229,7 +229,7 @@ dependencies { //屏幕适配AutoSize:https://github.com/JessYanCoding/AndroidAutoSize implementation 'me.jessyan:autosize:1.2.1' //umeng统计 - implementation 'com.umeng.umsdk:common:9.6.5' + implementation 'com.umeng.umsdk:common:9.6.6' implementation 'com.umeng.umsdk:asms:1.8.0' //预加载占位控件 diff --git a/app/src/main/res/color/selector_tab_text_color.xml b/app/src/main/res/color/selector_tab_text_color.xml index 698460aa..e7d24296 100644 --- a/app/src/main/res/color/selector_tab_text_color.xml +++ b/app/src/main/res/color/selector_tab_text_color.xml @@ -1,5 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_battery.xml b/app/src/main/res/drawable/auto_task_icon_battery.xml index 1ee98ba1..c7580b31 100644 --- a/app/src/main/res/drawable/auto_task_icon_battery.xml +++ b/app/src/main/res/drawable/auto_task_icon_battery.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_battery_grey.xml b/app/src/main/res/drawable/auto_task_icon_battery_grey.xml index 92ebfdf2..743212d1 100644 --- a/app/src/main/res/drawable/auto_task_icon_battery_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_battery_grey.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_charge.xml b/app/src/main/res/drawable/auto_task_icon_charge.xml index 031e0695..ae1b61f9 100644 --- a/app/src/main/res/drawable/auto_task_icon_charge.xml +++ b/app/src/main/res/drawable/auto_task_icon_charge.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_charge_grey.xml b/app/src/main/res/drawable/auto_task_icon_charge_grey.xml index 88489e7b..229a15f0 100644 --- a/app/src/main/res/drawable/auto_task_icon_charge_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_charge_grey.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_cleaner.xml b/app/src/main/res/drawable/auto_task_icon_cleaner.xml index f2f26b49..d2b1058c 100644 --- a/app/src/main/res/drawable/auto_task_icon_cleaner.xml +++ b/app/src/main/res/drawable/auto_task_icon_cleaner.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> diff --git a/app/src/main/res/drawable/auto_task_icon_custom_time.xml b/app/src/main/res/drawable/auto_task_icon_custom_time.xml index 6dcc6a3c..3cb5345c 100644 --- a/app/src/main/res/drawable/auto_task_icon_custom_time.xml +++ b/app/src/main/res/drawable/auto_task_icon_custom_time.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml b/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml index 06fab5f3..05d716e8 100644 --- a/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml @@ -6,10 +6,10 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_frpc.xml b/app/src/main/res/drawable/auto_task_icon_frpc.xml index 53379501..d12420a9 100644 --- a/app/src/main/res/drawable/auto_task_icon_frpc.xml +++ b/app/src/main/res/drawable/auto_task_icon_frpc.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_http_server.xml b/app/src/main/res/drawable/auto_task_icon_http_server.xml index c67af1b6..dc8cf0b0 100644 --- a/app/src/main/res/drawable/auto_task_icon_http_server.xml +++ b/app/src/main/res/drawable/auto_task_icon_http_server.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_incall.xml b/app/src/main/res/drawable/auto_task_icon_incall.xml index 7c04e4d0..0f20de14 100644 --- a/app/src/main/res/drawable/auto_task_icon_incall.xml +++ b/app/src/main/res/drawable/auto_task_icon_incall.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_leave_address.xml b/app/src/main/res/drawable/auto_task_icon_leave_address.xml index a0622127..74153e18 100644 --- a/app/src/main/res/drawable/auto_task_icon_leave_address.xml +++ b/app/src/main/res/drawable/auto_task_icon_leave_address.xml @@ -1,7 +1,19 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml b/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml index fdd23e08..fc3c4b1f 100644 --- a/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml @@ -1,7 +1,19 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_left_arrow.xml b/app/src/main/res/drawable/auto_task_icon_left_arrow.xml index b74e1ae2..6bc7f609 100644 --- a/app/src/main/res/drawable/auto_task_icon_left_arrow.xml +++ b/app/src/main/res/drawable/auto_task_icon_left_arrow.xml @@ -1,5 +1,12 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml b/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml index d69fee56..f5ccdd66 100644 --- a/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml @@ -1,5 +1,12 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_location.xml b/app/src/main/res/drawable/auto_task_icon_location.xml index a4d9b263..4dd20985 100644 --- a/app/src/main/res/drawable/auto_task_icon_location.xml +++ b/app/src/main/res/drawable/auto_task_icon_location.xml @@ -1,6 +1,14 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_lock_screen.xml b/app/src/main/res/drawable/auto_task_icon_lock_screen.xml index 958e0478..ad28658a 100644 --- a/app/src/main/res/drawable/auto_task_icon_lock_screen.xml +++ b/app/src/main/res/drawable/auto_task_icon_lock_screen.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml b/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml index 9f193c73..2f600b4a 100644 --- a/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml @@ -1,6 +1,15 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_network.xml b/app/src/main/res/drawable/auto_task_icon_network.xml index f7eee1b2..85954bb7 100644 --- a/app/src/main/res/drawable/auto_task_icon_network.xml +++ b/app/src/main/res/drawable/auto_task_icon_network.xml @@ -1,7 +1,19 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_network_grey.xml b/app/src/main/res/drawable/auto_task_icon_network_grey.xml index f85a79bc..fecd4e60 100644 --- a/app/src/main/res/drawable/auto_task_icon_network_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_network_grey.xml @@ -1,7 +1,19 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_notification.xml b/app/src/main/res/drawable/auto_task_icon_notification.xml index 1dde84b6..7a2f3707 100644 --- a/app/src/main/res/drawable/auto_task_icon_notification.xml +++ b/app/src/main/res/drawable/auto_task_icon_notification.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_rule.xml b/app/src/main/res/drawable/auto_task_icon_rule.xml index def3c0a7..955d34cf 100644 --- a/app/src/main/res/drawable/auto_task_icon_rule.xml +++ b/app/src/main/res/drawable/auto_task_icon_rule.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_sender.xml b/app/src/main/res/drawable/auto_task_icon_sender.xml index c64dd433..781aceab 100644 --- a/app/src/main/res/drawable/auto_task_icon_sender.xml +++ b/app/src/main/res/drawable/auto_task_icon_sender.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_settings.xml b/app/src/main/res/drawable/auto_task_icon_settings.xml index bf42f73f..f6b077eb 100644 --- a/app/src/main/res/drawable/auto_task_icon_settings.xml +++ b/app/src/main/res/drawable/auto_task_icon_settings.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_sim.xml b/app/src/main/res/drawable/auto_task_icon_sim.xml index 366242ca..83d61485 100644 --- a/app/src/main/res/drawable/auto_task_icon_sim.xml +++ b/app/src/main/res/drawable/auto_task_icon_sim.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> diff --git a/app/src/main/res/drawable/auto_task_icon_sms.xml b/app/src/main/res/drawable/auto_task_icon_sms.xml index e4016012..006f52fe 100644 --- a/app/src/main/res/drawable/auto_task_icon_sms.xml +++ b/app/src/main/res/drawable/auto_task_icon_sms.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_start_activity.xml b/app/src/main/res/drawable/auto_task_icon_start_activity.xml index 0ff88ce0..8ca7b9f6 100644 --- a/app/src/main/res/drawable/auto_task_icon_start_activity.xml +++ b/app/src/main/res/drawable/auto_task_icon_start_activity.xml @@ -6,7 +6,7 @@ android:viewportWidth="25.0" android:viewportHeight="25.0"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml b/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml index c5aaeb90..8a2c8478 100644 --- a/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml +++ b/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml @@ -1,7 +1,19 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_bottom_sheet.xml b/app/src/main/res/drawable/bg_bottom_sheet.xml index d7a2ec0b..86cda1e9 100644 --- a/app/src/main/res/drawable/bg_bottom_sheet.xml +++ b/app/src/main/res/drawable/bg_bottom_sheet.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml b/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml index dbcadadd..dbc97541 100644 --- a/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml +++ b/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml @@ -2,8 +2,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logcat.xml b/app/src/main/res/drawable/ic_logcat.xml index 10d05ca4..9e750fb7 100644 --- a/app/src/main/res/drawable/ic_logcat.xml +++ b/app/src/main/res/drawable/ic_logcat.xml @@ -5,9 +5,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_menu_logs_selected.xml b/app/src/main/res/drawable/ic_menu_logs_selected.xml index 0f2cf989..ae65f6a5 100644 --- a/app/src/main/res/drawable/ic_menu_logs_selected.xml +++ b/app/src/main/res/drawable/ic_menu_logs_selected.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_menu_rule_selected.xml b/app/src/main/res/drawable/ic_menu_rule_selected.xml index 8c55c6d7..45c0c540 100644 --- a/app/src/main/res/drawable/ic_menu_rule_selected.xml +++ b/app/src/main/res/drawable/ic_menu_rule_selected.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_menu_send_selected.xml b/app/src/main/res/drawable/ic_menu_send_selected.xml index 760b7ba3..7651d799 100644 --- a/app/src/main/res/drawable/ic_menu_send_selected.xml +++ b/app/src/main/res/drawable/ic_menu_send_selected.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_menu_settings_selected.xml b/app/src/main/res/drawable/ic_menu_settings_selected.xml index c29dab58..86b6af3b 100644 --- a/app/src/main/res/drawable/ic_menu_settings_selected.xml +++ b/app/src/main/res/drawable/ic_menu_settings_selected.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/layout/dialog_guide_tips.xml b/app/src/main/res/layout/dialog_guide_tips.xml index 37c60afb..3747b4ff 100644 --- a/app/src/main/res/layout/dialog_guide_tips.xml +++ b/app/src/main/res/layout/dialog_guide_tips.xml @@ -51,7 +51,7 @@ android:layout_width="0dp" android:layout_weight="1" android:text="@string/tip_title" - android:textColor="?attr/colorAccent" + android:textColor="#299EE3" tools:ignore="TextContrastCheck" /> + tools:ignore="TouchTargetSizeCheck,DuplicateSpeakableTextCheck" /> @@ -808,7 +808,7 @@ @@ -987,6 +987,66 @@ + + + + + + + + + + + + + + + + + + + + @@ -1275,7 +1335,7 @@ @@ -12,7 +12,7 @@ + android:background="#299EE3">