From 17eb1d06e104bc1cd93498fe3a3eaecf14c9d734 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 12 十一月 2020 13:57:35 +0800
Subject: [PATCH] 1. 修复现场整改时，问题状态是‘问题审核通过’而不是“整改未审核”的问题； 2. 修改任意拍照界面的多图片展示方式为Glide，减少内存溢出的可能性； 3. 新增图片类型枚举类，罗列原有的图片类型，并新增“铭牌”和“监测设备”； 4. 修复导航功能可能导致空指针的问题； 5. 任意拍界面新增按分类拍摄功能； 6. 修复现场整改界面打开崩溃问题；
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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..fc26e00 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
@@ -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