From ffba871e3c9bc7c990113bb4f132cf4891133951 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Mon, 30 Oct 2023 10:36:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt | 1 - app/src/main/java/com/navinfo/omqs/util/NaviEngineNew.kt | 1 + .../com/navinfo/collect/library/data/entity/LinkRelation.kt | 3 +++ .../com/navinfo/collect/library/data/entity/RenderEntity.kt | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 670789c1..96c81156 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -268,7 +268,6 @@ class ImportPreProcess { startReference.zoomMax = renderEntity.zoomMax startReference.taskId = renderEntity.taskId startReference.enable = renderEntity.enable - // 起点坐标 startReference.geometry = GeometryTools.createGeometry(GeoPoint(pointStart.y, pointStart.x)).toString() diff --git a/app/src/main/java/com/navinfo/omqs/util/NaviEngineNew.kt b/app/src/main/java/com/navinfo/omqs/util/NaviEngineNew.kt index 84edd079..04ae27d5 100644 --- a/app/src/main/java/com/navinfo/omqs/util/NaviEngineNew.kt +++ b/app/src/main/java/com/navinfo/omqs/util/NaviEngineNew.kt @@ -46,6 +46,7 @@ class NaviEngineNew( } + latestRoute?.let { val res2 = diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/LinkRelation.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/LinkRelation.kt index 2e52a7cf..06e38f9e 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/LinkRelation.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/LinkRelation.kt @@ -21,7 +21,10 @@ import java.util.* * */ @Parcelize open class LinkRelation() : RealmObject(), Parcelable { + @Index var linkPid:String = "" + @Index var sNodeId: String? = null + @Index var eNodeId: String? = null } \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt index 390a93d8..3998d8d8 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt @@ -109,7 +109,7 @@ open class RenderEntity() : RealmObject(), Parcelable { var zoomMax: Int = 23 //显示最大级别 var enable: Int = 0 // 默认0不是显示 1为渲染显示 2为常显 var catchEnable: Int = 0 // 0不捕捉 1捕捉 - + @Index var linkPid: String = "" // RenderEntity关联的linkPid集合(可能会关联多个) var linkRelation: LinkRelation? = null