From a5d862051462a5fcc2717b405896a6d424002e54 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 22 十二月 2020 15:43:06 +0800
Subject: [PATCH] 1. 调整了数控实体的存储位置； 2. 新增数据表“媒体文件类型别名表”； 3. 修改任意拍模块，将图片分类改为根据场景类型动态生成，同时新增修改分类别名功能； 4. 优化子任务选择界面的任务排序方式，按照“待开始”、“执行中”、“未执行”的顺序进行排序；
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt
index 4db8edd..b027539 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt
@@ -1,9 +1,9 @@
package cn.flightfeather.thirdapp.module.inspection
import android.arch.lifecycle.MutableLiveData
-import cn.flightfeather.thirdapp.bean.Inspection
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Inspection
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.InspectionVo
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
@@ -117,21 +117,24 @@
}
}
- updateSubTask()
- updateInspection(inspection.value)
-
- //鏇存柊鐣岄潰
- subTask.value = subTask.value
+ updateSubTask {
+ //鏇存柊鐣岄潰
+ subTask.value = subTask.value
+ }
}
/**
* 鏇存柊瀛愪换鍔�
*/
- fun updateSubTask() {
+ fun updateSubTask(s: () -> Unit) {
subTask.value?.let {
inspectionRepository.updateSubTask(it, object : ResultCallBack<String> {
override fun onSuccess(result: String?) {
-
+ result?.let {
+ updateInspection(inspection.value){
+ s()
+ }
+ }
}
override fun onFailure() {
@@ -145,11 +148,11 @@
/**
* 鏇存柊宸℃煡淇℃伅
*/
- fun updateInspection(inspection: Inspection?) {
+ fun updateInspection(inspection: Inspection?, s: () -> Unit = {}) {
inspection?.let {
inspectionRepository.updateInspection(it, object : ResultCallBack<ResponseBody> {
override fun onSuccess(result: ResponseBody?) {
-
+ result?.let { s() }
}
override fun onFailure() {
--
Gitblit v1.9.3