|
@@ -35,6 +35,8 @@ import java.text.SimpleDateFormat
|
|
|
import java.util.*
|
|
|
import kotlin.collections.ArrayList
|
|
|
import kotlin.collections.HashMap
|
|
|
+import com.alibaba.fastjson.JSON
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* Created by lihao.
|
|
@@ -322,14 +324,14 @@ class GraphyVM(
|
|
|
projectId = projectId,
|
|
|
buildingId = buildingId,
|
|
|
floorId = floorId,
|
|
|
- location = toJson,
|
|
|
+ strLocation = toJson,
|
|
|
remark = "wall",
|
|
|
creator = "Anroid",
|
|
|
creationTime = time,
|
|
|
modifier = "Android",
|
|
|
modifiedTime = null,
|
|
|
valid = 1,
|
|
|
- uploadFlag = "", state = "1"
|
|
|
+ uploadFlag = "", state = "1", location = null
|
|
|
)
|
|
|
repo.insQrcode(qrcode)
|
|
|
mEmitter.SendDircetive(BIND_QECODE, null)
|
|
@@ -366,7 +368,7 @@ class GraphyVM(
|
|
|
var qrcodeModel = QrcodeModel()
|
|
|
qrcodeModel.obj_id = qrcode.objId
|
|
|
qrcodeModel.qr_code = qrcode.qrCode
|
|
|
- var pointZ = gson.fromJson(qrcode.location, PointZ::class.java)
|
|
|
+ var pointZ = gson.fromJson(qrcode.strLocation, PointZ::class.java)
|
|
|
val position = Position()
|
|
|
position.x = pointZ.x.toString()
|
|
|
position.y = pointZ.y.toString()
|
|
@@ -617,9 +619,9 @@ class GraphyVM(
|
|
|
object : TypeToken<List<Infos?>?>() {}.type
|
|
|
)
|
|
|
var spaceObject = repo.getObject(spaceId)
|
|
|
- var infos = spaceObject!!.infos
|
|
|
+ val infos = gson.fromJson(spaceObject!!.strInfos, HashMap::class.java)
|
|
|
|
|
|
- mEmitter.SendDircetive(SPACE_INFOS, jsonObjectToHashMap(infos))
|
|
|
+ mEmitter.SendDircetive(SPACE_INFOS, infos)
|
|
|
mEmitter.SendDircetive(SPACE_INFO, infoList)
|
|
|
}
|
|
|
}
|
|
@@ -642,7 +644,7 @@ class GraphyVM(
|
|
|
viewModelScope.launch {
|
|
|
var space = repo.getObject(space.id!!)
|
|
|
// space!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
- space!!.strInfos = gson.toJson(JSONObject(hashMap as Map<*, *>))
|
|
|
+ space!!.strInfos = gson.toJson(hashMap)
|
|
|
space.state = "1"
|
|
|
repo.insObject(space)
|
|
|
mActivity.setResult(RESULT_OK)
|
|
@@ -670,8 +672,8 @@ class GraphyVM(
|
|
|
|
|
|
if (!TextUtils.isEmpty(deviceId)) {
|
|
|
var equip = repo.getObject(deviceId)
|
|
|
- var infos = equip!!.infos
|
|
|
- mEmitter.SendDircetive(SPACE_INFOS, jsonObjectToHashMap(infos))
|
|
|
+ val infos = gson.fromJson(equip!!.strInfos, HashMap::class.java)
|
|
|
+ mEmitter.SendDircetive(SPACE_INFOS, infos)
|
|
|
mEmitter.SendDircetive(Equip_INFOS, equip)
|
|
|
}
|
|
|
|
|
@@ -747,7 +749,7 @@ class GraphyVM(
|
|
|
deliveryState = null,
|
|
|
d2mState = null,
|
|
|
virtualCodes = null,
|
|
|
- infos = JSONObject(hashMap as Map<*, *>),
|
|
|
+ infos = null,
|
|
|
strInfos = gson.toJson(hashMap),
|
|
|
floorMap = null, state = "1"
|
|
|
)
|
|
@@ -761,37 +763,39 @@ class GraphyVM(
|
|
|
//插入文件数据
|
|
|
var order = 0
|
|
|
for (photo in beans) {
|
|
|
- if (order != 0) {
|
|
|
- var phUuid = ""
|
|
|
- if (TextUtils.isEmpty(photo.id)) {
|
|
|
- phUuid = UUID.randomUUID().toString().replace("-", "")
|
|
|
- } else {
|
|
|
- phUuid = photo.id
|
|
|
- }
|
|
|
+ if (photo.itemType != 1) {
|
|
|
+ if (order != 0) {
|
|
|
+ var phUuid = ""
|
|
|
+ if (TextUtils.isEmpty(photo.id)) {
|
|
|
+ phUuid = UUID.randomUUID().toString().replace("-", "")
|
|
|
+ } else {
|
|
|
+ phUuid = photo.id
|
|
|
+ }
|
|
|
|
|
|
- val file = FileEntity(
|
|
|
- id = phUuid,
|
|
|
- bizType = "problem_arch",
|
|
|
- filePath = photo.key,
|
|
|
- fileType = "photo",
|
|
|
- clientPath = photo.path,
|
|
|
- refObjId = if (TextUtils.isEmpty(deviceId)) uuid else deviceId,
|
|
|
- refInfoCode = "",
|
|
|
- remark = "",
|
|
|
- orderNum = order,
|
|
|
- projectId = projectId,
|
|
|
- buildingId = buildingId,
|
|
|
- floorId = floorId,
|
|
|
- creator = "android",
|
|
|
- creationTime = "",
|
|
|
- modifier = "",
|
|
|
- modifiedTime = null,
|
|
|
- valid = 1,
|
|
|
- uploadFlag = "", state = "1"
|
|
|
- )
|
|
|
- repo.insFile(file)
|
|
|
+ val file = FileEntity(
|
|
|
+ id = phUuid,
|
|
|
+ bizType = "problem_arch",
|
|
|
+ filePath = photo.key,
|
|
|
+ fileType = "photo",
|
|
|
+ clientPath = photo.path,
|
|
|
+ refObjId = if (TextUtils.isEmpty(deviceId)) uuid else deviceId,
|
|
|
+ refInfoCode = "",
|
|
|
+ remark = "",
|
|
|
+ orderNum = order,
|
|
|
+ projectId = projectId,
|
|
|
+ buildingId = buildingId,
|
|
|
+ floorId = floorId,
|
|
|
+ creator = "android",
|
|
|
+ creationTime = "",
|
|
|
+ modifier = "",
|
|
|
+ modifiedTime = null,
|
|
|
+ valid = 1,
|
|
|
+ uploadFlag = "", state = "1"
|
|
|
+ )
|
|
|
+ repo.insFile(file)
|
|
|
+ }
|
|
|
+ order++
|
|
|
}
|
|
|
- order++
|
|
|
}
|
|
|
mActivity.setResult(RESULT_OK)
|
|
|
mActivity.finish()
|