|
@@ -137,13 +137,13 @@ class GraphyVM(
|
|
|
position.x = x
|
|
|
position.y = y
|
|
|
var toJson = ""
|
|
|
+ val array = ArrayList<PointF>()
|
|
|
if (point != null && point.data.mX != 0f) {
|
|
|
position.x = point.data.mX
|
|
|
position.y = point.data.mY
|
|
|
- toJson = gson.toJson(position)
|
|
|
- } else {
|
|
|
- toJson = gson.toJson(position)
|
|
|
}
|
|
|
+ array.add(position)
|
|
|
+ toJson = gson.toJson(array)
|
|
|
var time = SimpleDateFormat("yyyyMMddHHmmss").format(Date(System.currentTimeMillis()))
|
|
|
var toString = ""
|
|
|
if (point != null && !TextUtils.isEmpty(point.data.id)) {
|
|
@@ -164,10 +164,12 @@ class GraphyVM(
|
|
|
creator = "",
|
|
|
creationTime = time,
|
|
|
modifier = "android",
|
|
|
- modifiedTime = time,
|
|
|
+ modifiedTime = null,
|
|
|
uploadFlag = "",
|
|
|
valid = 1,
|
|
|
- geom = toJson, state = "1"
|
|
|
+ strGeom = toJson,
|
|
|
+ state = "1",
|
|
|
+ geom = null
|
|
|
)
|
|
|
repo.insProblem(problem)
|
|
|
|
|
@@ -199,7 +201,7 @@ class GraphyVM(
|
|
|
creator = "android",
|
|
|
creationTime = time,
|
|
|
modifier = "",
|
|
|
- modifiedTime = time,
|
|
|
+ modifiedTime = null,
|
|
|
valid = 1,
|
|
|
uploadFlag = "", state = "1"
|
|
|
)
|
|
@@ -240,7 +242,13 @@ class GraphyVM(
|
|
|
promodel.floorId = floorId
|
|
|
promodel.spaceId = choseSpace!!.data.id
|
|
|
promodel.id = problem.id
|
|
|
- promodel.position = problem.geom
|
|
|
+
|
|
|
+ val geomList = gson.fromJson<List<PointF>>(
|
|
|
+ problem.strGeom,
|
|
|
+ object : TypeToken<List<PointF?>?>() {}.type
|
|
|
+ )
|
|
|
+
|
|
|
+ promodel.position = gson.toJson(geomList.get(0))
|
|
|
val refFiles = repo.getRefFile(problem.id)
|
|
|
for (file in refFiles) {
|
|
|
var photo = Photos()
|
|
@@ -319,7 +327,7 @@ class GraphyVM(
|
|
|
creator = "Anroid",
|
|
|
creationTime = time,
|
|
|
modifier = "Android",
|
|
|
- modifiedTime = time,
|
|
|
+ modifiedTime = null,
|
|
|
valid = 1,
|
|
|
uploadFlag = "", state = "1"
|
|
|
)
|
|
@@ -557,7 +565,8 @@ class GraphyVM(
|
|
|
gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
|
|
|
- val strInfoTo = gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
+ val strInfoTo =
|
|
|
+ gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
child.position.add(PointF(strInfoTo.location.x, strInfoTo.location.y))
|
|
|
model.children.add(child)
|
|
|
hasParent = true
|
|
@@ -565,12 +574,13 @@ class GraphyVM(
|
|
|
}
|
|
|
if (!hasParent) {
|
|
|
val pipeModel = SpacePipeModel()
|
|
|
- pipeModel.typeName = pipe.pipeType
|
|
|
-
|
|
|
+ pipeModel.typeName = pipe.pipeSubType + "--" + pipe.pipeType
|
|
|
+ pipeModel.type = pipe.pipeType
|
|
|
val child = ChildrenZ()
|
|
|
val objFrom = repo.getObject(pipe.objFrom!!)
|
|
|
val objTo = repo.getObject(pipe.objTo!!)
|
|
|
- val strInfoFrom = gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
+ val strInfoFrom =
|
|
|
+ gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
|
|
|
val strInfoTo = gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
@@ -580,6 +590,7 @@ class GraphyVM(
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ mEmitter.SendDircetive(SPACE_PIPE, pipeModels)
|
|
|
}
|
|
|
// val bean = ReqFloorPipe()
|
|
|
// bean.floorId = floorId
|
|
@@ -630,7 +641,8 @@ class GraphyVM(
|
|
|
fun refreshObject(space: TunableSpace, hashMap: HashMap<String, Any>) {
|
|
|
viewModelScope.launch {
|
|
|
var space = repo.getObject(space.id!!)
|
|
|
- space!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
+// space!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
+ space!!.strInfos = gson.toJson(JSONObject(hashMap as Map<*, *>))
|
|
|
space.state = "1"
|
|
|
repo.insObject(space)
|
|
|
mActivity.setResult(RESULT_OK)
|
|
@@ -726,7 +738,7 @@ class GraphyVM(
|
|
|
creationTime = SimpleDateFormat("yyyyMMddHHmmss").format(Date(System.currentTimeMillis()))
|
|
|
.toLong(),
|
|
|
modifier = "Android",
|
|
|
- modifiedTime = 0,
|
|
|
+ modifiedTime = null,
|
|
|
clientDevice = "",
|
|
|
clientId = uuid,
|
|
|
updateApp = "",
|
|
@@ -742,8 +754,8 @@ class GraphyVM(
|
|
|
repo.insObject(objectEntity)
|
|
|
} else {
|
|
|
val equip = repo.getObject(deviceId!!)
|
|
|
- equip!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
- equip.strInfos = gson.toJson(hashMap)
|
|
|
+// equip!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
+ equip!!.strInfos = gson.toJson(hashMap)
|
|
|
repo.insObject(equip)
|
|
|
}
|
|
|
//插入文件数据
|
|
@@ -781,7 +793,7 @@ class GraphyVM(
|
|
|
}
|
|
|
order++
|
|
|
}
|
|
|
-
|
|
|
+ mActivity.setResult(RESULT_OK)
|
|
|
mActivity.finish()
|
|
|
}
|
|
|
}
|
|
@@ -823,12 +835,20 @@ class GraphyVM(
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objFromLocalId = objFrom.localId
|
|
|
+ if (TextUtils.isEmpty(objFrom.localId)) {
|
|
|
+ rel.objFromLocalId = objFrom.localName
|
|
|
+ } else {
|
|
|
+ rel.objFromLocalId = objFrom.localId
|
|
|
+ }
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objToLocalId = objTo.localId
|
|
|
+ if (TextUtils.isEmpty(objTo.localId)) {
|
|
|
+ rel.objToLocalId = objTo.localName
|
|
|
+ } else {
|
|
|
+ rel.objToLocalId = objTo.localId
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
relList.add(relsFrom)
|
|
@@ -846,12 +866,20 @@ class GraphyVM(
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objFromLocalId = objFrom.localId
|
|
|
+ if (TextUtils.isEmpty(objFrom.localId)) {
|
|
|
+ rel.objFromLocalId = objFrom.localName
|
|
|
+ } else {
|
|
|
+ rel.objFromLocalId = objFrom.localId
|
|
|
+ }
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objToLocalId = objTo.localId
|
|
|
+ if (TextUtils.isEmpty(objTo.localId)) {
|
|
|
+ rel.objToLocalId = objTo.localName
|
|
|
+ } else {
|
|
|
+ rel.objToLocalId = objTo.localId
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
relList.add(relsTo)
|
|
@@ -872,7 +900,8 @@ class GraphyVM(
|
|
|
|
|
|
pipeParent.addAll(pipeFromList)
|
|
|
for (config in pipeFromList) {
|
|
|
- val pipeFrom = repo.getPipeByIdFrom(equipId, config.pipeType!!)
|
|
|
+ val pipeFrom =
|
|
|
+ repo.getPipeByIdFrom(equipId, config.pipeType!!, config.pipeSubType!!)
|
|
|
if (!CommonUtils.IsNull(pipeFrom)) {
|
|
|
for (rel in pipeFrom) {
|
|
|
val objFrom = repo.getObject(rel.objFrom!!)
|
|
@@ -880,12 +909,20 @@ class GraphyVM(
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objFromLocalId = objFrom.localId
|
|
|
+ if (TextUtils.isEmpty(objFrom.localId)) {
|
|
|
+ rel.objFromLocalId = objFrom.localName
|
|
|
+ } else {
|
|
|
+ rel.objFromLocalId = objFrom.localId
|
|
|
+ }
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objToLocalId = objTo.localId
|
|
|
+ if (TextUtils.isEmpty(objTo.localId)) {
|
|
|
+ rel.objToLocalId = objTo.localName
|
|
|
+ } else {
|
|
|
+ rel.objToLocalId = objTo.localId
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
pipeChildren.add(pipeFrom)
|
|
@@ -896,7 +933,7 @@ class GraphyVM(
|
|
|
|
|
|
pipeParent.addAll(pipeToList)
|
|
|
for (config in pipeToList) {
|
|
|
- val pipeFrom = repo.getPipeByIdTo(equipId, config.pipeType!!)
|
|
|
+ val pipeFrom = repo.getPipeByIdTo(equipId, config.pipeType!!, config.pipeSubType!!)
|
|
|
if (!CommonUtils.IsNull(pipeFrom)) {
|
|
|
for (rel in pipeFrom) {
|
|
|
val objFrom = repo.getObject(rel.objFrom!!)
|
|
@@ -904,12 +941,20 @@ class GraphyVM(
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objFromLocalId = objFrom.localId
|
|
|
+ if (TextUtils.isEmpty(objFrom.localId)) {
|
|
|
+ rel.objFromLocalId = objFrom.localName
|
|
|
+ } else {
|
|
|
+ rel.objFromLocalId = objFrom.localId
|
|
|
+ }
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objToLocalId = objTo.localId
|
|
|
+ if (TextUtils.isEmpty(objTo.localId)) {
|
|
|
+ rel.objToLocalId = objTo.localName
|
|
|
+ } else {
|
|
|
+ rel.objToLocalId = objTo.localId
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
pipeChildren.add(pipeFrom)
|