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

Conflicts: app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
2023-06-14 14:23:08 +08:00
parent 4e98a5745c 876d5bef44
commit 94467f21a1
46 changed files with 909 additions and 439 deletions
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,10 @@
 <resources>

+    <style name="main_activity_bottom_sheet_icon" comment="主控页面下方按钮样式">
+        <item name="android:layout_width">36dp</item>
+        <item name="android:layout_height">36dp</item>
+    </style>
+
    <style name="console_on_left_bottom_icon" comment="主控页面左侧右下角按钮样式">
        <item name="android:layout_width">24dp</item>
        <item name="android:layout_height">24dp</item>