|
@@ -40,6 +40,7 @@ import android.webkit.WebViewClient
|
|
import android.widget.TextView
|
|
import android.widget.TextView
|
|
import android.widget.Toast
|
|
import android.widget.Toast
|
|
import android.widget.*
|
|
import android.widget.*
|
|
|
|
+import androidx.appcompat.widget.AppCompatEditText
|
|
import androidx.appcompat.widget.LinearLayoutCompat
|
|
import androidx.appcompat.widget.LinearLayoutCompat
|
|
import androidx.recyclerview.widget.GridLayoutManager
|
|
import androidx.recyclerview.widget.GridLayoutManager
|
|
import androidx.recyclerview.widget.LinearLayoutManager
|
|
import androidx.recyclerview.widget.LinearLayoutManager
|
|
@@ -56,6 +57,7 @@ import com.arashivision.sdkcamera.camera.InstaCameraManager
|
|
import com.arashivision.sdkcamera.camera.callback.ICameraChangedCallback
|
|
import com.arashivision.sdkcamera.camera.callback.ICameraChangedCallback
|
|
import com.arashivision.sdkcamera.camera.callback.ICaptureStatusListener
|
|
import com.arashivision.sdkcamera.camera.callback.ICaptureStatusListener
|
|
import com.bumptech.glide.Glide
|
|
import com.bumptech.glide.Glide
|
|
|
|
+import com.framework.mvvm.mv.AdmViewModel
|
|
import com.google.gson.Gson
|
|
import com.google.gson.Gson
|
|
import com.lzy.okgo.OkGo
|
|
import com.lzy.okgo.OkGo
|
|
import com.lzy.okgo.callback.FileCallback
|
|
import com.lzy.okgo.callback.FileCallback
|
|
@@ -86,6 +88,10 @@ import org.jetbrains.anko.textColor
|
|
import org.jetbrains.anko.uiThread
|
|
import org.jetbrains.anko.uiThread
|
|
import org.json.JSONException
|
|
import org.json.JSONException
|
|
import org.json.JSONObject
|
|
import org.json.JSONObject
|
|
|
|
+import org.kodein.di.DI
|
|
|
|
+import org.kodein.di.DIAware
|
|
|
|
+import org.kodein.di.android.closestDI
|
|
|
|
+import org.kodein.di.android.x.viewmodel.viewModel
|
|
import java.io.*
|
|
import java.io.*
|
|
import java.text.SimpleDateFormat
|
|
import java.text.SimpleDateFormat
|
|
import java.util.*
|
|
import java.util.*
|
|
@@ -94,7 +100,7 @@ import kotlin.collections.ArrayList
|
|
|
|
|
|
|
|
|
|
@Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
|
|
@Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
|
|
-class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCallback {
|
|
|
|
|
|
+class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCallback, DIAware {
|
|
companion object {
|
|
companion object {
|
|
private val TAG = GraphyActivity::class.java.name
|
|
private val TAG = GraphyActivity::class.java.name
|
|
|
|
|
|
@@ -111,6 +117,10 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
var isAddBaseMap: Boolean = false
|
|
var isAddBaseMap: Boolean = false
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ override val di: DI by closestDI()
|
|
|
|
+
|
|
|
|
+ private val mVm: AdmViewModel by viewModel()
|
|
|
|
+
|
|
//选择图片
|
|
//选择图片
|
|
private val REQUEST_CODE_PIC = 0X102
|
|
private val REQUEST_CODE_PIC = 0X102
|
|
|
|
|
|
@@ -131,6 +141,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
|
|
|
/** 楼层Id */
|
|
/** 楼层Id */
|
|
private lateinit var floorId: String
|
|
private lateinit var floorId: String
|
|
|
|
+ private lateinit var projectId: String
|
|
|
|
|
|
/** 楼层地图 */
|
|
/** 楼层地图 */
|
|
private lateinit var floorMap: String
|
|
private lateinit var floorMap: String
|
|
@@ -234,6 +245,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
private lateinit var problemSave: TextView
|
|
private lateinit var problemSave: TextView
|
|
private lateinit var equipDetail: TextView
|
|
private lateinit var equipDetail: TextView
|
|
private lateinit var equipDelete: TextView
|
|
private lateinit var equipDelete: TextView
|
|
|
|
+ private lateinit var problemDesc: AppCompatEditText
|
|
|
|
|
|
/**
|
|
/**
|
|
* 创建Activity时的回调函数
|
|
* 创建Activity时的回调函数
|
|
@@ -411,6 +423,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
problemSave = findViewById(R.id.problemSave)
|
|
problemSave = findViewById(R.id.problemSave)
|
|
equipDetail = findViewById(R.id.equipDetail)
|
|
equipDetail = findViewById(R.id.equipDetail)
|
|
equipDelete = findViewById(R.id.equipDelete)
|
|
equipDelete = findViewById(R.id.equipDelete)
|
|
|
|
+ problemDesc = findViewById(R.id.problemDesc)
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -423,6 +436,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
floorId = floor.getString("floorId")!!
|
|
floorId = floor.getString("floorId")!!
|
|
floorMap = floor.getString("floorMap")!!
|
|
floorMap = floor.getString("floorMap")!!
|
|
from = floor.getString("from")!!
|
|
from = floor.getString("from")!!
|
|
|
|
+ projectId = floor.getString("projectId")!!
|
|
}
|
|
}
|
|
|
|
|
|
private fun addPic() {
|
|
private fun addPic() {
|
|
@@ -468,7 +482,8 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
e.printStackTrace()
|
|
e.printStackTrace()
|
|
}
|
|
}
|
|
if ("success" == resultString) {
|
|
if ("success" == resultString) {
|
|
- val photos = Photos()
|
|
|
|
|
|
+ val photos =
|
|
|
|
+ Photos()
|
|
photos.itemType = 0
|
|
photos.itemType = 0
|
|
photos.path = path
|
|
photos.path = path
|
|
photos.key = key
|
|
photos.key = key
|
|
@@ -477,7 +492,8 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- val photos = Photos()
|
|
|
|
|
|
+ val photos =
|
|
|
|
+ Photos()
|
|
photos.itemType = 0
|
|
photos.itemType = 0
|
|
photos.path = path
|
|
photos.path = path
|
|
photos.key = key
|
|
photos.key = key
|
|
@@ -789,9 +805,41 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
spaceStructure.visibility = View.VISIBLE
|
|
spaceStructure.visibility = View.VISIBLE
|
|
doneSpaceStructure.visibility = View.GONE
|
|
doneSpaceStructure.visibility = View.GONE
|
|
graphyVM.getProblem(scene.choseSpace)
|
|
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)
|
|
|
|
+ intent.putExtra("floor", bundle)
|
|
|
|
+ startActivity(intent)
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
doneSpaceStructure.visibility = View.VISIBLE
|
|
doneSpaceStructure.visibility = View.VISIBLE
|
|
spaceStructure.visibility = View.GONE
|
|
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)
|
|
|
|
+ intent.putExtra("floor", bundle)
|
|
|
|
+ startActivity(intent)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
spaceName.text = scene.choseSpace!!.data.localName
|
|
spaceName.text = scene.choseSpace!!.data.localName
|
|
spaceName3.text = scene.choseSpace!!.data.localName
|
|
spaceName3.text = scene.choseSpace!!.data.localName
|
|
@@ -953,9 +1001,12 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
/** 打点按钮 */
|
|
/** 打点按钮 */
|
|
addDot.setOnClickListener {
|
|
addDot.setOnClickListener {
|
|
scene.type = "dot"
|
|
scene.type = "dot"
|
|
|
|
+ ProblemDot.mX = 0f
|
|
|
|
+ ProblemDot.mY = 0f
|
|
spaceStructure.visibility = View.GONE
|
|
spaceStructure.visibility = View.GONE
|
|
problemLl.visibility = View.VISIBLE
|
|
problemLl.visibility = View.VISIBLE
|
|
- initProblemPicture()
|
|
|
|
|
|
+ showDotDetail(null)
|
|
|
|
+ initProblemPicture(null)
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1076,38 +1127,16 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
eqEqVv.setOnClickListener { skipRelationship("eq_eq_vv", "eq_eq") }
|
|
eqEqVv.setOnClickListener { skipRelationship("eq_eq_vv", "eq_eq") }
|
|
/** 连接 */
|
|
/** 连接 */
|
|
eqPipeCnct.setOnClickListener { skipRelationship("eq_pipe_cnct", "eq_pipe") }
|
|
eqPipeCnct.setOnClickListener { skipRelationship("eq_pipe_cnct", "eq_pipe") }
|
|
- /** 跳转空间详情 */
|
|
|
|
- addSpaceDetail.setOnClickListener { startActivity<SpaceDetailActivity>() }
|
|
|
|
- /** 跳转空间详情 */
|
|
|
|
- addSpaceDetail2.setOnClickListener { startActivity<SpaceDetailActivity>() }
|
|
|
|
- /** 重置空间状态 */
|
|
|
|
- resetSpaceState.setOnClickListener { }
|
|
|
|
- /** 问题-关闭 */
|
|
|
|
- problemClose.setOnClickListener {
|
|
|
|
- if (addPoint != null) {
|
|
|
|
- scene.removeItem(addPoint!!)
|
|
|
|
- scene.pointItemList.remove(addPoint)
|
|
|
|
- }
|
|
|
|
- scene.type = "normal"
|
|
|
|
- problemLl.visibility = View.GONE
|
|
|
|
- }
|
|
|
|
- /** 问题-已解决 */
|
|
|
|
- problemDone.setOnClickListener {
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- /** 问题-保存 */
|
|
|
|
- problemSave.setOnClickListener {
|
|
|
|
- scene.choseSpace?.let { graphyVM.addProblem(it, ProblemDot.mX, ProblemDot.mY) }
|
|
|
|
- scene.type = "normal"
|
|
|
|
- problemLl.visibility = View.GONE
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- private fun initProblemPicture() {
|
|
|
|
|
|
+ private fun initProblemPicture(point: PointItem?) {
|
|
beans.clear()
|
|
beans.clear()
|
|
val photo = Photos()
|
|
val photo = Photos()
|
|
photo.itemType = 1
|
|
photo.itemType = 1
|
|
beans.add(photo)
|
|
beans.add(photo)
|
|
|
|
+ if (point != null) {
|
|
|
|
+ beans.addAll(point.data.photos)
|
|
|
|
+ }
|
|
pictureAdapter = PictureAdapter(this, beans, "", false, 0, 85)
|
|
pictureAdapter = PictureAdapter(this, beans, "", false, 0, 85)
|
|
pictureAdapter.setOnPicAdd { addPic() }
|
|
pictureAdapter.setOnPicAdd { addPic() }
|
|
problemPicRecycler.setLayoutManager(GridLayoutManager(this, 3))
|
|
problemPicRecycler.setLayoutManager(GridLayoutManager(this, 3))
|
|
@@ -1128,7 +1157,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
* 初始化viewModel
|
|
* 初始化viewModel
|
|
*/
|
|
*/
|
|
private fun initViewModel() {
|
|
private fun initViewModel() {
|
|
- graphyVM = GraphyVM(BaseViewModelInterface { name, params ->
|
|
|
|
|
|
+ graphyVM = GraphyVM(this.application, BaseViewModelInterface { name, params ->
|
|
when (name) {
|
|
when (name) {
|
|
/** 查询空间和任务 */
|
|
/** 查询空间和任务 */
|
|
GraphyVM.SPACE_JOB -> {
|
|
GraphyVM.SPACE_JOB -> {
|
|
@@ -1137,9 +1166,10 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
}
|
|
}
|
|
scene.tunableSpaceList.clear()
|
|
scene.tunableSpaceList.clear()
|
|
|
|
|
|
|
|
+// val list = params as (List<SpaceEntity>)
|
|
val list = params as (List<SpaceJobModel>)
|
|
val list = params as (List<SpaceJobModel>)
|
|
for (model in list) {
|
|
for (model in list) {
|
|
- if (!model.outline.isEmpty()) {
|
|
|
|
|
|
+ if (!model.outline!!.isEmpty()) {
|
|
val space = Space()
|
|
val space = Space()
|
|
space.outLine = model.outline.get(0)
|
|
space.outLine = model.outline.get(0)
|
|
space.name = model.name
|
|
space.name = model.name
|
|
@@ -1153,6 +1183,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
tunableSpace.apply {
|
|
tunableSpace.apply {
|
|
outLine = model.outline.get(0)
|
|
outLine = model.outline.get(0)
|
|
this.name = model.name
|
|
this.name = model.name
|
|
|
|
+// initSpaceState(tunableSpace, model.archState!!, model.equipState!!)
|
|
jobStatus = model.job
|
|
jobStatus = model.job
|
|
id = model.id
|
|
id = model.id
|
|
localName = model.localName
|
|
localName = model.localName
|
|
@@ -1177,6 +1208,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
|
|
|
/** 添加空间核查问题 */
|
|
/** 添加空间核查问题 */
|
|
GraphyVM.ADD_PROBLEM -> {
|
|
GraphyVM.ADD_PROBLEM -> {
|
|
|
|
+ problemDesc.setText("")
|
|
Toast.makeText(this, "记录成功", Toast.LENGTH_SHORT).show()
|
|
Toast.makeText(this, "记录成功", Toast.LENGTH_SHORT).show()
|
|
graphyVM.getProblem(scene.choseSpace)
|
|
graphyVM.getProblem(scene.choseSpace)
|
|
graphyVM.getSpaceJob(from)
|
|
graphyVM.getSpaceJob(from)
|
|
@@ -1214,6 +1246,8 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
point.mX = position.x.toFloat()
|
|
point.mX = position.x.toFloat()
|
|
point.mY = position.y.toFloat()
|
|
point.mY = position.y.toFloat()
|
|
point.id = model.id
|
|
point.id = model.id
|
|
|
|
+ point.content = model.content
|
|
|
|
+ point.photos = model.photos
|
|
val addPoint = graphyHelper.addPoint(point)
|
|
val addPoint = graphyHelper.addPoint(point)
|
|
addPoint.setOnActionMove(object : PointItem.ActionMove {
|
|
addPoint.setOnActionMove(object : PointItem.ActionMove {
|
|
override fun onActionMove(event: MotionEvent) {
|
|
override fun onActionMove(event: MotionEvent) {
|
|
@@ -1259,7 +1293,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
|
|
|
|
/** 设置空间的任务状态(新建和修改) */
|
|
/** 设置空间的任务状态(新建和修改) */
|
|
GraphyVM.SET_JOB -> {
|
|
GraphyVM.SET_JOB -> {
|
|
- Toast.makeText(this, "核查成功", Toast.LENGTH_SHORT).show()
|
|
|
|
|
|
+ Toast.makeText(this, "保存成功", Toast.LENGTH_SHORT).show()
|
|
refreshAll()
|
|
refreshAll()
|
|
graphyVM.getSpaceJob(from)
|
|
graphyVM.getSpaceJob(from)
|
|
}
|
|
}
|
|
@@ -1379,10 +1413,33 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
refreshPipe(spacePipeModel)
|
|
refreshPipe(spacePipeModel)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }, this, buildingId, floorId)
|
|
|
|
|
|
+ }, this, buildingId, floorId, projectId)
|
|
graphyVM.getSpaceJob(from)
|
|
graphyVM.getSpaceJob(from)
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ 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)
|
|
val graphyHelper: GraphyHelper = GraphyHelper(scene, this)
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1525,7 +1582,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
/**
|
|
/**
|
|
* 显示点位信息框
|
|
* 显示点位信息框
|
|
*/
|
|
*/
|
|
- private fun showDotDetail(point: PointItem) {
|
|
|
|
|
|
+ private fun showDotDetail(point: PointItem?) {
|
|
spaceStructure.visibility = View.GONE
|
|
spaceStructure.visibility = View.GONE
|
|
doneSpaceStructure.visibility = View.GONE
|
|
doneSpaceStructure.visibility = View.GONE
|
|
// quesDetail.visibility = View.VISIBLE
|
|
// quesDetail.visibility = View.VISIBLE
|
|
@@ -1541,23 +1598,59 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
|
|
// }
|
|
// }
|
|
|
|
|
|
problemLl.visibility = View.VISIBLE
|
|
problemLl.visibility = View.VISIBLE
|
|
- initProblemPicture()
|
|
|
|
|
|
+ if (point != null) {
|
|
|
|
+ problemDesc.setText(point.data.content)
|
|
|
|
+ }
|
|
|
|
+ initProblemPicture(point)
|
|
|
|
|
|
/** 问题已解决按钮 */
|
|
/** 问题已解决按钮 */
|
|
problemDone.setOnClickListener {
|
|
problemDone.setOnClickListener {
|
|
- 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)
|
|
|
|
|
|
+ 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)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /** 问题-关闭 */
|
|
|
|
+ problemClose.setOnClickListener {
|
|
|
|
+ if (addPoint != null) {
|
|
|
|
+ scene.removeItem(addPoint!!)
|
|
|
|
+ scene.pointItemList.remove(addPoint)
|
|
|
|
+ }
|
|
|
|
+ scene.type = "normal"
|
|
|
|
+ problemLl.visibility = View.GONE
|
|
|
|
+ spaceStructure.visibility = View.VISIBLE
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /** 问题-保存 */
|
|
|
|
+ problemSave.setOnClickListener {
|
|
|
|
+ if ((point == null || point.data.mX == 0f) && ProblemDot.mX == 0f) {
|
|
|
|
+ ToastUtils.showMyToast("请扎点")
|
|
|
|
+ return@setOnClickListener
|
|
}
|
|
}
|
|
- quesDetail.visibility = View.GONE
|
|
|
|
- graphyVM.getSpaceJob(from)
|
|
|
|
|
|
+ scene.choseSpace?.let {
|
|
|
|
+ graphyVM.addProblem(
|
|
|
|
+ point,
|
|
|
|
+ beans,
|
|
|
|
+ problemDesc.text.toString(),
|
|
|
|
+ it,
|
|
|
|
+ ProblemDot.mX,
|
|
|
|
+ ProblemDot.mY
|
|
|
|
+ )
|
|
|
|
+ }
|
|
|
|
+ scene.type = "normal"
|
|
|
|
+ problemLl.visibility = View.GONE
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|