From a7f9422d9d927044f67d651d6aea7301bcf67879 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 1 Sep 2023 13:32:27 +0800
Subject: [PATCH] merge code

---
 .../java/com/navinfo/omqs/db/ImportOMDBHelper.kt     | 12 ++++++------
 .../java/com/navinfo/omqs/db/RealmOperateHelper.kt   |  2 +-
 .../collect/library/data/entity/RenderEntity.kt      |  2 +-
 3 files changed, 8 insertions(+), 8 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 415baa8d..38750fa4 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -230,12 +230,6 @@ class ImportOMDBHelper @AssistedInject constructor(
                                         renderEntity.properties["name"] = renderEntity.name;
                                     }
 
-                                    if(currentConfig.catch){
-                                        renderEntity.catch=0
-                                    }else{
-                                        renderEntity.catch=1
-                                    }
-
                                     //遍历判断只显示与任务Link相关的任务数据
                                     if(currentConfig.checkLinkId){
 
@@ -314,6 +308,12 @@ class ImportOMDBHelper @AssistedInject constructor(
                                     // 对renderEntity做预处理后再保存
                                     val resultEntity = importConfig.transformProperties(renderEntity)
 
+                                    if(currentConfig.catch){
+                                        renderEntity.catchEnable=0
+                                    }else{
+                                        renderEntity.catchEnable=1
+                                    }
+
                                     //对code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS
                                     if(renderEntity.code == DataCodeEnum.OMDB_LINK_ATTRIBUTE.code){
 
diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
index 1eb1a9b4..4315475d 100644
--- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
@@ -274,7 +274,7 @@ class RealmOperateHelper() {
         }else{
             // 查询realm中对应tile号的数据
             realmList = getRealmTools(RenderEntity::class.java, false)
-                .equalTo("catch", "0")
+                .lessThan("catchEnable", 1)
                 .greaterThanOrEqualTo("tileX", xStart)
                 .lessThanOrEqualTo("tileX", xEnd)
                 .greaterThanOrEqualTo("tileY", yStart)
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 ef2ae3d2..fc4644a3 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
@@ -62,7 +62,7 @@ open class RenderEntity() : RealmObject(), Parcelable {
     var zoomMin: Int = 18 //显示最小级别
     var zoomMax: Int = 23 //显示最大级别
     var enable:Int = 0 // 默认0不是显示 1为渲染显示 2为常显
-    var catch:Int = 0 // 0捕捉 1不捕捉
+    var catchEnable:Int = 0 // 0捕捉 1不捕捉
 
     constructor(name: String) : this() {
         this.name = name