From 0756be50d459d9dbeeec797d806ea1472adc84a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Wed, 22 Apr 2026 14:55:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E6=B7=BB=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=BB=93=E6=9E=9C=E7=8A=B6=E6=80=81=E4=BC=A0=E9=80=92?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 InspectionCompleteActivity 中新增 EXTRA_QUALIFIED 和 EXTRA_REASON 常量 - 修改 InspectionCompleteActivity 的 UI 显示逻辑以展示检查结果状态 - 在 InspectionResultActivity 中传递检查结果到完成页面 - 在 InspectionResultVM 中添加 qualifiedResult LiveData 存储检查结果对 - 更新数据加载逻辑以获取并存储检查合格状态和原因信息 --- .../com/nova/brain/glass/ui/InspectionCompleteActivity.kt | 7 ++++++- .../com/nova/brain/glass/ui/InspectionResultActivity.kt | 3 +++ .../com/nova/brain/glass/viewmodel/InspectionResultVM.kt | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) 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 {