|
@@ -5,26 +5,28 @@ import android.graphics.PointF
|
|
|
import android.text.TextUtils
|
|
|
import androidx.lifecycle.viewModelScope
|
|
|
import cn.sagacloud.android.cadengine.items.PointItem
|
|
|
+import cn.sagacloud.android.cadengine.items.SpaceItem
|
|
|
import cn.sagacloud.android.cadengine.items.TunableSpaceItem
|
|
|
import cn.sagacloud.android.cadengine.types.Photos
|
|
|
import cn.sagacloud.android.cadengine.types.Point
|
|
|
import cn.sagacloud.android.cadengine.types.PointZ
|
|
|
-import com.arashivision.arvbmg.shandowclone.TrackTarget
|
|
|
+import cn.sagacloud.android.cadengine.types.TunableSpace
|
|
|
import com.framework.mvvm.model.db.entity.*
|
|
|
import com.framework.mvvm.model.repository.AdmRepository
|
|
|
import com.sybotan.android.demo.bean.result.ProblemsModel
|
|
|
import com.google.gson.Gson
|
|
|
+import com.google.gson.JsonObject
|
|
|
import com.google.gson.reflect.TypeToken
|
|
|
import com.sybotan.android.demo.activities.BaseActivity
|
|
|
import com.sybotan.android.demo.bean.request.*
|
|
|
import com.sybotan.android.demo.bean.result.*
|
|
|
import com.sybotan.android.demo.bean.result.Position
|
|
|
import com.sybotan.android.demo.bean.result.Z
|
|
|
-import com.sybotan.android.demo.entitiies.Info
|
|
|
import com.sybotan.android.demo.retrofit.BaseObserver
|
|
|
import com.sybotan.android.demo.retrofit.BaseViewModelInterface
|
|
|
import com.sybotan.android.demo.retrofit.RetrofitFactory
|
|
|
import kotlinx.coroutines.launch
|
|
|
+import org.json.JSONObject
|
|
|
import org.kodein.di.DI
|
|
|
import org.kodein.di.DIAware
|
|
|
import org.kodein.di.android.x.closestDI
|
|
@@ -52,23 +54,65 @@ class GraphyVM(
|
|
|
/**
|
|
|
* 查询空间和任务
|
|
|
*/
|
|
|
- fun getSpaceJob(from: String) {
|
|
|
- val bean = ReqSpaceJob()
|
|
|
- bean.buildingId = buildingId
|
|
|
- bean.floorId = floorId
|
|
|
- if ("space" == from) {
|
|
|
- bean.jobStatus.add("01")
|
|
|
- bean.jobStatus.add("02")
|
|
|
- bean.jobStatus.add("03")
|
|
|
- } else {
|
|
|
- bean.jobStatus.add("04")
|
|
|
- }
|
|
|
- val observable = RetrofitFactory.getInstance().getSpaceJob(getRequestBody(bean))
|
|
|
- sendRequest(observable, object : BaseObserver<List<SpaceJobModel>>(mActivity, this) {
|
|
|
- override fun onSuccess(spaceJobModels: List<SpaceJobModel>) {
|
|
|
- mEmitter.SendDircetive(SPACE_JOB, spaceJobModels)
|
|
|
+ fun getSpaceJob(from: String, spaceList: ArrayList<SpaceItem>) {
|
|
|
+ viewModelScope.launch {
|
|
|
+ var spaceList: ArrayList<SpaceEntity> = ArrayList()
|
|
|
+ if ("space".equals(from)) {
|
|
|
+ val spaceByArchState1 = repo.getSpaceByArchStateFloorId(floorId, "1")
|
|
|
+ val spaceByArchState2 = repo.getSpaceByArchStateFloorId(floorId, "2")
|
|
|
+ spaceList.addAll(spaceByArchState1)
|
|
|
+ spaceList.addAll(spaceByArchState2)
|
|
|
+ } else {
|
|
|
+ val spaceByEquipState1 = repo.getSpaceByEquipStateFloorId(floorId, "1")
|
|
|
+ val spaceByEquipState2 = repo.getSpaceByEquipStateFloorId(floorId, "2")
|
|
|
+ spaceList.addAll(spaceByEquipState1)
|
|
|
+ spaceList.addAll(spaceByEquipState2)
|
|
|
}
|
|
|
- }, true)
|
|
|
+ var spaceJobList = ArrayList<SpaceJobModel>()
|
|
|
+ for (spaceEntity in spaceList) {
|
|
|
+ var spaceJobModel = SpaceJobModel()
|
|
|
+ val objectEntity = repo.getObject(spaceEntity.spaceId)
|
|
|
+ spaceJobModel.buildingId = buildingId
|
|
|
+ spaceJobModel.id = spaceEntity.spaceId
|
|
|
+ spaceJobModel.localName = objectEntity.localName
|
|
|
+ spaceJobModel.name = objectEntity.name
|
|
|
+ spaceJobModel.projectId = projectId
|
|
|
+ if (spaceEntity.archState == 1) {
|
|
|
+ spaceJobModel.job = "01"
|
|
|
+ } else if (spaceEntity.archState == 2 && spaceEntity.equipState == 1) {
|
|
|
+ if (from.equals("space")) {
|
|
|
+ spaceJobModel.job = "03"
|
|
|
+ } else {
|
|
|
+ spaceJobModel.job = "04"
|
|
|
+ }
|
|
|
+ } else if (spaceEntity.archState == 2 && spaceEntity.equipState == 2) {
|
|
|
+ spaceJobModel.job = "05"
|
|
|
+ }
|
|
|
+ val strInfo = gson.fromJson(objectEntity.strInfos, StrInfos::class.java)
|
|
|
+
|
|
|
+ spaceJobModel.outline = strInfo.outline
|
|
|
+ spaceJobModel.objectEntity = objectEntity
|
|
|
+ spaceJobList.add(spaceJobModel)
|
|
|
+ }
|
|
|
+ mEmitter.SendDircetive(SPACE_JOB, spaceJobList)
|
|
|
+
|
|
|
+ }
|
|
|
+// val bean = ReqSpaceJob()
|
|
|
+// bean.buildingId = buildingId
|
|
|
+// bean.floorId = floorId
|
|
|
+// if ("space" == from) {
|
|
|
+// bean.jobStatus.add("01")
|
|
|
+// bean.jobStatus.add("02")
|
|
|
+// bean.jobStatus.add("03")
|
|
|
+// } else {
|
|
|
+// bean.jobStatus.add("04")
|
|
|
+// }
|
|
|
+// val observable = RetrofitFactory.getInstance().getSpaceJob(getRequestBody(bean))
|
|
|
+// sendRequest(observable, object : BaseObserver<List<SpaceJobModel>>(mActivity, this) {
|
|
|
+// override fun onSuccess(spaceJobModels: List<SpaceJobModel>) {
|
|
|
+// mEmitter.SendDircetive(SPACE_JOB, spaceJobModels)
|
|
|
+// }
|
|
|
+// }, true)
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -338,18 +382,34 @@ class GraphyVM(
|
|
|
* @param toString 数字化交付编码
|
|
|
*/
|
|
|
fun setJob(choseSpace: TunableSpaceItem?, jobStatus: String) {
|
|
|
- val bean = ReqSetJob()
|
|
|
- bean.buildingId = buildingId
|
|
|
- bean.floorId = floorId
|
|
|
- bean.spaceId.add(choseSpace!!.data.id)
|
|
|
- bean.jobStatus = jobStatus
|
|
|
- bean.spaceCode = "test"
|
|
|
- val observable = RetrofitFactory.getInstance().setJob(getRequestBody(bean))
|
|
|
- sendRequest(observable, object : BaseObserver<SetJobModel>(mActivity, this) {
|
|
|
- override fun onSuccess(model: SetJobModel) {
|
|
|
- mEmitter.SendDircetive(SET_JOB, null)
|
|
|
+ viewModelScope.launch {
|
|
|
+ var space = repo.getSpaceBySpaceId(choseSpace!!.data.id!!)
|
|
|
+ if (jobStatus.equals("01")) {
|
|
|
+ space.archState = 1
|
|
|
+ } else if (jobStatus.equals("03")) {
|
|
|
+ space.archState = 2
|
|
|
+ } else if (jobStatus.equals("04")) {
|
|
|
+ space.archState = 2
|
|
|
+ space.equipState = 1
|
|
|
+ } else if (jobStatus.equals("05")) {
|
|
|
+ space.archState = 2
|
|
|
+ space.equipState = 2
|
|
|
}
|
|
|
- }, true)
|
|
|
+ repo.insSpace(space)
|
|
|
+ mEmitter.SendDircetive(SET_JOB, null)
|
|
|
+ }
|
|
|
+// val bean = ReqSetJob()
|
|
|
+// bean.buildingId = buildingId
|
|
|
+// bean.floorId = floorId
|
|
|
+// bean.spaceId.add(choseSpace!!.data.id)
|
|
|
+// bean.jobStatus = jobStatus
|
|
|
+// bean.spaceCode = "test"
|
|
|
+// val observable = RetrofitFactory.getInstance().setJob(getRequestBody(bean))
|
|
|
+// sendRequest(observable, object : BaseObserver<SetJobModel>(mActivity, this) {
|
|
|
+// override fun onSuccess(model: SetJobModel) {
|
|
|
+// mEmitter.SendDircetive(SET_JOB, null)
|
|
|
+// }
|
|
|
+// }, true)
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -442,7 +502,25 @@ class GraphyVM(
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ fun refreshObject(space: TunableSpace, hashMap: HashMap<String, Any>) {
|
|
|
+ viewModelScope.launch {
|
|
|
+ var space = repo.getObject(space.id!!)
|
|
|
+ space.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
+ repo.insObject(space)
|
|
|
+ mActivity.finish()
|
|
|
+// var objectEntity = ObjectEntity(
|
|
|
+// id = space.id!!,
|
|
|
+// name = space.name!!,
|
|
|
+//
|
|
|
+// )
|
|
|
+// repo.insObject()
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
companion object {
|
|
|
+ //
|
|
|
+ const val REFRESH_OBJECT = "SPACE_JOB"
|
|
|
+
|
|
|
//查询空间和任务
|
|
|
const val SPACE_JOB = "SPACE_JOB"
|
|
|
|