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

app/src/main/res/drawable/btn_delete_xml.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_enabled="true" android:state_pressed="false" android:drawable="@drawable/icon_delete"/>
+    <item android:state_pressed="true" android:drawable="@drawable/icon_delete_p"/>
+	<item android:state_enabled="false" android:drawable="@drawable/icon_delete"/>
+</selector>

app/src/main/res/layout/activity_main.xml

@@ -44,6 +44,7 @@
                 android:layout_marginTop="20dp"
                 android:onClick="@{()->mainActivity.openMenu()}"
                 android:src="@drawable/baseline_person_24"
+                android:background="@null"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -55,36 +56,42 @@
                 app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center"
                 app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />
 
-            <ImageButton
-                android:id="@+id/main_activity_location"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginBottom="80dp"
-                android:onClick="@{()->viewModel.onClickLocationButton()}"
-                android:src="@drawable/baseline_my_location_24"
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                android:layout_marginBottom="108dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent" />
+                app:layout_constraintRight_toRightOf="parent"
+                tools:ignore="MissingConstraints">
 
-            <ImageButton
-                android:id="@+id/main_activity_voice"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginBottom="120dp"
-                android:src="@drawable/baseline_keyboard_voice_24"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
 
-            <ImageButton
-                android:id="@+id/main_activity_line"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginBottom="10dp"
-                android:onClick="@{()->mainActivity.voiceOnclick()}"
-                android:src="@drawable/baseline_keyboard_voice_24"
-                app:layout_constraintBottom_toTopOf="@id/main_activity_voice"
-                app:layout_constraintRight_toRightOf="@id/main_activity_voice" />
+                <ImageButton
+                    android:id="@+id/main_activity_voice"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/icon_add_voice"
+                    android:background="@null" />
+
+                <ImageButton
+                    android:id="@+id/main_activity_line"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:onClick="@{()->mainActivity.voiceOnclick()}"
+                    android:src="@drawable/icon_add_data"
+                    android:background="@null" />
+
+                <ImageButton
+                    android:id="@+id/main_activity_location"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:onClick="@{()->viewModel.onClickLocationButton()}"
+                    android:src="@drawable/icon_location"
+                    android:background="@null" />
+
+            </LinearLayout>
+
 
             <fragment
                 android:id="@+id/main_activity_middle_fragment"
@@ -118,6 +125,7 @@
                 android:layout_marginTop="20dp"
                 android:onClick="@{()->mainActivity.openCamera()}"
                 android:src="@drawable/icon_page_video_a1"
+                android:background="@null"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -129,6 +137,7 @@
                 android:layout_marginTop="20dp"
                 android:onClick="@{()->mainActivity.openCamera()}"
                 android:src="@drawable/baseline_person_24"
+                android:background="@null"
                 android:visibility="gone"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/fragment_evaluation_result.xml

@@ -28,13 +28,12 @@
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/evaluation_bar"
-                style="@style/Widget.MaterialComponents.Toolbar.Surface"
+                style="@style/card_title_font_default"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="@color/default_blue"
+                android:background="@color/white"
                 app:menu="@menu/evaluation_bar_mean"
-                app:navigationIcon="@drawable/btn_back_xml"
-                app:title="测评结果" />
+                app:title="Mark" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -128,6 +127,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    style="@style/card_title_font_default"
                     android:text="多媒体" />
 
                 <androidx.recyclerview.widget.RecyclerView

app/src/main/res/menu/evaluation_bar_mean.xml

@@ -5,7 +5,7 @@
     <item
         android:id="@+id/delete"
         android:contentDescription="删除数据"
-        android:icon="@drawable/baseline_delete_forever_24"
+        android:icon="@drawable/btn_delete_xml"
         android:title="删除"
         app:showAsAction="ifRoom" />
     <item

app/src/main/res/values/colors.xml

@@ -162,6 +162,7 @@
     <color name="cv_gray_153">#999999</color>
     <color name="cvm_red">#FF3B30</color>
     <color name="btn_blue_solid">#108ee9</color>
+    <color name="titleColor">#2631DD</color>
     <!-- 一键连接对话框背景色 -->
     <color name="bg_gray2">#d1d1d1</color>
     <!-- 一键连接时间显示区域背景色 -->

app/src/main/res/values/dimens.xml

@@ -7,6 +7,7 @@
     <dimen name="nav_header_height">176dp</dimen>
     <dimen name="default_widget_padding">10dp</dimen>
     <dimen name="default_font_size" comment="默认字体大小，style中父最顶层">15sp</dimen>
+    <dimen name="card_title_font_size">24sp</dimen>
     <dimen name="card_title_font_2size">13sp</dimen>
     <dimen name="card_title_font_3size">10sp</dimen>
     <dimen name="one">1dp</dimen>

app/src/main/res/values/styles.xml

@@ -23,6 +23,15 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <!-- 默认字体 -->
+    <style name="card_title_font_default">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textSize">@dimen/card_title_font_size</item>
+        <item name="android:textColor">@color/titleColor</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
     <!-- 默认字体 -->
     <style name="content_font_default_size_13sp">
         <item name="android:gravity">center_vertical</item>

collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java

@@ -249,7 +249,7 @@ public final class NIMapView extends RelativeLayout {
 
         // 增加比例尺图层
         NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
-        naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 25, 60);
+        naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 20, 84);
 
 //        if (gridLayer == null) {
 //            gridLayer = new TileGridLayer(getVtmMap());

collect-library/src/main/res/drawable/map_zoom_bg_xml.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="72dp" android:height="155dp">
+        <shape android:shape="rectangle">
+            <stroke android:width="3px" android:color="#FFFFF0" />
+            <solid android:color="#FFFFFFFF" />
+            <corners android:radius="36dp" />
+        </shape>
+    </item>
+</selector>

collect-library/src/main/res/layout/base_map_layout.xml

@@ -32,6 +32,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="48dp"
+        android:background="@drawable/map_zoom_bg_xml"
         android:orientation="vertical"
         android:padding="@dimen/nimap_defalut_padding">
 
@@ -39,7 +42,7 @@
             android:id="@+id/navinfo_map_zoom_in"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_nimap_default_button"
+            android:background="@null"
             android:clickable="true"
             android:focusable="true"
             android:src="@drawable/icon_map_zoom_in" />
@@ -52,7 +55,7 @@
             android:id="@+id/navinfo_map_zoom_out"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_nimap_default_button"
+            android:background="@null"
             android:clickable="true"
             android:focusable="true"
             android:src="@drawable/icon_map_zoom_out" />

collect-library/src/main/res/values/dimens.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="nimap_defalut_padding">12dp</dimen>
+    <dimen name="nimap_defalut_padding">5dp</dimen>
 </resources>