From af4baf80b541b1c35d4f231fa16bf59765c40823 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 10 Aug 2023 13:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E5=8F=A3=E8=A6=81?= =?UTF-8?q?=E7=B4=A0=E6=8C=89=E4=BB=BB=E5=8A=A1link=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 70 +++++++++++-------- .../java/com/navinfo/omqs/db/deep/LinkList.kt | 2 +- .../src/main/assets/editormarker.xml | 16 ++--- vtm | 2 +- 4 files changed, 52 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index 29f8a4a5..47e8e4c0 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -9,17 +9,15 @@ import com.blankj.utilcode.util.FileIOUtils import com.blankj.utilcode.util.ZipUtils import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.navinfo.collect.library.data.entity.ReferenceEntity import com.navinfo.collect.library.data.entity.RenderEntity import com.navinfo.collect.library.data.entity.TaskBean import com.navinfo.omqs.Constant import com.navinfo.omqs.bean.ImportConfig -import com.navinfo.omqs.db.deep.ListList +import com.navinfo.omqs.db.deep.LinkList import com.navinfo.omqs.hilt.OMDBDataBaseHiltFactory import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.realm.Realm -import io.realm.RealmQuery import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow @@ -194,18 +192,12 @@ class ImportOMDBHelper @AssistedInject constructor( } //遍历判断只显示与任务Link相关的任务数据 if(currentConfig.checkLinkId){ - if(renderEntity.properties.containsKey("linkPid")&&renderEntity.properties["linkPid"]!=null){ - task.hadLinkDvoList.forEach{ - if(it.linkPid==renderEntity.properties["linkPid"]){ - renderEntity.enable = 1 - Log.e("qj","${renderEntity.name}==包括任务link") - return@forEach - } - } - }else if(renderEntity.table == "OMDB_RESTRICTION" && renderEntity.properties.containsKey("linkIn")){ - if (renderEntity.properties["linkIn"] != null) { - var currentLinkPid = renderEntity.properties["linkIn"] + if(renderEntity.properties.containsKey("linkPid")){ + + var currentLinkPid = renderEntity.properties["linkPid"] + + if(!currentLinkPid.isNullOrEmpty()&¤tLinkPid!="null"){ task.hadLinkDvoList.forEach{ if(it.linkPid==renderEntity.properties["linkPid"]){ @@ -215,29 +207,51 @@ class ImportOMDBHelper @AssistedInject constructor( } } } - }else if(renderEntity.table == "OMDB_INTERSECTION" &&renderEntity.properties.containsKey("type")&& renderEntity.properties.containsKey("linkList")){ - if (renderEntity.properties["type"]!=null&&renderEntity.properties["linkList"] != null) { - val type = renderEntity.properties["type"] + }else if(renderEntity.table == "OMDB_RESTRICTION" && renderEntity.properties.containsKey("linkIn")){ - if(type=="1"){ + if (renderEntity.properties["linkIn"] != null) { - if (renderEntity.properties["linkList"] != null) { + var currentLinkPid = renderEntity.properties["linkIn"] - val list: List = gson.fromJson(renderEntity.properties["linkList"], object : TypeToken>() {}.type) + if(!currentLinkPid.isNullOrEmpty()&¤tLinkPid!="null"){ - if (list != null) { - m@for (link in list){ - for(hadLink in task.hadLinkDvoList){ - if (link.featureType == 1 && hadLink.linkPid == link.linkPid) { - renderEntity.enable = 1 - Log.e("qj", "${renderEntity.name}==包括任务link") - break@m - } + task.hadLinkDvoList.forEach{ + if(it.linkPid==currentLinkPid){ + renderEntity.enable = 1 + Log.e("qj","${renderEntity.name}==包括任务link") + return@forEach + } + } + } + } + }else if(renderEntity.table == "OMDB_INTERSECTION" && renderEntity.properties.containsKey("linkList")){ + + if (renderEntity.properties["linkList"] != null) { + + Log.e("qj", "linkList==开始${renderEntity.name}==${renderEntity.properties["linkList"]}}") + + val linkList = renderEntity.properties["linkList"] + + if (!linkList.isNullOrEmpty()&&linkList!="null") { + + Log.e("qj", "linkList==${renderEntity.name}==${renderEntity.properties["linkList"]}}") + + val list: List = gson.fromJson(linkList, object : TypeToken>() {}.type) + + if (list != null) { + m@for (link in list){ + for(hadLink in task.hadLinkDvoList){ + if (hadLink.linkPid == link.linkPid) { + renderEntity.enable = 1 + Log.e("qj", "${renderEntity.name}==包括任务link==${renderEntity.geometry}") + break@m } } } } + }else{ + Log.e("qj", "linkList==$linkList}") } } }else{ diff --git a/app/src/main/java/com/navinfo/omqs/db/deep/LinkList.kt b/app/src/main/java/com/navinfo/omqs/db/deep/LinkList.kt index e7cc83da..f786b989 100644 --- a/app/src/main/java/com/navinfo/omqs/db/deep/LinkList.kt +++ b/app/src/main/java/com/navinfo/omqs/db/deep/LinkList.kt @@ -1,6 +1,6 @@ package com.navinfo.omqs.db.deep -data class ListList( +data class LinkList( var featureType: Int = -1, var linkPid: String = "" ) \ No newline at end of file diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 6d14d464..5032ca36 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1956,15 +1956,15 @@ - - - - - - - - + + + + + + diff --git a/vtm b/vtm index 58f23103..8717b07e 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 58f231037c44ccc1c82d00818c402a2894ca4e09 +Subproject commit 8717b07ebff4dd61226abb19474be6567a736ad8