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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt

	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt

	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt

app/src/main/res/color/font_blue_reg.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_checked="true" android:color="#FF3030"></item>
+    <item android:state_selected="true" android:color="#FF3030"></item>
+    <item android:color="#1ABBFE"></item>
+</selector>

app/src/main/res/drawable/bg_select_sound_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_checked="true" android:drawable="@drawable/icon_select_sound_press"/>
+    <item android:state_selected="true" android:drawable="@drawable/icon_select_sound_press"/>
+    <item android:drawable="@drawable/icon_select_sound_defaule"/>
+</selector>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="@color/black" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/deepskyblue" />
+    <corners
+        android:bottomLeftRadius="5dp"
+        android:bottomRightRadius="5dp"
+        android:topLeftRadius="5dp"
+        android:topRightRadius="5dp" />
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp"/>
+</shape>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false"
+    >
+   <item android:drawable="@drawable/amp7" android:duration="90" /> 
+   <item android:drawable="@drawable/amp1" android:duration="90" /> 
+   <item android:drawable="@drawable/amp2" android:duration="90" /> 
+   <item android:drawable="@drawable/amp3" android:duration="90" /> 
+   <item android:drawable="@drawable/amp4" android:duration="90" /> 
+   <item android:drawable="@drawable/amp5" android:duration="90" /> 
+   <item android:drawable="@drawable/amp6" android:duration="90" /> 
+   <item android:drawable="@drawable/amp7" android:duration="90" /> 
+	
+</animation-list>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
+   <item android:drawable="@drawable/icon_sound_03" android:duration="200" /> 
+   <item android:drawable="@drawable/icon_sound_02" android:duration="200" /> 
+   <item android:drawable="@drawable/icon_sound_01" android:duration="200" /> 
+	
+</animation-list>

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

@@ -72,7 +72,6 @@
                 android:layout_height="48dp"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="120dp"
-                android:onClick="@{()->mainActivity.voiceOnclick()}"
                 android:src="@drawable/baseline_keyboard_voice_24"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent" />

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/ivory"
+    android:paddingLeft="10dp"
+    android:paddingTop="5dp"
+    android:paddingRight="10dp"
+    android:paddingBottom="5dp"
+    tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.SoundListAdapter">
+
+    <LinearLayout
+        android:id="@+id/rl_sound_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_select_sound_xml"
+        android:gravity="center_vertical"
+        android:minWidth="50dp"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="6dp"
+            android:gravity="left|center"
+            android:lineSpacingExtra="2dp"
+            android:text=""
+            android:textColor="@color/font_blue_reg"
+            android:textSize="15sp" />
+
+        <ImageView
+            android:id="@+id/iv_sound_anim"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/sound_anim" />
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center" >
+
+    <LinearLayout
+        android:id="@+id/voice_rcd_hint_rcding"
+        android:layout_width="wrap_content"
+        android:layout_height="140.0dip"
+        android:gravity="bottom|center"
+        android:orientation="horizontal"
+         >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:background="@drawable/drawable_bg_blue_frame_black_bg_4_radius"
+            android:orientation="horizontal"
+            >
+            <ImageView
+                android:background="@drawable/pop_voice_img"
+                android:scaleType="center"
+                android:id="@+id/volume"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                 />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/del_re"
+            android:layout_width="140.0dip"
+            android:layout_height="140.0dip"
+            android:layout_marginLeft="10.0dip"
+            android:background="@drawable/voice_rcd_cancel_bg_focused"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="取消"
+                android:textColor="#ffffff"
+                android:textSize="13.0dip" />
+
+            <ImageView
+                android:id="@+id/sc_img1"
+                android:layout_width="75.0dip"
+                android:layout_height="75.0dip"
+                android:layout_marginTop="12.0dip"
+                android:src="@drawable/rcd_cancel_icon"
+                
+                 />      
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/voice_rcd_hint_tooshort"
+        android:layout_width="140.0dip"
+        android:layout_height="140.0dip"
+        android:background="@drawable/voice_rcd_hint_bg"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/voice_to_short" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="15.0dip"
+            android:text="时间太短"
+            android:textColor="#ffffff" />
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -125,30 +125,38 @@
                     android:layout_margin="5dp"
                     android:background="@color/gray_121" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="多媒体" />
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/evaluation_voice_recyclerview"
                     android:layout_width="match_parent"
-                    android:layout_height="80dp" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
 
-        <ImageView
+        <ImageButton
             android:id="@+id/evaluation_camera"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="10dp"
+            android:background="@drawable/btn_bg_default"
             android:src="@drawable/baseline_camera_alt_24"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@id/evaluation_voice" />
 
-        <ImageView
+        <ImageButton
             android:id="@+id/evaluation_voice"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="10dp"
             android:src="@drawable/baseline_keyboard_voice_24"
+            android:background="@drawable/btn_bg_default"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toRightOf="@id/evaluation_camera"