diff --git a/app/src/main/java/com/nova/brain/glass/ui/InspectionCompleteActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/InspectionCompleteActivity.kt index de3a410..5b70b91 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/InspectionCompleteActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/InspectionCompleteActivity.kt @@ -18,6 +18,8 @@ class InspectionCompleteActivity : BaseActivity diff --git a/app/src/main/java/com/nova/brain/glass/ui/InspectionResultActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/InspectionResultActivity.kt index 23de9d8..85921d7 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/InspectionResultActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/InspectionResultActivity.kt @@ -159,9 +159,12 @@ class InspectionResultActivity : private fun goComplete() { val photoCount = SprayingPhotoManager.getPhotoCount() SprayingPhotoManager.clear() + val result = viewModel.qualifiedResult.value startActivity(Intent(this, InspectionCompleteActivity::class.java).apply { putExtra(InspectionCompleteActivity.EXTRA_PHOTO_COUNT, photoCount) putExtra(InspectionCompleteActivity.EXTRA_TASK_NO, taskNo) + putExtra(InspectionCompleteActivity.EXTRA_QUALIFIED, result?.first ?: true) + putExtra(InspectionCompleteActivity.EXTRA_REASON, result?.second ?: "") }) finish() } diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionResultVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionResultVM.kt index e18d8da..c6f9be1 100644 --- a/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionResultVM.kt +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionResultVM.kt @@ -23,6 +23,7 @@ class InspectionResultVM : BaseListViewModel() { val action = MutableLiveData(InspectionResultAction.IDLE) val validateResult = MutableLiveData() val errorMsg = MutableLiveData() + val qualifiedResult = MutableLiveData?>() override fun loadData(page: Int, onResponse: Response) { onResponse.onResponse(arrayListOf().apply { @@ -70,6 +71,8 @@ class InspectionResultVM : BaseListViewModel() { .subscribe({ response -> if (response.success) { val qualified = response.data?.qualified ?: false + val reason = response.data?.reason ?: "" + qualifiedResult.value = Pair(qualified, reason) action.value = if (qualified) { InspectionResultAction.CHECK_QUALIFIED_COMPLETE } else {