xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge code

Browse Source
This commit is contained in:
qiji4215
2023-09-01 13:32:27 +08:00
parent 94c9b8fd4f
commit a7f9422d9d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
View File

@@ -230,12 +230,6 @@ class ImportOMDBHelper @AssistedInject constructor(
renderEntity.properties["name"] = renderEntity.name; renderEntity.properties["name"] = renderEntity.name;
} }
if(currentConfig.catch){
renderEntity.catch=0
}else{
renderEntity.catch=1
}
//遍历判断只显示与任务Link相关的任务数据 //遍历判断只显示与任务Link相关的任务数据
if(currentConfig.checkLinkId){ if(currentConfig.checkLinkId){
@@ -314,6 +308,12 @@ class ImportOMDBHelper @AssistedInject constructor(
// 对renderEntity做预处理后再保存 // 对renderEntity做预处理后再保存
val resultEntity = importConfig.transformProperties(renderEntity) val resultEntity = importConfig.transformProperties(renderEntity)
if(currentConfig.catch){
renderEntity.catchEnable=0
}else{
renderEntity.catchEnable=1
}
//对code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS //对code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS
if(renderEntity.code == DataCodeEnum.OMDB_LINK_ATTRIBUTE.code){ if(renderEntity.code == DataCodeEnum.OMDB_LINK_ATTRIBUTE.code){

2
app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
View File

@@ -274,7 +274,7 @@ class RealmOperateHelper() {
}else{ }else{
// 查询realm中对应tile号的数据 // 查询realm中对应tile号的数据
realmList = getRealmTools(RenderEntity::class.java, false) realmList = getRealmTools(RenderEntity::class.java, false)
.equalTo("catch", "0") .lessThan("catchEnable", 1)
.greaterThanOrEqualTo("tileX", xStart) .greaterThanOrEqualTo("tileX", xStart)
.lessThanOrEqualTo("tileX", xEnd) .lessThanOrEqualTo("tileX", xEnd)
.greaterThanOrEqualTo("tileY", yStart) .greaterThanOrEqualTo("tileY", yStart)

2
collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
View File

@@ -62,7 +62,7 @@ open class RenderEntity() : RealmObject(), Parcelable {
var zoomMin: Int = 18 //显示最小级别 var zoomMin: Int = 18 //显示最小级别
var zoomMax: Int = 23 //显示最大级别 var zoomMax: Int = 23 //显示最大级别
var enable:Int = 0 // 默认0不是显示 1为渲染显示 2为常显 var enable:Int = 0 // 默认0不是显示 1为渲染显示 2为常显
var catch:Int = 0 // 0捕捉 1不捕捉 var catchEnable:Int = 0 // 0捕捉 1不捕捉
constructor(name: String) : this() { constructor(name: String) : this() {
this.name = name this.name = name