|
@@ -83,8 +83,8 @@ class GraphyVM(
|
|
|
spaceJobModel.localName = objectEntity!!.localName
|
|
|
spaceJobModel.name = objectEntity.name
|
|
|
spaceJobModel.projectId = projectId
|
|
|
- val strInfo = gson.fromJson(objectEntity.strInfos, StrInfos::class.java)
|
|
|
- spaceJobModel.outline = strInfo.outline
|
|
|
+ val infos = gson.fromJson(objectEntity.infos, InfosForObj::class.java)
|
|
|
+ spaceJobModel.outline = infos.outline
|
|
|
spaceJobModel.objectEntity = objectEntity
|
|
|
if (from.equals("space")) {
|
|
|
val problems = repo.getProblemByAvalible(floorId)
|
|
@@ -101,7 +101,7 @@ class GraphyVM(
|
|
|
}
|
|
|
for (problem in problems) {
|
|
|
val geomList = gson.fromJson<List<PointF>>(
|
|
|
- problem.strGeom,
|
|
|
+ problem.geom,
|
|
|
object : TypeToken<List<PointF?>?>() {}.type
|
|
|
)
|
|
|
for (gemo in geomList) {
|
|
@@ -198,19 +198,19 @@ class GraphyVM(
|
|
|
val child = Children()
|
|
|
child.deviceId = equip.id
|
|
|
child.name = equip.name
|
|
|
- val strInfo = gson.fromJson(equip.strInfos, StrInfosforEquip::class.java)
|
|
|
+ val infos = gson.fromJson(equip.infos, InfosforEquip::class.java)
|
|
|
val eqProblems = repo.getEqProblem(equip.id)
|
|
|
//1-蓝 2-绿 3-红
|
|
|
if (eqProblems == null || TextUtils.isEmpty(eqProblems.id)) {
|
|
|
- if (strInfo.equipCheck is Double || strInfo.equipCheck is Int) {
|
|
|
+ if (infos.equipCheck is Double || infos.equipCheck is Int) {
|
|
|
when {
|
|
|
- strInfo.equipCheck.toInt() == RMTristateSwitch.STATE_LEFT -> {
|
|
|
+ infos.equipCheck.toInt() == RMTristateSwitch.STATE_LEFT -> {
|
|
|
child.type = 5
|
|
|
}
|
|
|
- strInfo.equipCheck.toInt() == RMTristateSwitch.STATE_MIDDLE -> {
|
|
|
+ infos.equipCheck.toInt() == RMTristateSwitch.STATE_MIDDLE -> {
|
|
|
child.type = 1
|
|
|
}
|
|
|
- strInfo.equipCheck.toInt() == RMTristateSwitch.STATE_RIGHT -> {
|
|
|
+ infos.equipCheck.toInt() == RMTristateSwitch.STATE_RIGHT -> {
|
|
|
child.type = 2
|
|
|
}
|
|
|
}
|
|
@@ -221,11 +221,11 @@ class GraphyVM(
|
|
|
child.type = 3
|
|
|
}
|
|
|
val position = Position()
|
|
|
- position.x = strInfo.location.x.toString()
|
|
|
- position.y = strInfo.location.y.toString()
|
|
|
+ position.x = infos.location.x.toString()
|
|
|
+ position.y = infos.location.y.toString()
|
|
|
val z = Z()
|
|
|
- z.offset = strInfo.location.z.toString()
|
|
|
- z.region = strInfo.zRegion
|
|
|
+ z.offset = infos.location.z.toString()
|
|
|
+ z.region = infos.zRegion
|
|
|
position.z = z
|
|
|
child.position = gson.toJson(position)
|
|
|
model.children.add(child)
|
|
@@ -239,19 +239,19 @@ class GraphyVM(
|
|
|
val child = Children()
|
|
|
child.deviceId = equip.id
|
|
|
child.name = equip.name
|
|
|
- val strInfo = gson.fromJson(equip.strInfos, StrInfosforEquip::class.java)
|
|
|
+ val infos = gson.fromJson(equip.infos, InfosforEquip::class.java)
|
|
|
val eqProblems = repo.getEqProblem(equip.id)
|
|
|
if (eqProblems == null || TextUtils.isEmpty(eqProblems.id)) {
|
|
|
//type 1-蓝 2-绿 3-红 4-黄 5-紫
|
|
|
- if (strInfo.equipCheck is Double || strInfo.equipCheck is Int) {
|
|
|
+ if (infos.equipCheck is Double || infos.equipCheck is Int) {
|
|
|
when {
|
|
|
- strInfo.equipCheck.toInt() == RMTristateSwitch.STATE_LEFT -> {
|
|
|
+ infos.equipCheck.toInt() == RMTristateSwitch.STATE_LEFT -> {
|
|
|
child.type = 5
|
|
|
}
|
|
|
- strInfo.equipCheck.toInt() == RMTristateSwitch.STATE_MIDDLE -> {
|
|
|
+ infos.equipCheck.toInt() == RMTristateSwitch.STATE_MIDDLE -> {
|
|
|
child.type = 1
|
|
|
}
|
|
|
- strInfo.equipCheck.toInt() == RMTristateSwitch.STATE_RIGHT -> {
|
|
|
+ infos.equipCheck.toInt() == RMTristateSwitch.STATE_RIGHT -> {
|
|
|
child.type = 2
|
|
|
}
|
|
|
}
|
|
@@ -262,11 +262,11 @@ class GraphyVM(
|
|
|
child.type = 3
|
|
|
}
|
|
|
val position = Position()
|
|
|
- position.x = strInfo.location.x.toString()
|
|
|
- position.y = strInfo.location.y.toString()
|
|
|
+ position.x = infos.location.x.toString()
|
|
|
+ position.y = infos.location.y.toString()
|
|
|
val z = Z()
|
|
|
- z.offset = strInfo.location.z.toString()
|
|
|
- z.region = strInfo.zRegion
|
|
|
+ z.offset = infos.location.z.toString()
|
|
|
+ z.region = infos.zRegion
|
|
|
position.z = z
|
|
|
child.position = gson.toJson(position)
|
|
|
spaceModel.children.add(child)
|
|
@@ -332,13 +332,13 @@ class GraphyVM(
|
|
|
// val child = ChildrenZ()
|
|
|
// val objFrom = repo.getObject(pipe.objFrom!!)
|
|
|
// val objTo = repo.getObject(pipe.objTo!!)
|
|
|
-// val strInfoFrom =
|
|
|
-// gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
-// child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
+// val infoFrom =
|
|
|
+// gson.fromJson(objFrom!!.infos, InfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(infoFrom.location.x, infoFrom.location.y))
|
|
|
//
|
|
|
-// val strInfoTo =
|
|
|
-// gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
-// child.position.add(PointF(strInfoTo.location.x, strInfoTo.location.y))
|
|
|
+// val infoTo =
|
|
|
+// gson.fromJson(objTo!!.infos, InfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(infoTo.location.x, infoTo.location.y))
|
|
|
// model.children.add(child)
|
|
|
// hasParent = true
|
|
|
// }
|
|
@@ -350,12 +350,12 @@ class GraphyVM(
|
|
|
// val child = ChildrenZ()
|
|
|
// val objFrom = repo.getObject(pipe.objFrom!!)
|
|
|
// val objTo = repo.getObject(pipe.objTo!!)
|
|
|
-// val strInfoFrom =
|
|
|
-// gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
-// child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
+// val infoFrom =
|
|
|
+// gson.fromJson(objFrom!!.infos, InfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(infoFrom.location.x, infoFrom.location.y))
|
|
|
//
|
|
|
-// val strInfoTo = gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
-// child.position.add(PointF(strInfoTo.location.x, strInfoTo.location.y))
|
|
|
+// val infoTo = gson.fromJson(objTo!!.infos, InfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(infoTo.location.x, infoTo.location.y))
|
|
|
// pipeModel.children.add(child)
|
|
|
// pipeModels.add(pipeModel)
|
|
|
// }
|
|
@@ -365,29 +365,11 @@ class GraphyVM(
|
|
|
// }
|
|
|
}
|
|
|
|
|
|
- fun getInfosConfig(spaceId: String) {
|
|
|
- viewModelScope.launch {
|
|
|
- val infosConfig = repo.getInfosConfigByObjType("space")
|
|
|
- val strInfos = infosConfig.get(0).strInfos
|
|
|
-
|
|
|
-// var infoList = gson.fromJson(strInfos, ArrayList<Infos>()::class.java)
|
|
|
- var infoList = gson.fromJson<List<Infos>>(
|
|
|
- strInfos,
|
|
|
- object : TypeToken<List<Infos?>?>() {}.type
|
|
|
- )
|
|
|
- var spaceObject = repo.getObject(spaceId)
|
|
|
- val infos = gson.fromJson(spaceObject!!.strInfos, HashMap::class.java)
|
|
|
-
|
|
|
- mEmitter.SendDircetive(SPACE_INFOS, infos)
|
|
|
- mEmitter.SendDircetive(SPACE_INFO, infoList)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
fun refreshObject(space: TunableSpace, hashMap: HashMap<String, Any>) {
|
|
|
viewModelScope.launch {
|
|
|
var space = repo.getObject(space.id!!)
|
|
|
// space!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
- space!!.strInfos = gson.toJson(hashMap)
|
|
|
+ space!!.infos = gson.toJsonTree(hashMap)
|
|
|
space.state = "1"
|
|
|
repo.insObject(space)
|
|
|
mActivity.setResult(RESULT_OK)
|
|
@@ -409,7 +391,7 @@ class GraphyVM(
|
|
|
|
|
|
if (!TextUtils.isEmpty(deviceId)) {
|
|
|
var equip = repo.getObject(deviceId)
|
|
|
- val infos = gson.fromJson(equip!!.strInfos, HashMap::class.java)
|
|
|
+ val infos = gson.fromJson(equip!!.infos, HashMap::class.java)
|
|
|
mEmitter.SendDircetive(SPACE_INFOS, infos)
|
|
|
mEmitter.SendDircetive(Equip_INFOS, equip)
|
|
|
}
|
|
@@ -423,9 +405,9 @@ class GraphyVM(
|
|
|
mEmitter.SendDircetive(EQUIP_INFO, null)
|
|
|
return@launch
|
|
|
}
|
|
|
- val strInfos = infosConfig.get(0).strInfos
|
|
|
+ val infos = infosConfig.get(0).infos
|
|
|
val infoList = gson.fromJson<List<Infos>>(
|
|
|
- strInfos,
|
|
|
+ infos,
|
|
|
object : TypeToken<List<Infos?>?>() {}.type
|
|
|
)
|
|
|
mEmitter.SendDircetive(EQUIP_INFO, infoList)
|
|
@@ -493,8 +475,7 @@ class GraphyVM(
|
|
|
deliveryState = null,
|
|
|
d2mState = null,
|
|
|
virtualCodes = null,
|
|
|
- infos = null,
|
|
|
- strInfos = gson.toJson(hashMap),
|
|
|
+ infos = gson.toJsonTree(hashMap),
|
|
|
floorMap = null,
|
|
|
state = "1",
|
|
|
containerId = if (TextUtils.isEmpty(containerId)) "" else containerId
|
|
@@ -505,7 +486,7 @@ class GraphyVM(
|
|
|
// equip!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
equip!!.classCode = equipEntity.code!!
|
|
|
equip.localId = localId
|
|
|
- equip.strInfos = gson.toJson(hashMap)
|
|
|
+ equip.infos = gson.toJsonTree(hashMap)
|
|
|
equip.state = "1"
|
|
|
repo.insObject(equip)
|
|
|
}
|
|
@@ -1024,14 +1005,14 @@ class GraphyVM(
|
|
|
fun insEquip(ob: ObjectEntity, position: Position) {
|
|
|
viewModelScope.launch {
|
|
|
var obj = repo.getObject(ob.id)
|
|
|
- val hashMap = gson.fromJson(obj!!.strInfos, HashMap::class.java) as HashMap<String, Any>
|
|
|
+ val hashMap = gson.fromJson(obj!!.infos, HashMap::class.java) as HashMap<String, Any>
|
|
|
val z = PointZ()
|
|
|
z.x = position.x.toFloat()
|
|
|
z.y = -position.y.toFloat()
|
|
|
z.z = position.z.offset.toFloat()
|
|
|
hashMap.put("location", z)
|
|
|
hashMap.put("zRegion", position.z.region)
|
|
|
- obj.strInfos = gson.toJson(hashMap)
|
|
|
+ obj.infos = gson.toJsonTree(hashMap)
|
|
|
obj.state = "1"
|
|
|
repo.insObject(obj)
|
|
|
mEmitter.SendDircetive(UPDATE_LOCATION, null)
|
|
@@ -1057,8 +1038,8 @@ class GraphyVM(
|
|
|
val equip = repo.getObject(deviceId)
|
|
|
val configs = repo.getContainerConfig(equip!!.classCode!!)
|
|
|
val hashMap = HashMap<String, Any>()
|
|
|
- hashMap.put("configs",configs)
|
|
|
- hashMap.put("objs",objs)
|
|
|
+ hashMap.put("configs", configs)
|
|
|
+ hashMap.put("objs", objs)
|
|
|
mEmitter.SendDircetive(CONTAINER_EQUIP, hashMap)
|
|
|
}
|
|
|
}
|