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

fix: 解决冲突

Browse Source
This commit is contained in:
xiaoyan
2023-04-27 13:37:20 +08:00
parent c4ee38d703 92a9f9d6c4
commit cb0275cee3
16 changed files with 277 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,7 +174,7 @@ class ImportOMDBHelper @AssistedInject constructor(
emit("${index + 1}/${importConfig.tables.size}")
}
Realm.getDefaultInstance().commitTransaction()
emit("OK")
emit("finish")
}
}

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

@@ -46,7 +46,7 @@ class RealmOperateHelper() {
val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null)
// 查询realm中对应tile号的数据
val realmList = Realm.getDefaultInstance().where(RenderEntity::class.java)
.equalTo("table", "HAD_LINK")
.equalTo("table", "OMDB_RD_LINK")
.and()
.rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd")
.findAll()
@@ -89,7 +89,7 @@ class RealmOperateHelper() {
val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null)
// 查询realm中对应tile号的数据
val realmList = Realm.getDefaultInstance().where(RenderEntity::class.java)
.notEqualTo("table", "HAD_LINK")
.notEqualTo("table", "OMDB_RD_LINK")
.and()
.rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd")
.findAll()
@@ -119,7 +119,7 @@ class RealmOperateHelper() {
val result = mutableListOf<RenderEntity>()
withContext(Dispatchers.IO) {
val realmList = Realm.getDefaultInstance().where(RenderEntity::class.java)
.notEqualTo("table", "HAD_LINK")
.notEqualTo("table", "OMDB_RD_LINK")
.and()
.equalTo("properties['LINK_PID']", linkPid)
.findAll()