|
@@ -60,8 +60,8 @@ import com.arashivision.sdkcamera.camera.callback.ICameraChangedCallback
|
|
|
import com.arashivision.sdkcamera.camera.callback.ICaptureStatusListener
|
|
|
import com.bumptech.glide.Glide
|
|
|
import com.framework.mvvm.model.db.entity.dict.MajorEntity
|
|
|
+import com.framework.mvvm.model.db.entity.task.InfosforEq
|
|
|
import com.framework.mvvm.model.db.entity.task.ObjectEntity
|
|
|
-import com.framework.mvvm.model.db.entity.task.InfosforEquip
|
|
|
import com.framework.mvvm.mv.AdmViewModel
|
|
|
import com.google.gson.Gson
|
|
|
import com.google.gson.reflect.TypeToken
|
|
@@ -1850,9 +1850,9 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
- val info = gson.fromJson(bus.equip.infos, InfosforEquip::class.java)
|
|
|
+ val info = gson.fromJson(bus.equip.infos, InfosforEq::class.java)
|
|
|
scene.type = "equip"
|
|
|
- equipLocation.setText("(${info.location!!.x},${-info.location.y})")
|
|
|
+ equipLocation.setText("(${info.location!!.x()},${-info.location.y()})")
|
|
|
drawLl.visibility = View.GONE
|
|
|
equipLl.visibility = View.VISIBLE
|
|
|
equipRg.clearCheck()
|
|
@@ -1865,10 +1865,10 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
} else if (info.zRegion.equals("air")) {
|
|
|
air.isChecked = true
|
|
|
}
|
|
|
- equipEdit.setText(info.location.z.toString())
|
|
|
+ equipEdit.setText(info.location.z().toString())
|
|
|
|
|
|
- scene.point.mX = info.location.x
|
|
|
- scene.point.mY = -info.location.y
|
|
|
+ scene.point.mX = info.location.x()
|
|
|
+ scene.point.mY = -info.location.y()
|
|
|
scene.point.equipState = 4
|
|
|
scene.eqItem = EquipItem(this@GraphyActivity, scene.point)
|
|
|
scene.eqItem!!.isVisible = true
|