|
@@ -188,44 +188,23 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
|
|
|
private lateinit var graphyView: SGraphyView
|
|
|
private lateinit var quesDetail: RelativeLayout
|
|
|
- private lateinit var spaceStructure: LinearLayout
|
|
|
- private lateinit var doneSpaceStructure: LinearLayout
|
|
|
- private lateinit var spaceName: TextView
|
|
|
- private lateinit var spaceName3: TextView
|
|
|
- private lateinit var spaceName4: TextView
|
|
|
private lateinit var spaceName2: TextView
|
|
|
private lateinit var equipLl: LinearLayout
|
|
|
private lateinit var drawLl: LinearLayout
|
|
|
private lateinit var equipLocation: TextView
|
|
|
- private lateinit var qrcodeLl: LinearLayout
|
|
|
- private lateinit var addDot: TextView
|
|
|
- private lateinit var nfc: TextView
|
|
|
- private lateinit var qrcodeLocation: TextView
|
|
|
- private lateinit var modelCheckBox: CheckBox
|
|
|
- private lateinit var modelSubmit: TextView
|
|
|
private lateinit var sceneCheckBox: CheckBox
|
|
|
private lateinit var sceneSubmit: TextView
|
|
|
- private lateinit var qrcode: TextView
|
|
|
- private lateinit var qrcodeCancel: TextView
|
|
|
private lateinit var pipeCancel: TextView
|
|
|
private lateinit var pipeLl: LinearLayout
|
|
|
- private lateinit var qrcodeNext: TextView
|
|
|
private lateinit var pipeNext: TextView
|
|
|
private lateinit var pipeEdit: EditText
|
|
|
private lateinit var drawEquip: TextView
|
|
|
private lateinit var drawPipe: TextView
|
|
|
private lateinit var piprRv: RecyclerView
|
|
|
- private lateinit var problemPicRecycler: MaxHeightRecyclerView
|
|
|
private lateinit var equipCancel: TextView
|
|
|
private lateinit var equipNext: TextView
|
|
|
private lateinit var equipEdit: EditText
|
|
|
private lateinit var equipRg: RadioGroup
|
|
|
- private lateinit var eqSpServe: TextView
|
|
|
- private lateinit var eqEqCtrl: TextView
|
|
|
- private lateinit var eqEqSs: TextView
|
|
|
- private lateinit var eqEqPower: TextView
|
|
|
- private lateinit var eqEqVv: TextView
|
|
|
- private lateinit var eqPipeCnct: TextView
|
|
|
private lateinit var equipWwv: WordWrapView
|
|
|
private lateinit var pipeWwv: WordWrapView
|
|
|
private lateinit var roof: RadioButton
|
|
@@ -234,22 +213,10 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
private lateinit var air: RadioButton
|
|
|
private lateinit var quesTv: TextView
|
|
|
private lateinit var quesSubmit: TextView
|
|
|
- private lateinit var addSpaceDetail: TextView
|
|
|
- private lateinit var addSpaceDetail2: TextView
|
|
|
- private lateinit var resetSpaceState: TextView
|
|
|
- private lateinit var qrcodeEdit: EditText
|
|
|
private lateinit var webview: WebView
|
|
|
private lateinit var quesIma: ImageView
|
|
|
- private lateinit var problemLl: LinearLayoutCompat
|
|
|
- private lateinit var ProblemRg: RadioGroup
|
|
|
- private lateinit var pointRb: RadioButton
|
|
|
- private lateinit var lineRb: RadioButton
|
|
|
- private lateinit var problemClose: TextView
|
|
|
- private lateinit var problemDone: TextView
|
|
|
- private lateinit var problemSave: TextView
|
|
|
private lateinit var equipDetail: TextView
|
|
|
private lateinit var equipDelete: TextView
|
|
|
- private lateinit var problemDesc: AppCompatEditText
|
|
|
|
|
|
/**
|
|
|
* 创建Activity时的回调函数
|
|
@@ -368,44 +335,23 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
private fun initView() {
|
|
|
graphyView = findViewById(R.id.graphyView)
|
|
|
quesDetail = findViewById(R.id.quesDetail)
|
|
|
- spaceStructure = findViewById(R.id.spaceStructure)
|
|
|
- doneSpaceStructure = findViewById(R.id.doneSpaceStructure)
|
|
|
- spaceName = findViewById(R.id.spaceName)
|
|
|
spaceName2 = findViewById(R.id.spaceName2)
|
|
|
- spaceName3 = findViewById(R.id.spaceName3)
|
|
|
- spaceName4 = findViewById(R.id.spaceName4)
|
|
|
equipLl = findViewById(R.id.equipLl)
|
|
|
drawLl = findViewById(R.id.drawLl)
|
|
|
equipLocation = findViewById(R.id.equipLocation)
|
|
|
- qrcodeLl = findViewById(R.id.qrcodeLl)
|
|
|
- addDot = findViewById(R.id.addDot)
|
|
|
- nfc = findViewById(R.id.nfc)
|
|
|
- qrcodeLocation = findViewById(R.id.qrcodeLocation)
|
|
|
- modelCheckBox = findViewById(R.id.modelCheckBox)
|
|
|
- modelSubmit = findViewById(R.id.modelSubmit)
|
|
|
sceneCheckBox = findViewById(R.id.sceneCheckBox)
|
|
|
sceneSubmit = findViewById(R.id.sceneSubmit)
|
|
|
- qrcode = findViewById(R.id.qrcode)
|
|
|
- qrcodeCancel = findViewById(R.id.qrcodeCancel)
|
|
|
pipeCancel = findViewById(R.id.pipeCancel)
|
|
|
pipeLl = findViewById(R.id.pipeLl)
|
|
|
- qrcodeNext = findViewById(R.id.qrcodeNext)
|
|
|
pipeNext = findViewById(R.id.pipeNext)
|
|
|
pipeEdit = findViewById(R.id.pipeEdit)
|
|
|
drawEquip = findViewById(R.id.drawEquip)
|
|
|
drawPipe = findViewById(R.id.drawPipe)
|
|
|
piprRv = findViewById(R.id.piprRv)
|
|
|
- problemPicRecycler = findViewById(R.id.problemPicRecycler)
|
|
|
equipCancel = findViewById(R.id.equipCancel)
|
|
|
equipNext = findViewById(R.id.equipNext)
|
|
|
equipEdit = findViewById(R.id.equipEdit)
|
|
|
equipRg = findViewById(R.id.equipRg)
|
|
|
- eqSpServe = findViewById(R.id.eqSpServe)
|
|
|
- eqEqCtrl = findViewById(R.id.eqEqCtrl)
|
|
|
- eqEqSs = findViewById(R.id.eqEqSs)
|
|
|
- eqEqPower = findViewById(R.id.eqEqPower)
|
|
|
- eqEqVv = findViewById(R.id.eqEqVv)
|
|
|
- eqPipeCnct = findViewById(R.id.eqPipeCnct)
|
|
|
equipWwv = findViewById(R.id.equipWwv)
|
|
|
pipeWwv = findViewById(R.id.pipeWwv)
|
|
|
roof = findViewById(R.id.roof)
|
|
@@ -414,22 +360,10 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
air = findViewById(R.id.air)
|
|
|
quesTv = findViewById(R.id.quesTv)
|
|
|
quesSubmit = findViewById(R.id.quesSubmit)
|
|
|
- qrcodeEdit = findViewById(R.id.qrcodeEdit)
|
|
|
webview = findViewById(R.id.webview)
|
|
|
quesIma = findViewById(R.id.quesIma)
|
|
|
- addSpaceDetail = findViewById(R.id.addSpaceDetail)
|
|
|
- addSpaceDetail2 = findViewById(R.id.addSpaceDetail2)
|
|
|
- resetSpaceState = findViewById(R.id.resetSpaceState)
|
|
|
- problemLl = findViewById(R.id.problemLl)
|
|
|
- ProblemRg = findViewById(R.id.ProblemRg)
|
|
|
- pointRb = findViewById(R.id.pointRb)
|
|
|
- lineRb = findViewById(R.id.lineRb)
|
|
|
- problemClose = findViewById(R.id.problemClose)
|
|
|
- problemDone = findViewById(R.id.problemDone)
|
|
|
- problemSave = findViewById(R.id.problemSave)
|
|
|
equipDetail = findViewById(R.id.equipDetail)
|
|
|
equipDelete = findViewById(R.id.equipDelete)
|
|
|
- problemDesc = findViewById(R.id.problemDesc)
|
|
|
|
|
|
}
|
|
|
|
|
@@ -445,22 +379,22 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
projectId = floor.getString("projectId")!!
|
|
|
}
|
|
|
|
|
|
- private fun addPic() {
|
|
|
- val config: ImgSelConfig = ImgSelConfig.Builder(this, loader) // 是否多选
|
|
|
- .multiSelect(true) // 是否记住上次选中记录, 仅当multiSelect为true的时候配置,默认为true
|
|
|
- .rememberSelected(false) // 确定按钮文字颜色
|
|
|
- .btnTextColor(Color.WHITE) // 使用沉浸式状态栏
|
|
|
- .statusBarColor(resources.getColor(R.color.blue_2E3679)) // 返回图标ResId
|
|
|
- .backResId(R.mipmap.back_gray).title("选择图片").titleColor(Color.WHITE).titleBgColor(
|
|
|
- resources.getColor(R.color.blue_2E3679)
|
|
|
- ) // .allImagesText("All Images")
|
|
|
- .needCrop(false).cropSize(1, 1, 200, 200) // 第一个是否显示相机
|
|
|
- .needCamera(true) // 最大选择图片数量
|
|
|
- .build()
|
|
|
- //选择图片activity
|
|
|
- //选择图片activity
|
|
|
- Repair_ImgSelActivity.startActivity(this, config, REQUEST_CODE_PIC)
|
|
|
- }
|
|
|
+// private fun addPic() {
|
|
|
+// val config: ImgSelConfig = ImgSelConfig.Builder(this, loader) // 是否多选
|
|
|
+// .multiSelect(true) // 是否记住上次选中记录, 仅当multiSelect为true的时候配置,默认为true
|
|
|
+// .rememberSelected(false) // 确定按钮文字颜色
|
|
|
+// .btnTextColor(Color.WHITE) // 使用沉浸式状态栏
|
|
|
+// .statusBarColor(resources.getColor(R.color.blue_2E3679)) // 返回图标ResId
|
|
|
+// .backResId(R.mipmap.back_gray).title("选择图片").titleColor(Color.WHITE).titleBgColor(
|
|
|
+// resources.getColor(R.color.blue_2E3679)
|
|
|
+// ) // .allImagesText("All Images")
|
|
|
+// .needCrop(false).cropSize(1, 1, 200, 200) // 第一个是否显示相机
|
|
|
+// .needCamera(true) // 最大选择图片数量
|
|
|
+// .build()
|
|
|
+// //选择图片activity
|
|
|
+// //选择图片activity
|
|
|
+// Repair_ImgSelActivity.startActivity(this, config, REQUEST_CODE_PIC)
|
|
|
+// }
|
|
|
|
|
|
private fun doPicDatas(pathList: List<String>?) {
|
|
|
LocalDataOperation.getInstance().dealLocalData<Photos>(this) { name, params ->
|
|
@@ -640,14 +574,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
}
|
|
|
}
|
|
|
hasChoose = true
|
|
|
- ProblemRg.visibility = View.GONE
|
|
|
- pointRb.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
|
-
|
|
|
- }
|
|
|
- lineRb.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
|
-
|
|
|
- }
|
|
|
- lineRb.isChecked = true
|
|
|
for (p in point.data.points) {
|
|
|
var pipe = PipeLine()
|
|
|
var pointf = PointF()
|
|
@@ -676,21 +602,12 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
).toInt()
|
|
|
if (sqrt < realDistance) {
|
|
|
hasChoose = true
|
|
|
- ProblemRg.visibility = View.GONE
|
|
|
- pointRb.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
|
-
|
|
|
- }
|
|
|
- lineRb.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
|
-
|
|
|
- }
|
|
|
- pointRb.isChecked = true
|
|
|
showDotDetail(point)
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (!hasChoose) {
|
|
|
- problemLl.visibility = View.GONE
|
|
|
} else {
|
|
|
return
|
|
|
}
|
|
@@ -807,7 +724,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
//计算控制点的边界
|
|
|
//是否已经拥有该点
|
|
|
/** 打点业务 */
|
|
|
- if ("dot".equals(scene.type)) {
|
|
|
+ /*if ("dot".equals(scene.type)) {
|
|
|
// for (space in scene.spaceList) {
|
|
|
// val polygonContainsPoint = Lasso.isPolygonContainsPoint(
|
|
|
// space.mPoints,
|
|
@@ -842,21 +759,10 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
if (!outSide) {
|
|
|
return
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- //打点业务
|
|
|
-// if ("dot".equals(scene.type)) {
|
|
|
-// if (addPoint != null) {
|
|
|
-// scene.removeItem(addPoint!!)
|
|
|
-// }
|
|
|
-// ProblemDot.mX = x
|
|
|
-// ProblemDot.mY = y
|
|
|
-// addPoint = graphyHelper.addPoint(ProblemDot)
|
|
|
-// return
|
|
|
-// }
|
|
|
+ } else*/
|
|
|
|
|
|
//绘制管道业务
|
|
|
- else if ("pipe".equals(scene.type)) {
|
|
|
+ if ("pipe".equals(scene.type)) {
|
|
|
var pipe = PipeLine()
|
|
|
var pointf = PointF()
|
|
|
pointf.x = x
|
|
@@ -873,22 +779,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
scene.addItem(item)
|
|
|
}
|
|
|
|
|
|
- //绘制二维码
|
|
|
- } else if ("qrcode".equals(scene.type)) {
|
|
|
- scene.point.mX = x
|
|
|
- scene.point.mY = y
|
|
|
-
|
|
|
- if (scene.item != null) {
|
|
|
- scene.removeItem(scene.item!!)
|
|
|
- }
|
|
|
- scene.item =
|
|
|
- QrcodeItem(this@GraphyActivity, scene.point, null, scene.defaultPointScale)
|
|
|
- scene.item!!.isVisible = true
|
|
|
- scene.item!!.zOrder = 100000f
|
|
|
- scene.addItem(scene.item!!)
|
|
|
-
|
|
|
- //绘制设备
|
|
|
- } else if ("equip".equals(scene.type)) {
|
|
|
+ } else if ("equip".equals(scene.type)) {
|
|
|
scene.point.mX = x
|
|
|
scene.point.mY = y
|
|
|
|
|
@@ -1011,74 +902,19 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
// min(w / rect.width(), h / rect.height()) * 0.8f)
|
|
|
|
|
|
|
|
|
- if ("space".equals(from)) {
|
|
|
- quesDetail.visibility = View.GONE
|
|
|
- if (!scene.choseSpace!!.data.jobStatus.equals("03")) {
|
|
|
- spaceStructure.visibility = View.VISIBLE
|
|
|
- doneSpaceStructure.visibility = View.GONE
|
|
|
- graphyVM.getProblem(scene.choseSpace)
|
|
|
- /** 跳转空间详情 */
|
|
|
- addSpaceDetail.setOnClickListener {
|
|
|
- val intent =
|
|
|
- Intent(this@GraphyActivity, SpaceDetailActivity::class.java)
|
|
|
- val bundle = Bundle()
|
|
|
- bundle.putString("buildingId", buildingId)
|
|
|
- bundle.putString("floorId", floorId)
|
|
|
- bundle.putString("projectId", projectId)
|
|
|
- bundle.putString("spaceId", scene.choseSpace!!.data.id)
|
|
|
- bundle.putParcelable("space", scene.choseSpace!!.data)
|
|
|
- intent.putExtra("floor", bundle)
|
|
|
- startActivity(intent)
|
|
|
- }
|
|
|
- } else {
|
|
|
- doneSpaceStructure.visibility = View.VISIBLE
|
|
|
- spaceStructure.visibility = View.GONE
|
|
|
- /** 重置空间状态 */
|
|
|
- resetSpaceState.setOnClickListener {
|
|
|
- if ("space".equals(from)) {
|
|
|
- graphyVM.setJob(scene.choseSpace, "01")
|
|
|
- } else {
|
|
|
- graphyVM.setJob(scene.choseSpace, "04")
|
|
|
- }
|
|
|
- }
|
|
|
- /** 跳转空间详情 */
|
|
|
- addSpaceDetail2.setOnClickListener {
|
|
|
- val intent =
|
|
|
- Intent(this@GraphyActivity, SpaceDetailActivity::class.java)
|
|
|
- val bundle = Bundle()
|
|
|
- bundle.putString("buildingId", buildingId)
|
|
|
- bundle.putString("floorId", floorId)
|
|
|
- bundle.putString("projectId", projectId)
|
|
|
- bundle.putString("spaceId", scene.choseSpace!!.data.id)
|
|
|
- bundle.putParcelable("space", scene.choseSpace!!.data)
|
|
|
- intent.putExtra("floor", bundle)
|
|
|
- startActivity(intent)
|
|
|
- }
|
|
|
- }
|
|
|
- spaceName.text = scene.choseSpace!!.data.localName
|
|
|
- spaceName3.text = scene.choseSpace!!.data.localName
|
|
|
- spaceName4.text = scene.choseSpace!!.data.localName
|
|
|
- graphyVM.getQrcode(scene.choseSpace)
|
|
|
- } else {
|
|
|
- if (equipLl.visibility == View.GONE) {
|
|
|
- drawLl.visibility = View.VISIBLE
|
|
|
- spaceName2.text = scene.choseSpace!!.data.localName
|
|
|
- graphyVM.getSpaceEq(scene.choseSpace)
|
|
|
+ if (equipLl.visibility == View.GONE) {
|
|
|
+ drawLl.visibility = View.VISIBLE
|
|
|
+ spaceName2.text = scene.choseSpace!!.data.localName
|
|
|
+ graphyVM.getSpaceEq(scene.choseSpace)
|
|
|
// graphyVM.spacePipe(scene.choseSpace)
|
|
|
- }
|
|
|
- equipLocation.setText("($x,$y)")
|
|
|
-
|
|
|
}
|
|
|
+ equipLocation.setText("($x,$y)")
|
|
|
+
|
|
|
//未选中空间
|
|
|
} else if (scene.mapType.equals("nothing")) {
|
|
|
- spaceStructure.visibility = View.GONE
|
|
|
- doneSpaceStructure.visibility = View.GONE
|
|
|
- qrcodeLl.visibility = View.GONE
|
|
|
- qrcodeLocation.setText("(0,0)")
|
|
|
quesDetail.visibility = View.GONE
|
|
|
equipLl.visibility = View.GONE
|
|
|
drawLl.visibility = View.GONE
|
|
|
- problemLl.visibility = View.GONE
|
|
|
for (item in scene.pointItemList) {
|
|
|
scene.removeItem(item)
|
|
|
}
|
|
@@ -1092,15 +928,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
scene.equipList.clear()
|
|
|
scene.qrcodeItemList.clear()
|
|
|
}
|
|
|
-
|
|
|
- //绑定二位码业务
|
|
|
- if ("qrcode".equals(scene.type)) {
|
|
|
- qrcodeLl.visibility = View.VISIBLE
|
|
|
- qrcodeLocation.setText("(${scene.point.mX},${scene.point.mY})")
|
|
|
- spaceStructure.visibility = View.GONE
|
|
|
- doneSpaceStructure.visibility = View.GONE
|
|
|
- return
|
|
|
- }
|
|
|
}
|
|
|
})
|
|
|
}
|
|
@@ -1126,19 +953,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
InstaCameraManager.getInstance().startNormalCapture(false)
|
|
|
}
|
|
|
}
|
|
|
- /** nfc点击监听 */
|
|
|
- nfc.setOnClickListener { Toast.makeText(this, "正在开发中,敬请期待", Toast.LENGTH_SHORT).show() }
|
|
|
-
|
|
|
- /** checkBox */
|
|
|
- modelCheckBox.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
|
- if (isChecked) {
|
|
|
- modelSubmit.isEnabled = true
|
|
|
- modelSubmit.alpha = 1f
|
|
|
- } else {
|
|
|
- modelSubmit.isEnabled = false
|
|
|
- modelSubmit.alpha = 0.3f
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
/** checkBox */
|
|
|
sceneCheckBox.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
@@ -1156,65 +970,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
graphyVM.setJob(scene.choseSpace, "05")
|
|
|
}
|
|
|
|
|
|
- /** 设置空间的任务状态完成 */
|
|
|
- modelSubmit.setOnClickListener {
|
|
|
- if (scene.choseSpace!!.data.jobStatus.equals("02")) {
|
|
|
- ToastUtils.showMyToast("空间内还有未解决的问题")
|
|
|
- return@setOnClickListener
|
|
|
- }
|
|
|
- graphyVM.setJob(scene.choseSpace, "03")
|
|
|
- }
|
|
|
-
|
|
|
- /** 打点按钮 */
|
|
|
- addDot.setOnClickListener {
|
|
|
- scene.type = "dot"
|
|
|
- ProblemDot.mX = 0f
|
|
|
- ProblemDot.mY = 0f
|
|
|
- spaceStructure.visibility = View.GONE
|
|
|
- problemLl.visibility = View.VISIBLE
|
|
|
- ProblemRg.visibility = View.VISIBLE
|
|
|
- pointRb.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
|
- if (isChecked) {
|
|
|
- scene.type = "dot"
|
|
|
- for (item in scene.drawingPipeItemList) {
|
|
|
- scene.removeItem(item)
|
|
|
- }
|
|
|
- scene.pipeLineList.clear()
|
|
|
- scene.drawingPipeItemList.clear()
|
|
|
- }
|
|
|
- }
|
|
|
- lineRb.setOnCheckedChangeListener { buttonView, isChecked ->
|
|
|
- if (isChecked) {
|
|
|
- scene.type = "pipe"
|
|
|
- if (addPoint != null) {
|
|
|
- scene.removeItem(addPoint!!)
|
|
|
- scene.pointItemList.remove(addPoint)
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- pointRb.isChecked = true
|
|
|
- showDotDetail(null)
|
|
|
- initProblemPicture(null)
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- /** 绑定二维码按钮 */
|
|
|
- qrcode.setOnClickListener {
|
|
|
- scene.type = "qrcode"
|
|
|
- qrcodeLl.visibility = View.VISIBLE
|
|
|
- spaceStructure.visibility = View.GONE
|
|
|
- }
|
|
|
-
|
|
|
- /** 取消绑定二维码 */
|
|
|
- qrcodeCancel.setOnClickListener {
|
|
|
- qrcodeLl.visibility = View.GONE
|
|
|
- qrcodeLocation.setText("(0,0)")
|
|
|
- spaceStructure.visibility = View.VISIBLE
|
|
|
- scene.type = "normal"
|
|
|
- scene.item?.let { it1 -> scene.removeItem(it1) }
|
|
|
- }
|
|
|
-
|
|
|
/** 取消绘制管道 */
|
|
|
pipeCancel.setOnClickListener {
|
|
|
pipeLl.visibility = View.GONE
|
|
@@ -1227,20 +982,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
scene.drawingPipeItemList.clear()
|
|
|
}
|
|
|
|
|
|
- /** 绑定二维码下一步 */
|
|
|
- qrcodeNext.setOnClickListener {
|
|
|
- if (qrcodeLocation.text.equals("(0,0)")) {
|
|
|
- ToastUtils.showMyToast("请扎点")
|
|
|
- return@setOnClickListener
|
|
|
- }
|
|
|
- if (TextUtils.isEmpty(qrcodeEdit.text.trim())) {
|
|
|
- ToastUtils.showMyToast("请输入高度")
|
|
|
- return@setOnClickListener
|
|
|
- }
|
|
|
- val intent = Intent(this@GraphyActivity, CaptureActivity::class.java)
|
|
|
- startActivityForResult(intent, REQUEST_CODE_SCAN)
|
|
|
- }
|
|
|
-
|
|
|
/** 添加管线下一步 */
|
|
|
pipeNext.setOnClickListener {
|
|
|
// for (model in pipeTypeList) {
|
|
@@ -1364,33 +1105,20 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
equipEdit.alpha = 1f
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- /** 服务 */
|
|
|
- eqSpServe.setOnClickListener { skipRelationship("eq_sp_serve", "eq_sp") }
|
|
|
- /** 控制 */
|
|
|
- eqEqCtrl.setOnClickListener { skipRelationship("eq_eq_ctrl", "eq_eq") }
|
|
|
- /** 测量 */
|
|
|
- eqEqSs.setOnClickListener { skipRelationship("eq_eq_ss", "eq_eq") }
|
|
|
- /** 供电 */
|
|
|
- eqEqPower.setOnClickListener { skipRelationship("eq_eq_power", "eq_eq") }
|
|
|
- /** 阀门 */
|
|
|
- eqEqVv.setOnClickListener { skipRelationship("eq_eq_vv", "eq_eq") }
|
|
|
- /** 连接 */
|
|
|
- eqPipeCnct.setOnClickListener { skipRelationship("eq_pipe_cnct", "eq_pipe") }
|
|
|
}
|
|
|
|
|
|
private fun initProblemPicture(point: PointItem?) {
|
|
|
- beans.clear()
|
|
|
- val photo = Photos()
|
|
|
- photo.itemType = 1
|
|
|
- beans.add(photo)
|
|
|
- if (point != null) {
|
|
|
- beans.addAll(point.data.photos)
|
|
|
- }
|
|
|
- pictureAdapter = PictureAdapter(this, beans, "", false, 0, 85)
|
|
|
- pictureAdapter.setOnPicAdd { addPic() }
|
|
|
- problemPicRecycler.setLayoutManager(GridLayoutManager(this, 3))
|
|
|
- problemPicRecycler.adapter = pictureAdapter
|
|
|
+// beans.clear()
|
|
|
+// val photo = Photos()
|
|
|
+// photo.itemType = 1
|
|
|
+// beans.add(photo)
|
|
|
+// if (point != null) {
|
|
|
+// beans.addAll(point.data.photos)
|
|
|
+// }
|
|
|
+// pictureAdapter = PictureAdapter(this, beans, "", false, 0, 85)
|
|
|
+// pictureAdapter.setOnPicAdd { addPic() }
|
|
|
+// problemPicRecycler.setLayoutManager(GridLayoutManager(this, 3))
|
|
|
+// problemPicRecycler.adapter = pictureAdapter
|
|
|
}
|
|
|
|
|
|
private fun skipRelationship(code: String, type: String) {
|
|
@@ -1410,23 +1138,19 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
graphyVM = GraphyVM(this.application, BaseViewModelInterface { name, params ->
|
|
|
when (name) {
|
|
|
GraphyVM.MAP_LOAD -> {
|
|
|
- val floorDate = FloorData()
|
|
|
val floorOfflineData = gson.fromJson(params.toString(), FloorData::class.java)
|
|
|
- floorDate.entityList.addAll(floorOfflineData.entityList)
|
|
|
- scene.loadData(floorDate)
|
|
|
+ scene.loadData(floorOfflineData)
|
|
|
/** 适应屏幕大小 */
|
|
|
graphyView.fitSceneToView()
|
|
|
-// graphyView.defaultScale = graphyView.scale
|
|
|
/** 限定移动范围不超出屏幕 */
|
|
|
-// graphyView.moveRange()
|
|
|
- graphyView.post {
|
|
|
- Log.e("viewW", graphyView.width.toString())
|
|
|
+// graphyView.post {
|
|
|
+// Log.e("viewW", graphyView.width.toString())
|
|
|
// val mapItem = BaseMapItem(this@GraphyActivity, null)
|
|
|
// mapItem.zOrder = 1000000f
|
|
|
// mapItem.isVisible = true
|
|
|
// scene.addItem(mapItem)
|
|
|
- mapItem = BaseMapItem(this@GraphyActivity, null)
|
|
|
- }
|
|
|
+// mapItem = BaseMapItem(this@GraphyActivity, null)
|
|
|
+// }
|
|
|
}
|
|
|
/** 查询空间和任务 */
|
|
|
GraphyVM.SPACE_JOB -> {
|
|
@@ -1471,118 +1195,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
scene.addItem(item)
|
|
|
}
|
|
|
}
|
|
|
- if (from.equals("scene")) {
|
|
|
- graphyVM.floorPipe()
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /** 添加空间核查问题 */
|
|
|
- GraphyVM.ADD_PROBLEM -> {
|
|
|
- problemDesc.setText("")
|
|
|
- Toast.makeText(this, "记录成功", Toast.LENGTH_SHORT).show()
|
|
|
- graphyVM.getProblem(scene.choseSpace)
|
|
|
- graphyVM.getSpaceJob(from, scene.spaceList)
|
|
|
- }
|
|
|
-
|
|
|
- /** 查询空间核查问题 */
|
|
|
- GraphyVM.GET_PROBLEM -> {
|
|
|
- graphyHelper.removeAllPoint()
|
|
|
- var list = params as ArrayList<ProblemsModel>
|
|
|
- val mPoints = ArrayList<PointF>()
|
|
|
- val point1 = PointF()
|
|
|
- point1.set(scene.choseSpace!!.minX - 1000, scene.choseSpace!!.maxY + 1000)
|
|
|
- val point2 = PointF()
|
|
|
- point2.set(scene.choseSpace!!.maxX + 1000, scene.choseSpace!!.maxY + 1000)
|
|
|
- val point3 = PointF()
|
|
|
- point3.set(scene.choseSpace!!.minX - 1000, scene.choseSpace!!.minY - 1000)
|
|
|
- val point4 = PointF()
|
|
|
- point4.set(scene.choseSpace!!.maxX + 1000, scene.choseSpace!!.minY - 1000)
|
|
|
- mPoints.add(point1)
|
|
|
- mPoints.add(point2)
|
|
|
- mPoints.add(point4)
|
|
|
- mPoints.add(point3)
|
|
|
-
|
|
|
- for (model in list) {
|
|
|
- if (model.geomType.equals("point")) {
|
|
|
- var position = gson.fromJson(model.position, Position::class.java)
|
|
|
-// val polygonContainsPoint = Lasso.isPolygonContainsPoint(
|
|
|
-// mPoints,
|
|
|
-// android.graphics.Point(
|
|
|
-// position.x.toFloat().toInt(),
|
|
|
-// position.y.toFloat().toInt()
|
|
|
-// )
|
|
|
-// )
|
|
|
-// if (polygonContainsPoint) {
|
|
|
- val point = Point()
|
|
|
- val f = PointF()
|
|
|
- f.x = position.x.toFloat()
|
|
|
- f.y = position.y.toFloat()
|
|
|
- point.points.add(f)
|
|
|
- point.mX = position.x.toFloat()
|
|
|
- point.mY = position.y.toFloat()
|
|
|
- point.id = model.id
|
|
|
- point.content = model.content
|
|
|
- point.photos = model.photos
|
|
|
- val addPoint = graphyHelper.addPoint(point)
|
|
|
- addPoint.setOnActionMove(object : PointItem.ActionMove {
|
|
|
- override fun onActionMove(event: MotionEvent) {
|
|
|
- }
|
|
|
-
|
|
|
- })
|
|
|
- } else if (model.geomType.equals("line")) {
|
|
|
- val geomList = gson.fromJson<List<PointF>>(
|
|
|
- model.position,
|
|
|
- object : TypeToken<List<PointF?>?>() {}.type
|
|
|
- )
|
|
|
- val point = Point()
|
|
|
- point.points.addAll(geomList)
|
|
|
- point.id = model.id
|
|
|
- point.content = model.content
|
|
|
- point.photos = model.photos
|
|
|
- val addPoint = graphyHelper.addPoint(point)
|
|
|
- addPoint.setOnActionMove(object : PointItem.ActionMove {
|
|
|
- override fun onActionMove(event: MotionEvent) {
|
|
|
- }
|
|
|
-
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
-// }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /** 关闭空间核查问题 */
|
|
|
- GraphyVM.CLOSE_PROBLEM -> {
|
|
|
- graphyVM.getProblem(scene.choseSpace)
|
|
|
- }
|
|
|
-
|
|
|
- /** 绑定二维码 */
|
|
|
- GraphyVM.BIND_QECODE -> {
|
|
|
- Toast.makeText(this, "绑定成功", Toast.LENGTH_SHORT).show()
|
|
|
- scene.type = "normal"
|
|
|
- qrcodeLl.visibility = View.GONE
|
|
|
- qrcodeLocation.setText("(0,0)")
|
|
|
- spaceStructure.visibility = View.VISIBLE
|
|
|
- scene.removeItem(scene.item!!)
|
|
|
- scene.qrcodeItemList.clear()
|
|
|
- graphyVM.getQrcode(scene.choseSpace)
|
|
|
- }
|
|
|
-
|
|
|
- /** 查询对象绑定的二维码 */
|
|
|
- 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()
|
|
|
- var position = gson.fromJson(model.position, Position::class.java)
|
|
|
- point.mX = position.x.toFloat()
|
|
|
- point.mY = position.y.toFloat()
|
|
|
-
|
|
|
- graphyHelper.addQrcode(this, point)
|
|
|
- }
|
|
|
+ graphyVM.floorPipe()
|
|
|
}
|
|
|
|
|
|
/** 设置空间的任务状态(新建和修改) */
|
|
@@ -1733,29 +1346,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
graphyVM.getSpaceJob(from, scene.spaceList)
|
|
|
}
|
|
|
|
|
|
- private fun initSpaceState(space: TunableSpace, archState: Int, equipState: Int) {
|
|
|
- //space 结构核查
|
|
|
- //survey 空间勘测
|
|
|
- if ("space".equals(from)) {
|
|
|
- if (archState == 1) {
|
|
|
- space.jobStatus = "01";
|
|
|
- } else if (archState == 2) {
|
|
|
- space.jobStatus = "03";
|
|
|
- }
|
|
|
- } else if ("survey".equals(from)) {
|
|
|
- if (archState == 1) {
|
|
|
- space.jobStatus = "01";
|
|
|
- } else if (archState == 2) {
|
|
|
- if (equipState == 1) {
|
|
|
- space.jobStatus = "04"
|
|
|
- } else if (equipState == 2) {
|
|
|
- space.jobStatus = "05"
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
val graphyHelper: GraphyHelper = GraphyHelper(scene, this)
|
|
|
|
|
|
/**
|
|
@@ -1882,14 +1472,11 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
graphyHelper.removeAllEquip()
|
|
|
|
|
|
|
|
|
- spaceStructure.visibility = View.GONE
|
|
|
- doneSpaceStructure.visibility = View.GONE
|
|
|
quesDetail.visibility = View.GONE
|
|
|
drawLl.visibility = View.GONE
|
|
|
equipLl.visibility = View.GONE
|
|
|
|
|
|
scene.type = "normal"
|
|
|
- modelCheckBox.isChecked = false
|
|
|
equipLocation.setText("")
|
|
|
scene.point = Point()
|
|
|
}
|
|
@@ -1898,8 +1485,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
* 显示点位信息框
|
|
|
*/
|
|
|
private fun showDotDetail(point: PointItem?) {
|
|
|
- spaceStructure.visibility = View.GONE
|
|
|
- doneSpaceStructure.visibility = View.GONE
|
|
|
// quesDetail.visibility = View.VISIBLE
|
|
|
// quesTv.setText(
|
|
|
// "这是描述问题的文本,左侧是拍照图片。" +
|
|
@@ -1912,80 +1497,12 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
//// Toast.makeText(this@GraphyActivity, InstaCameraManager.getInstance(). + "======", Toast.LENGTH_LONG).show()
|
|
|
// }
|
|
|
|
|
|
- problemLl.visibility = View.VISIBLE
|
|
|
- if (point != null) {
|
|
|
- problemDesc.setText(point.data.content)
|
|
|
- } else {
|
|
|
- problemDesc.setText("")
|
|
|
- }
|
|
|
- initProblemPicture(point)
|
|
|
-
|
|
|
- /** 问题已解决按钮 */
|
|
|
- problemDone.setOnClickListener {
|
|
|
- if (point != null) {
|
|
|
- graphyVM.closeProblem(point, scene.choseSpace)
|
|
|
- spaceStructure.visibility = View.VISIBLE
|
|
|
- quesDetail.visibility = View.GONE
|
|
|
- problemLl.visibility = View.GONE
|
|
|
- scene.pointItemList.remove(point)
|
|
|
- scene.removeItem(point)
|
|
|
- if (scene.pointItemList.isEmpty()) {
|
|
|
- for (item in scene.tunableSpaceList) {
|
|
|
- scene.removeItem(item)
|
|
|
- }
|
|
|
- }
|
|
|
- quesDetail.visibility = View.GONE
|
|
|
- graphyVM.getSpaceJob(from, scene.spaceList)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /** 问题-关闭 */
|
|
|
- problemClose.setOnClickListener {
|
|
|
- if (addPoint != null) {
|
|
|
- scene.removeItem(addPoint!!)
|
|
|
- scene.pointItemList.remove(addPoint)
|
|
|
- }
|
|
|
- for (item in scene.drawingPipeItemList) {
|
|
|
- scene.removeItem(item)
|
|
|
- }
|
|
|
- scene.drawingPipeItemList.clear()
|
|
|
- scene.pipeLineList.clear()
|
|
|
- scene.type = "normal"
|
|
|
- problemLl.visibility = View.GONE
|
|
|
- spaceStructure.visibility = View.VISIBLE
|
|
|
- }
|
|
|
-
|
|
|
- /** 问题-保存 */
|
|
|
- problemSave.setOnClickListener {
|
|
|
- if (pointRb.isChecked && (point == null || point.data.mX == 0f) && ProblemDot.mX == 0f) {
|
|
|
- ToastUtils.showMyToast("请扎点")
|
|
|
- return@setOnClickListener
|
|
|
- }
|
|
|
- if (point == null) {
|
|
|
- if (lineRb.isChecked && (CommonUtils.IsNull(scene.drawingPipeItemList) || scene.drawingPipeItemList.size == 1)) {
|
|
|
- ToastUtils.showMyToast("请扎点")
|
|
|
- return@setOnClickListener
|
|
|
- }
|
|
|
- }
|
|
|
- scene.choseSpace?.let {
|
|
|
- graphyVM.addProblem(
|
|
|
- point,
|
|
|
- beans,
|
|
|
- problemDesc.text.toString(),
|
|
|
- it,
|
|
|
- ProblemDot.mX,
|
|
|
- ProblemDot.mY,
|
|
|
- scene.drawingPipeItemList, lineRb.isChecked
|
|
|
- )
|
|
|
- }
|
|
|
- for (item in scene.drawingPipeItemList) {
|
|
|
- scene.removeItem(item)
|
|
|
- }
|
|
|
- scene.pipeLineList.clear()
|
|
|
- scene.drawingPipeItemList.clear()
|
|
|
- scene.type = "normal"
|
|
|
- problemLl.visibility = View.GONE
|
|
|
- }
|
|
|
+// if (point != null) {
|
|
|
+// problemDesc.setText(point.data.content)
|
|
|
+// } else {
|
|
|
+// problemDesc.setText("")
|
|
|
+// }
|
|
|
+// initProblemPicture(point)
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1994,23 +1511,6 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
|
super.onActivityResult(requestCode, resultCode, data)
|
|
|
when (requestCode) {
|
|
|
- /** 扫描二维码回传 */
|
|
|
- REQUEST_CODE_SCAN ->
|
|
|
- if (resultCode == RESULT_OK) {
|
|
|
- if (data != null) {
|
|
|
- //获取扫描结果
|
|
|
- val bundle = data.extras
|
|
|
- val result = bundle?.getString(CaptureActivity.EXTRA_STRING)
|
|
|
- Log.e("tag", "扫描结果:$result")
|
|
|
- graphyVM.bindQrcode(
|
|
|
- scene.choseSpace,
|
|
|
- result,
|
|
|
- scene.point,
|
|
|
- qrcodeEdit.text.toString()
|
|
|
- )
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
/** 添加设备成功 */
|
|
|
REQUEST_CODE_EQUIP -> {
|
|
|
if (resultCode == RESULT_OK) {
|