|
@@ -117,20 +117,12 @@ class AdmViewModel(private val repository: AdmRepository) : ViewModel() {
|
|
|
// 下载地图
|
|
|
val floors = repository.getFloors()
|
|
|
floors.forEach {
|
|
|
- val strInfo = it.strInfos
|
|
|
- if (!strInfo.isNullOrEmpty()) {
|
|
|
- try {
|
|
|
- val gson = Gson()
|
|
|
- // val info = Json.decodeFromString<FloorInfo>(strInfo)
|
|
|
- val info = gson.fromJson(strInfo, FloorInfo::class.java)
|
|
|
- val map = info.floorMap
|
|
|
- val floorMap =
|
|
|
- OkhttpUtil.getGzipMap("$IP$pathDownloadMap${map!!}")
|
|
|
- it.floorMap = floorMap
|
|
|
- repository.updateObject(it)
|
|
|
- } catch (e: Exception) {
|
|
|
- println("floor map Exception: $e")
|
|
|
- }
|
|
|
+ val json = it.infos?.asJsonObject
|
|
|
+ val floorMap = json?.get("floorMap")?.asString ?: ""
|
|
|
+ if (floorMap.isNotEmpty()) {
|
|
|
+ val map = OkhttpUtil.getGzipMap("$IP$pathDownloadMap${floorMap}")
|
|
|
+ it.floorMap = map
|
|
|
+ repository.updateObject(it)
|
|
|
}
|
|
|
}
|
|
|
|