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/java/com/navinfo/omqs/bean/ChatMsgEntity.kt

@@ -0,0 +1,23 @@
+package com.navinfo.omqs.bean
+
+import java.io.Serializable
+
+class ChatMsgEntity : Serializable, Cloneable {
+    var voiceUri //声音存储地址
+            : String? = null
+    var voiceTimeLong //声音时间长度
+            : String? = null
+    var name //声音名字
+            : String? = null
+    var isDelete //是否被删除
+            = false
+
+    @kotlin.Throws(CloneNotSupportedException::class)
+    public override fun clone(): Any {
+        return super.clone()
+    }
+
+    companion object {
+        private val TAG: String = ChatMsgEntity::class.java.getSimpleName()
+    }
+}