diff --git a/app/src/main/java/com/nova/brain/glass/model/data/CompositeLayupApiData.kt b/app/src/main/java/com/nova/brain/glass/model/data/CompositeLayupApiData.kt index 551e7c8..0e89e89 100644 --- a/app/src/main/java/com/nova/brain/glass/model/data/CompositeLayupApiData.kt +++ b/app/src/main/java/com/nova/brain/glass/model/data/CompositeLayupApiData.kt @@ -1,5 +1,7 @@ package com.nova.brain.glass.model.data +import java.io.Serializable + data class CompositeLayupDetailItem( val id: Long = 0, val taskId: Long = 0, @@ -14,7 +16,7 @@ data class CompositeLayupDetailItem( val createdBy: String = "", val updatedBy: String = "", val isDeleted: Long = 0 -) +) : Serializable data class CompositeLayupTaskDetail( val id: Long = 0, @@ -36,7 +38,7 @@ data class CompositeLayupTaskDetail( val updatedBy: String = "", val isDeleted: Long = 0, val detailList: List? = null -) +) : Serializable data class CompositeLayupTaskDetailResponse( val code: Int = 0, diff --git a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt index 7958460..5ddf127 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt @@ -13,6 +13,7 @@ import com.nova.brain.glass.helper.GlassMediaServiceHelper import com.nova.brain.glass.helper.OfflineCmdListener import com.nova.brain.glass.helper.OfflineCmdServiceHelper import com.nova.brain.glass.model.ItemItem +import com.nova.brain.glass.model.data.CompositeLayupTaskDetail import com.nova.brain.glass.viewmodel.CompositeLayupResultState import com.nova.brain.glass.viewmodel.CompositeLayupResultVM import com.rokid.security.glass3.sdk.base.data.media.PhotoResolution @@ -50,6 +51,10 @@ class CompositeLayupResultActivity : BaseActivity 0 }) } else { viewModel.loadTaskDetail(taskNoFromIntent, stepSeqFromIntent.takeIf { it > 0 }) } @@ -189,5 +197,6 @@ class CompositeLayupTaskActivity : companion object { const val EXTRA_TASK_NO = "extra_task_no" const val EXTRA_STEP_SEQ = "extra_step_seq" + const val EXTRA_TASK_DETAIL = "extra_task_detail" } } diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt index db4a0fe..b687278 100644 --- a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt @@ -56,10 +56,15 @@ class CompositeLayupTaskVM : BaseListViewModel() { } }, { e -> taskDetailError.value = e.message ?: "获取任务详情失败" - }) + }) disposables.add(disposable) } + fun bindCachedTaskDetail(detail: CompositeLayupTaskDetail, stepOverride: Int? = null) { + bindTaskDetail(detail, stepOverride) + taskDetailError.value = "" + } + fun recognize(photoPath: String) { val file = File(photoPath) if (!file.exists()) {