Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Conflicts: app/src/main/res/layout/adapter_task_list.xml
2023-05-06 15:39:31 +08:00
parent 3733634eb5 be9e582048
commit 8e4d1c7e0e
37 changed files with 245 additions and 75 deletions
--- a/app/src/main/res/layout/adapter_offline_map_city.xml
+++ b/app/src/main/res/layout/adapter_offline_map_city.xml
@@ -39,7 +39,6 @@
        android:gravity="center"
        android:shadowColor="@android:color/transparent"
        android:text="下载"
-        android:textColor="@color/btn_blue_solid"
        android:textSize="@dimen/card_title_font_2size" />

    <TextView