|
@@ -31,10 +31,7 @@ import android.view.View
|
|
|
import android.widget.TextView
|
|
|
import android.widget.Toast
|
|
|
import cn.sagacloud.android.cadengine.FloorScene
|
|
|
-import cn.sagacloud.android.cadengine.items.PointItem
|
|
|
-import cn.sagacloud.android.cadengine.items.QrcodeItem
|
|
|
-import cn.sagacloud.android.cadengine.items.SpaceNameItem
|
|
|
-import cn.sagacloud.android.cadengine.items.TunableSpaceItem
|
|
|
+import cn.sagacloud.android.cadengine.items.*
|
|
|
import cn.sagacloud.android.cadengine.types.Point
|
|
|
import cn.sagacloud.android.cadengine.types.Space
|
|
|
import cn.sagacloud.android.cadengine.types.TunableSpace
|
|
@@ -155,7 +152,7 @@ class GraphyActivity : BaseActivity() {
|
|
|
floorId = floor.getString("floorId")
|
|
|
floorMap = floor.getString("floorMap")
|
|
|
from = floor.getString("from")
|
|
|
- from = "12345"
|
|
|
+// from = "12345"
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -193,6 +190,10 @@ class GraphyActivity : BaseActivity() {
|
|
|
for (item in scene.qrcodeItemList) {
|
|
|
scene.removeItem(item)
|
|
|
}
|
|
|
+ for (item in scene.equipList) {
|
|
|
+ scene.removeItem(item)
|
|
|
+ }
|
|
|
+ scene.equipList.clear()
|
|
|
scene.qrcodeItemList.clear()
|
|
|
}
|
|
|
|
|
@@ -449,24 +450,37 @@ class GraphyActivity : BaseActivity() {
|
|
|
scene.removeItem(item)
|
|
|
}
|
|
|
scene.equipList.clear()
|
|
|
+ //流式布局
|
|
|
equipWwv.removeAllViews()
|
|
|
for (model in list) {
|
|
|
val textview = TextView(this)
|
|
|
- textview.setText(model.type + "(${model.children.size + 1})")
|
|
|
+ textview.setText(model.type + "(${model.children.size})")
|
|
|
textview.setSingleLine()
|
|
|
textview.gravity = Gravity.CENTER
|
|
|
textview.textSize = 12f
|
|
|
textview.height = DensityUtils.dp2px(this, 30f)
|
|
|
- textview.textColor = resources.getColor(R.color.grey_900)
|
|
|
- equipWwv.addView(textview)
|
|
|
-
|
|
|
- if (!model.children.isEmpty() && !model.isCheck) {
|
|
|
- for (child in model.children) {
|
|
|
- //TODO
|
|
|
+ if (model.isCheck) {
|
|
|
+ textview.background = resources.getDrawable(R.drawable.shape_filter_normal)
|
|
|
+ textview.textColor = resources.getColor(R.color.grey_900)
|
|
|
+ } else {
|
|
|
+ textview.background = resources.getDrawable(R.drawable.shape_filter_selected)
|
|
|
+ textview.textColor = resources.getColor(R.color.white)
|
|
|
+ }
|
|
|
+ textview.setOnClickListener {
|
|
|
+ model.isCheck = !model.isCheck
|
|
|
+ if (model.isCheck) {
|
|
|
+ textview.background = resources.getDrawable(R.drawable.shape_filter_normal)
|
|
|
+ textview.textColor = resources.getColor(R.color.grey_900)
|
|
|
+ } else {
|
|
|
+ textview.background = resources.getDrawable(R.drawable.shape_filter_selected)
|
|
|
+ textview.textColor = resources.getColor(R.color.white)
|
|
|
}
|
|
|
+ refreshEquip(list)
|
|
|
}
|
|
|
- }
|
|
|
+ equipWwv.addView(textview)
|
|
|
|
|
|
+ }
|
|
|
+ refreshEquip(list)
|
|
|
}
|
|
|
}
|
|
|
}, this, buildingId, floorId)
|
|
@@ -474,6 +488,32 @@ class GraphyActivity : BaseActivity() {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 刷新地图上设备
|
|
|
+ */
|
|
|
+ private fun refreshEquip(list: List<SpaceEqModel>) {
|
|
|
+ for (item in scene.equipList) {
|
|
|
+ scene.removeItem(item)
|
|
|
+ }
|
|
|
+ scene.equipList.clear()
|
|
|
+ for (model in list) {
|
|
|
+ if (!model.children.isEmpty() && !model.isCheck) {
|
|
|
+ for (child in model.children) {
|
|
|
+ val point = Point()
|
|
|
+ var position = gson.fromJson(child.position, Position::class.java)
|
|
|
+ point.mX = position.x.toFloat()
|
|
|
+ point.mY = position.y.toFloat()
|
|
|
+
|
|
|
+ var item = EquipItem(point, null, scene.defaultPointScale)
|
|
|
+ item.isVisible = true
|
|
|
+ item.zOrder = 100000f
|
|
|
+ scene.equipList.add(item)
|
|
|
+ scene.addItem(item)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 重置空间界面
|
|
|
*/
|
|
|
private fun refreshAll() {
|