|
@@ -20,6 +20,7 @@ import com.bumptech.glide.Glide
|
|
import com.sybotan.android.demo.R
|
|
import com.sybotan.android.demo.R
|
|
import com.sybotan.android.demo.adapter.StaticInfoAdapter
|
|
import com.sybotan.android.demo.adapter.StaticInfoAdapter
|
|
import cn.sagacloud.android.cadengine.types.Photos
|
|
import cn.sagacloud.android.cadengine.types.Photos
|
|
|
|
+import cn.sagacloud.android.cadengine.types.Pointz2
|
|
import com.framework.mvvm.model.db.entity.dict.ComponentEntity
|
|
import com.framework.mvvm.model.db.entity.dict.ComponentEntity
|
|
import com.framework.mvvm.model.db.entity.task.*
|
|
import com.framework.mvvm.model.db.entity.task.*
|
|
import com.framework.mvvm.model.db.entity.dict.EquipmentEntity
|
|
import com.framework.mvvm.model.db.entity.dict.EquipmentEntity
|
|
@@ -356,6 +357,11 @@ class EquipDetailActivity : BaseActivity(), View.OnTouchListener {
|
|
compType.setTvRight(compCode.toString())
|
|
compType.setTvRight(compCode.toString())
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+ if (staticInfoAdapter.hashMap != null && staticInfoAdapter.hashMap.get("location") != null) {
|
|
|
|
+ val position = Gson().fromJson(staticInfoAdapter.hashMap.get("location").toString(), Pointz2::class.java)
|
|
|
|
+ location.setTvRight("(x=${position?.x()},y=${position?.y()})")
|
|
|
|
+
|
|
|
|
+ }
|
|
if (staticInfoAdapter.hashMap != null && staticInfoAdapter.hashMap.get("equipPhoto") != null) {
|
|
if (staticInfoAdapter.hashMap != null && staticInfoAdapter.hashMap.get("equipPhoto") != null) {
|
|
val infoList = Gson().fromJson<List<Photos>>(
|
|
val infoList = Gson().fromJson<List<Photos>>(
|
|
staticInfoAdapter.hashMap.get("equipPhoto").toString(),
|
|
staticInfoAdapter.hashMap.get("equipPhoto").toString(),
|
|
@@ -374,14 +380,14 @@ class EquipDetailActivity : BaseActivity(), View.OnTouchListener {
|
|
var equip = params as ObjectEntity
|
|
var equip = params as ObjectEntity
|
|
this.equip = equip
|
|
this.equip = equip
|
|
deviceId = equip.id
|
|
deviceId = equip.id
|
|
- val infos = Gson().fromJson(equip.infos, InfosforEquip::class.java)
|
|
|
|
- height.setTvRight(infos.location.z.toString())
|
|
|
|
|
|
+ val infos = Gson().fromJson(equip.infos, InfosforEq::class.java)
|
|
|
|
+ height.setTvRight(infos.location.z().toString())
|
|
if (position!!.z == null) {
|
|
if (position!!.z == null) {
|
|
val z = Z()
|
|
val z = Z()
|
|
- z.offset = infos.location.z.toString()
|
|
|
|
|
|
+ z.offset = infos.location.z().toString()
|
|
position!!.z = z
|
|
position!!.z = z
|
|
} else {
|
|
} else {
|
|
- position!!.z.offset = infos.location.z.toString()
|
|
|
|
|
|
+ position!!.z.offset = infos.location.z().toString()
|
|
}
|
|
}
|
|
if (this.equipEntity == null) {
|
|
if (this.equipEntity == null) {
|
|
for (eq in equips) {
|
|
for (eq in equips) {
|