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

2023-12-01 17:59:04 +08:00
parent 2f513c8b43 273fc3d327
commit 1032187dab
25 changed files with 233 additions and 92 deletions
--- a/collect-library/libs/arm64-v8a/libAsr2Code.so
+++ b/collect-library/libs/arm64-v8a/libAsr2Code.so
--- a/collect-library/libs/arm64-v8a/libBugly.so
+++ b/collect-library/libs/arm64-v8a/libBugly.so
--- a/collect-library/libs/arm64-v8a/libDecode.so
+++ b/collect-library/libs/arm64-v8a/libDecode.so
--- a/collect-library/libs/arm64-v8a/libNuanceVocalizer.so
+++ b/collect-library/libs/arm64-v8a/libNuanceVocalizer.so
--- a/collect-library/libs/arm64-v8a/libSetWakeupJni.so
+++ b/collect-library/libs/arm64-v8a/libSetWakeupJni.so
--- a/collect-library/libs/arm64-v8a/libejTTS.so
+++ b/collect-library/libs/arm64-v8a/libejTTS.so
--- a/collect-library/libs/arm64-v8a/libgdalconstjni.so
+++ b/collect-library/libs/arm64-v8a/libgdalconstjni.so
--- a/collect-library/libs/arm64-v8a/libgdaljni.so
+++ b/collect-library/libs/arm64-v8a/libgdaljni.so
--- a/collect-library/libs/arm64-v8a/libgnustl_shared.so
+++ b/collect-library/libs/arm64-v8a/libgnustl_shared.so
--- a/collect-library/libs/arm64-v8a/libindoor.so
+++ b/collect-library/libs/arm64-v8a/libindoor.so
--- a/collect-library/libs/arm64-v8a/libiomx-gingerbread.so
+++ b/collect-library/libs/arm64-v8a/libiomx-gingerbread.so
--- a/collect-library/libs/arm64-v8a/libiomx-hc.so
+++ b/collect-library/libs/arm64-v8a/libiomx-hc.so
--- a/collect-library/libs/arm64-v8a/libiomx-ics.so
+++ b/collect-library/libs/arm64-v8a/libiomx-ics.so
--- a/collect-library/libs/arm64-v8a/liblocSDK8b.so
+++ b/collect-library/libs/arm64-v8a/liblocSDK8b.so
--- a/collect-library/libs/arm64-v8a/libogrjni.so
+++ b/collect-library/libs/arm64-v8a/libogrjni.so
--- a/collect-library/libs/arm64-v8a/libosrjni.so
+++ b/collect-library/libs/arm64-v8a/libosrjni.so
--- a/collect-library/libs/arm64-v8a/libproj.so
+++ b/collect-library/libs/arm64-v8a/libproj.so
--- a/collect-library/libs/arm64-v8a/libsimpleconfiglib.so
+++ b/collect-library/libs/arm64-v8a/libsimpleconfiglib.so
--- a/collect-library/libs/arm64-v8a/libtiny_magic.so
+++ b/collect-library/libs/arm64-v8a/libtiny_magic.so
--- a/collect-library/libs/arm64-v8a/libvlcjni.so
+++ b/collect-library/libs/arm64-v8a/libvlcjni.so
--- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/QsRecordBean.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/QsRecordBean.kt
@@ -93,8 +93,11 @@ open class QsRecordBean @JvmOverloads constructor(
     * 显示坐标
     */
    var guideGeometry: String = "",
-
-    ) : RealmObject() {
+    /**
+     * 备份数据
+     */
+    var remarks: String = "",
+) : RealmObject() {

    fun copy(): QsRecordBean {
        val qs = QsRecordBean(
@@ -115,6 +118,7 @@ open class QsRecordBean @JvmOverloads constructor(
            t_lifecycle = t_lifecycle,
            t_status = t_status,
            attachmentBeanList = attachmentBeanList,
+            remarks = remarks,
        )
        qs.geometry = geometry
        return qs