Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts: collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
This commit is contained in:
@@ -52,13 +52,12 @@ open class RenderEntity() : RealmObject() {
|
||||
}
|
||||
return field
|
||||
}
|
||||
var properties: RealmDictionary<String?> = RealmDictionary()
|
||||
var properties: RealmDictionary<String> = RealmDictionary()
|
||||
var tileX: RealmSet<Int> = RealmSet() // x方向的tile编码
|
||||
var tileY: RealmSet<Int> = RealmSet() // y方向的tile编码
|
||||
|
||||
constructor(name: String, properties: RealmDictionary<String?>) : this() {
|
||||
constructor(name: String): this() {
|
||||
this.name = name
|
||||
this.properties = properties
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
Reference in New Issue
Block a user