Merge branch 'master' of https://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/tools/MetadataUtils.kt

@@ -0,0 +1,19 @@
+package com.navinfo.omqs.tools
+
+class MetadataUtils {
+    companion object {
+        object ScProblemTypeTitle {
+
+            const val TITLE_ELEMENT_TYPE = "类型"
+            const val TITLE_ELEMENT_CODE = "要素代码"
+            const val TITLE_CLASS_TYPE = "要素分类"
+            const val TITLE_PROBLEM_TYPE = "问题类型·"
+            const val TITLE_PHENOMENON = "问题现象"
+        }
+
+        object ScRootCauseAnalysisTitle {
+            const val TITLE_PROBLEM_LINK = "问题环节"
+            const val TITLE_PROBLEM_CAUSE = "初步问题原因"
+        }
+    }
+}