From e27f54aa7e10836e2741dc590559e1039fbade78 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 七月 2021 15:06:41 +0800
Subject: [PATCH] 1. 创建子任务时，执行用户默认为当前登录用户或执行组中的第一人 2. 修复部分企业类型问题图标错误 3. 新增场景账户自动生成功能
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt | 34 ++++++++++++++++++++++------------
1 files changed, 22 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..3014661 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,18 @@
/**
* 鏇存柊宸℃煡淇℃伅
*/
- 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 {r ->
+ val n = r.string().toIntOrNull()
+ if (n == 1) {
+ s()
+ } else {
+ application.toast("鎻愪氦宸℃煡淇℃伅澶辫触锛岃妫�鏌ョ綉缁�")
+ }
+ }
}
override fun onFailure() {
--
Gitblit v1.9.3