diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index e36cd13..b75acb4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -9,13 +9,13 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.vm.InspectionViewModel +import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { - private val inspectionViewModel by lazy { ViewModelProvider(this)[InspectionViewModel::class.java] } + private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var selectedTree = "" override fun initViewBinding( @@ -77,7 +77,7 @@ return@setOnClickListener } - inspectionViewModel.addPoint( + deviceViewModel.addPoint( selectedTree, horizontalAngle, verticalAngle, diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index e36cd13..b75acb4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -9,13 +9,13 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.vm.InspectionViewModel +import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { - private val inspectionViewModel by lazy { ViewModelProvider(this)[InspectionViewModel::class.java] } + private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var selectedTree = "" override fun initViewBinding( @@ -77,7 +77,7 @@ return@setOnClickListener } - inspectionViewModel.addPoint( + deviceViewModel.addPoint( selectedTree, horizontalAngle, verticalAngle, diff --git a/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java b/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java deleted file mode 100644 index da9c966..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.br.operationsite.model; - -public class InspectionPointModel { -} diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index e36cd13..b75acb4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -9,13 +9,13 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.vm.InspectionViewModel +import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { - private val inspectionViewModel by lazy { ViewModelProvider(this)[InspectionViewModel::class.java] } + private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var selectedTree = "" override fun initViewBinding( @@ -77,7 +77,7 @@ return@setOnClickListener } - inspectionViewModel.addPoint( + deviceViewModel.addPoint( selectedTree, horizontalAngle, verticalAngle, diff --git a/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java b/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java deleted file mode 100644 index da9c966..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.br.operationsite.model; - -public class InspectionPointModel { -} diff --git a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt index aae8c42..64b2de9 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt @@ -1,8 +1,10 @@ package com.casic.br.operationsite.vm import androidx.lifecycle.ViewModel +import com.casic.br.operationsite.extensions.getResponseHeader import com.casic.br.operationsite.retrofit.RetrofitServiceManager import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.unpackingResponse class DeviceViewModel : ViewModel() { /** @@ -11,4 +13,63 @@ fun executeDeviceCommand(action: String, speed: Int) = launch({ RetrofitServiceManager.executeDeviceCommand(action, speed) }) + + fun getPoints( + deviceId: String, + onLoading: () -> Unit, + onSuccess: (Any) -> Unit, + onFailed: (String) -> Unit + ) = launch({ + onLoading() + val response = RetrofitServiceManager.getPoints(deviceId) + val header = response.getResponseHeader() + if (header.first == 200) { + onSuccess(unpackingResponse(response)) + } else { + onFailed(header.second) + } + }, { + it.printStackTrace() + onFailed(it.message ?: "Unknown error") + }) + + fun addPoint( + deviceId: String, + horizontalAngle: String, + verticalAngle: String, + onLoading: () -> Unit, + onSuccess: () -> Unit, + onFailed: (String) -> Unit + ) = launch({ + onLoading() + val response = RetrofitServiceManager.addPoint(deviceId, horizontalAngle, verticalAngle) + val header = response.getResponseHeader() + if (header.first == 200) { + onSuccess() + } else { + onFailed(header.second) + } + }, { + it.printStackTrace() + onFailed(it.message ?: "Unknown error") + }) + + fun deletePoint( + id: String, + onLoading: () -> Unit, + onSuccess: () -> Unit, + onFailed: (String) -> Unit + ) = launch({ + onLoading() + val response = RetrofitServiceManager.deletePoint(id) + val header = response.getResponseHeader() + if (header.first == 200) { + onSuccess() + } else { + onFailed(header.second) + } + }, { + it.printStackTrace() + onFailed(it.message ?: "Unknown error") + }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index e36cd13..b75acb4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -9,13 +9,13 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.vm.InspectionViewModel +import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { - private val inspectionViewModel by lazy { ViewModelProvider(this)[InspectionViewModel::class.java] } + private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var selectedTree = "" override fun initViewBinding( @@ -77,7 +77,7 @@ return@setOnClickListener } - inspectionViewModel.addPoint( + deviceViewModel.addPoint( selectedTree, horizontalAngle, verticalAngle, diff --git a/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java b/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java deleted file mode 100644 index da9c966..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/InspectionPointModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.br.operationsite.model; - -public class InspectionPointModel { -} diff --git a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt index aae8c42..64b2de9 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt @@ -1,8 +1,10 @@ package com.casic.br.operationsite.vm import androidx.lifecycle.ViewModel +import com.casic.br.operationsite.extensions.getResponseHeader import com.casic.br.operationsite.retrofit.RetrofitServiceManager import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.unpackingResponse class DeviceViewModel : ViewModel() { /** @@ -11,4 +13,63 @@ fun executeDeviceCommand(action: String, speed: Int) = launch({ RetrofitServiceManager.executeDeviceCommand(action, speed) }) + + fun getPoints( + deviceId: String, + onLoading: () -> Unit, + onSuccess: (Any) -> Unit, + onFailed: (String) -> Unit + ) = launch({ + onLoading() + val response = RetrofitServiceManager.getPoints(deviceId) + val header = response.getResponseHeader() + if (header.first == 200) { + onSuccess(unpackingResponse(response)) + } else { + onFailed(header.second) + } + }, { + it.printStackTrace() + onFailed(it.message ?: "Unknown error") + }) + + fun addPoint( + deviceId: String, + horizontalAngle: String, + verticalAngle: String, + onLoading: () -> Unit, + onSuccess: () -> Unit, + onFailed: (String) -> Unit + ) = launch({ + onLoading() + val response = RetrofitServiceManager.addPoint(deviceId, horizontalAngle, verticalAngle) + val header = response.getResponseHeader() + if (header.first == 200) { + onSuccess() + } else { + onFailed(header.second) + } + }, { + it.printStackTrace() + onFailed(it.message ?: "Unknown error") + }) + + fun deletePoint( + id: String, + onLoading: () -> Unit, + onSuccess: () -> Unit, + onFailed: (String) -> Unit + ) = launch({ + onLoading() + val response = RetrofitServiceManager.deletePoint(id) + val header = response.getResponseHeader() + if (header.first == 200) { + onSuccess() + } else { + onFailed(header.second) + } + }, { + it.printStackTrace() + onFailed(it.message ?: "Unknown error") + }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/InspectionViewModel.kt deleted file mode 100644 index 1eeccc2..0000000 --- a/app/src/main/java/com/casic/br/operationsite/vm/InspectionViewModel.kt +++ /dev/null @@ -1,69 +0,0 @@ -package com.casic.br.operationsite.vm - -import androidx.lifecycle.ViewModel -import com.casic.br.operationsite.extensions.getResponseHeader -import com.casic.br.operationsite.model.InspectionPointModel -import com.casic.br.operationsite.retrofit.RetrofitServiceManager -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.unpackingResponse - -class InspectionViewModel : ViewModel() { - fun getPoints( - deviceId: String, - onLoading: () -> Unit, - onSuccess: (InspectionPointModel) -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.getPoints(deviceId) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess(unpackingResponse(response)) - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) - - fun addPoint( - deviceId: String, - horizontalAngle: String, - verticalAngle: String, - onLoading: () -> Unit, - onSuccess: () -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.addPoint(deviceId, horizontalAngle, verticalAngle) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess() - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) - - fun deletePoint( - id: String, - onLoading: () -> Unit, - onSuccess: () -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.deletePoint(id) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess() - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) -} \ No newline at end of file