فهرست منبع

feat poc2.0去掉数据库str字段

lihao1 3 سال پیش
والد
کامیت
58f5167bbd

+ 0 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/dict/InfosConfigEntity.kt

@@ -17,7 +17,6 @@ data class InfosConfigEntity(
     @ColumnInfo(name = "major_code") val majorCode: String?,    // 专业代码(类型为设备时)
     @ColumnInfo(name = "system_code") val systemCode: String?,  // 系统代码(类型为设备时)
     @ColumnInfo(name = "project_id") val projectId: String?,    // 对象类型的信息详情点配置
-    @ColumnInfo(name = "str_infos") val strInfos: String?,      // 对象类型的信息详情点配置
     @ColumnInfo(name = "infos") val infos: JsonElement? = null  // 对象类型的信息详情点配置
 )
 

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/task/ObjectEntity.kt

@@ -76,7 +76,7 @@ data class InfosForObj(
     val outline: ArrayList<ArrayList<ArrayList<PointZ>>>
 )
 
-data class StrInfosforBuild(
+data class InfosforBuild(
     val floorMap: String,
     val state: String,
     val height: Int,

+ 2 - 2
demo/src/main/java/com/sybotan/android/demo/viewmodel/BuildVM.kt

@@ -3,7 +3,7 @@ package com.sybotan.android.demo.viewmodel
 import android.app.Application
 import android.text.TextUtils
 import androidx.lifecycle.viewModelScope
-import com.framework.mvvm.model.db.entity.task.StrInfosforBuild
+import com.framework.mvvm.model.db.entity.task.InfosforBuild
 import com.framework.mvvm.model.repository.AdmRepository
 import com.google.gson.Gson
 import com.sybotan.android.demo.activities.BaseActivity
@@ -32,7 +32,7 @@ class BuildVM(app: Application, b: BaseViewModelInterface, a: BaseActivity) :
                 val floors = repo.getFloorByBuildingId(build.id, "floor")
                 var floorList = ArrayList<Floor>()
                 for (floor in floors) {
-                    val infos = Gson().fromJson(floor.infos, StrInfosforBuild::class.java)
+                    val infos = Gson().fromJson(floor.infos, InfosforBuild::class.java)
                     var floorMap = ""
                     if (TextUtils.isEmpty(infos.floorMap)) {
                         floorMap = ""

+ 2 - 2
demo/src/main/java/com/sybotan/android/demo/viewmodel/SpaceDetailVM.kt

@@ -43,9 +43,9 @@ class SpaceDetailVM(
     fun getInfosConfig(spaceId: String) {
         viewModelScope.launch {
             val infosConfig = repo.getInfosConfigByObjType("space")
-            val strInfos = infosConfig[0].strInfos
+            val info = infosConfig[0].infos
             val infoList = gson.fromJson<List<Infos>>(
-                strInfos,
+                info,
                 object : TypeToken<List<Infos?>?>() {}.type
             )
             val spaceObject = repo.getObject(spaceId)