|
@@ -24,6 +24,7 @@
|
|
|
package com.sybotan.android.demo.activities
|
|
|
|
|
|
import android.content.Intent
|
|
|
+import android.graphics.Color
|
|
|
import android.os.Bundle
|
|
|
import android.util.Log
|
|
|
import android.view.Gravity
|
|
@@ -31,6 +32,7 @@ import android.view.View
|
|
|
import android.widget.TextView
|
|
|
import android.widget.Toast
|
|
|
import cn.sagacloud.android.cadengine.FloorScene
|
|
|
+import cn.sagacloud.android.cadengine.Opt
|
|
|
import cn.sagacloud.android.cadengine.items.*
|
|
|
import cn.sagacloud.android.cadengine.types.Point
|
|
|
import cn.sagacloud.android.cadengine.types.Space
|
|
@@ -83,7 +85,7 @@ class GraphyActivity : BaseActivity() {
|
|
|
lateinit var from: String
|
|
|
|
|
|
/** 实际距离 */
|
|
|
- val distance = 1800f
|
|
|
+ val distance = 2500f
|
|
|
|
|
|
/** 缩放后的同比例距离 */
|
|
|
var realDistance = 0f
|
|
@@ -164,9 +166,13 @@ class GraphyActivity : BaseActivity() {
|
|
|
//选中空间完毕界面逻辑
|
|
|
if (scene.mapType.equals("space")) {
|
|
|
if ("space".equals(from)) {
|
|
|
- spaceStructure.visibility = View.VISIBLE
|
|
|
- spaceName.text = scene.choseSpace!!.data.localName
|
|
|
- graphyVM.getProblem(scene.choseSpace)
|
|
|
+ quesDetail.visibility = View.GONE
|
|
|
+ if (!scene.choseSpace!!.data.jobStatus.equals("03")) {
|
|
|
+ spaceStructure.visibility = View.VISIBLE
|
|
|
+ spaceName.text = scene.choseSpace!!.data.localName
|
|
|
+ graphyVM.getProblem(scene.choseSpace)
|
|
|
+
|
|
|
+ }
|
|
|
graphyVM.getQrcode(scene.choseSpace)
|
|
|
} else {
|
|
|
if (equipLl.visibility == View.GONE) {
|
|
@@ -362,6 +368,12 @@ class GraphyActivity : BaseActivity() {
|
|
|
tunableSpace.id = model.id
|
|
|
tunableSpace.localName = model.localName
|
|
|
val item = TunableSpaceItem(tunableSpace, null)
|
|
|
+ scene.choseSpace?.let {
|
|
|
+ if (tunableSpace.id.equals(scene.choseSpace!!.data.id)) {
|
|
|
+ item.paint.color = Opt.spaceChoseColor
|
|
|
+ item.outPaint.color = Color.rgb(0xbd, 0xe8, 0xfe)
|
|
|
+ }
|
|
|
+ }
|
|
|
item.isVisible = true
|
|
|
item.zOrder = 99996f
|
|
|
scene.tunableSpaceList.add(item)
|
|
@@ -416,6 +428,10 @@ class GraphyActivity : BaseActivity() {
|
|
|
|
|
|
/** 查询对象绑定的二维码 */
|
|
|
GraphyVM.GET_QECODE -> {
|
|
|
+ for (item in scene.qrcodeItemList) {
|
|
|
+ scene.removeItem(item)
|
|
|
+ }
|
|
|
+ scene.qrcodeItemList.clear()
|
|
|
val models = params as ArrayList<QrcodeModel>
|
|
|
for (model in models) {
|
|
|
val point = Point()
|
|
@@ -538,6 +554,7 @@ class GraphyActivity : BaseActivity() {
|
|
|
scene.equipList.clear()
|
|
|
|
|
|
spaceStructure.visibility = View.GONE
|
|
|
+ quesDetail.visibility = View.GONE
|
|
|
drawLl.visibility = View.GONE
|
|
|
equipLl.visibility = View.GONE
|
|
|
|