From 6ed458bae2cf34608ba6ca7474fbeffc54766e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Tue, 21 Apr 2026 16:14:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(glass):=20=E6=B7=BB=E5=8A=A0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=AE=8C=E6=88=90=E6=8E=A5=E5=8F=A3=E5=B9=B6=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=A3=80=E6=9F=A5=E4=BB=BB=E5=8A=A1=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在Service3中新增taskFinish接口用于标记任务完成 - 在InspectionCompleteVM中将checkTaskQualified调用替换为taskFinish - 在InspectionResultVM中将checkTaskQualified调用替换为taskFinish - 更新网络请求以支持任务完成状态提交功能 --- .../main/java/com/nova/brain/glass/repository/Service3.kt | 6 ++++++ .../com/nova/brain/glass/viewmodel/InspectionCompleteVM.kt | 2 +- .../com/nova/brain/glass/viewmodel/InspectionResultVM.kt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nova/brain/glass/repository/Service3.kt b/app/src/main/java/com/nova/brain/glass/repository/Service3.kt index 1814359..d263c44 100644 --- a/app/src/main/java/com/nova/brain/glass/repository/Service3.kt +++ b/app/src/main/java/com/nova/brain/glass/repository/Service3.kt @@ -29,4 +29,10 @@ interface Service3 { fun checkTaskQualified( @Part("taskNo") taskNo: RequestBody ): Observable + + @Multipart + @POST("/api/admin/bom/ocr/glass/taskFinish") + fun taskFinish( + @Part("taskNo") taskNo: RequestBody + ): Observable } diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionCompleteVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionCompleteVM.kt index cb3fd24..958dd2d 100644 --- a/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionCompleteVM.kt +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionCompleteVM.kt @@ -20,7 +20,7 @@ class InspectionCompleteVM : ViewModel() { submitState.value = SubmitTaskState.LOADING val taskNoBody = taskNo.toRequestBody("text/plain".toMediaTypeOrNull()) val disposable = HttpManager.getApi(MyApplication.appComponent3, Service3::class.java) - .checkTaskQualified(taskNoBody) + .taskFinish(taskNoBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ response -> 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 6163709..e18d8da 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 @@ -89,7 +89,7 @@ class InspectionResultVM : BaseListViewModel() { fun submitTask(taskNo: String) { val taskNoBody = taskNo.toRequestBody("text/plain".toMediaTypeOrNull()) val disposable = HttpManager.getApi(MyApplication.appComponent3, Service3::class.java) - .checkTaskQualified(taskNoBody) + .taskFinish(taskNoBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ response ->