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

 Conflicts:

	vtm

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

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

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

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

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+	<item android:state_selected="false" android:state_enabled="true" android:drawable="@drawable/icon_no_mediaflag"></item>
+	<item android:state_enabled="false" android:drawable="@drawable/icon_mediaflag_disable"></item>
+	<item android:state_enabled="true" android:state_selected="true" android:drawable="@drawable/icon_mediaflag"></item>
+	<item android:drawable="@drawable/icon_no_mediaflag"></item>
+
+</selector>

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

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

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+	<item android:state_selected="false" android:state_enabled="true" android:drawable="@drawable/icon_play_nor"></item>
+	<item android:state_enabled="false" android:drawable="@drawable/icon_play_disable"></item>
+	<item android:state_enabled="true" android:state_selected="true" android:drawable="@drawable/icon_pause_nor"></item>
+	<item android:drawable="@drawable/icon_play_nor"></item>
+
+</selector>

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

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

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

@@ -130,6 +130,73 @@
             android:elevation="2dp"
             android:onClick="@{()->mainActivity.onClickMenu()}" />
 
+
+        <androidx.constraintlayout.helper.widget.Flow
+            android:id="@+id/main_activity_flow_indoor"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/top_right_drawer_btns_mr"
+            app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_media_flag,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next,main_activity_menu_indoor_group"
+            app:flow_horizontalGap="6dp"
+            app:flow_wrapMode="aligned"
+            app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/main_activity_menu_indoor_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_media_flag,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next" />
+
+        <ImageButton
+            android:id="@+id/main_activity_snapshot_finish"
+            style="@style/top_right_drawer_btns_style"
+            android:clickable="true"
+            android:enabled="false"
+            android:focusable="true"
+            android:src="@drawable/map_trace_finish"
+            tools:ignore="MissingConstraints" />
+
+        <ImageButton
+            android:id="@+id/main_activity_trace_snapshot_points"
+            style="@style/top_right_drawer_btns_style"
+            android:focusable="true"
+            android:src="@drawable/map_trace_select_point"
+            tools:ignore="MissingConstraints" />
+
+        <ImageButton
+            android:id="@+id/main_activity_snapshot_media_flag"
+            style="@style/top_right_drawer_btns_style"
+            android:enabled="false"
+            android:focusable="true"
+            android:src="@drawable/map_trace_mediaflag"
+            tools:ignore="MissingConstraints" />
+
+        <ImageButton
+            android:id="@+id/main_activity_snapshot_rewind"
+            style="@style/top_right_drawer_btns_style"
+            android:enabled="false"
+            android:focusable="true"
+            android:src="@drawable/map_trace_forward"
+            tools:ignore="MissingConstraints" />
+
+        <ImageButton
+            android:id="@+id/main_activity_snapshot_pause"
+            style="@style/top_right_drawer_btns_style"
+            android:enabled="false"
+            android:focusable="true"
+            android:src="@drawable/map_trace_pause"
+            tools:ignore="DuplicateIds,MissingConstraints" />
+
+        <ImageButton
+            android:id="@+id/main_activity_snapshot_next"
+            style="@style/top_right_drawer_btns_style"
+            android:enabled="false"
+            android:focusable="true"
+            android:src="@drawable/map_trace_next"
+            tools:ignore="DuplicateIds,MissingConstraints" />
+
         <androidx.constraintlayout.widget.Barrier
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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"
+    tools:context=".ui.activity.scan.QRCodeActivity">
+
+
+    <data>
+
+        <variable
+            name="activity"
+            type="com.navinfo.omqs.ui.activity.scan.QrCodeActivity" />
+
+        <variable
+            name="qrCodeModel"
+            type="com.navinfo.omqs.ui.activity.scan.QrCodeViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.helper.widget.Layer
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:constraint_referenced_ids="previewView,scanView"
+            tools:ignore="MissingConstraints">
+
+        </androidx.constraintlayout.helper.widget.Layer>
+
+
+        <androidx.camera.view.PreviewView
+            android:id="@+id/previewView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <com.navinfo.omqs.ui.widget.ScanView
+            android:id="@+id/scanView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/transparent" />
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/text"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        android:layout_width="match_parent"
+        android:layout_height="200dp" />
+
+    <Button
+        android:id="@+id/button"
+        android:text="返回"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>

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

@@ -167,7 +167,7 @@
 
                     <TextView
                         style="@style/evaluation_fragment_title_text_style"
-                        android:text="问题原因" />
+                        android:text="初步分析" />
 
                     <TextView
                         android:id="@+id/evaluation_cause"

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

@@ -22,6 +22,10 @@
             android:id="@+id/personal_center_menu_import_yuan_data"
             android:icon="@drawable/ic_baseline_scatter_plot_24"
             android:title="导入元数据" />
+        <item
+            android:id="@+id/personal_center_menu_scan_qr_code"
+            android:icon="@drawable/ic_baseline_scatter_plot_24"
+            android:title="扫一扫" />
         <item
             android:icon="@drawable/ic_baseline_sim_card_download_24"
             android:title="备份数据" />