From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug； 2. 新建子任务时默认执行人员从全体人员改为当前用户； 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内，确保子任务执行时间不会超出总任务范围。
---
app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
index 68b41c4..dfca918 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
@@ -7,10 +7,32 @@
enum class MediaFileType(val value: Int, val des: String) {
Problem(1, "闂"),
TechnicalPrevention(2,"鎶�闃叉帾鏂�"),
+
MonitorDevice(3, "鐩戞祴璁惧"),
ManageDevice(4, "娌荤悊璁惧"),
+
RoutineRecord(5, "甯歌璁板綍"),
Signature(6, "绛惧瓧"),
Nameplate(7, "閾墝"),
- Others(99,"鍏朵粬")
+
+ TYPE_1(51, "鎵╁睍绫讳竴"),
+ TYPE_2(52, "鎵╁睍绫讳簩"),
+ TYPE_3(53, "鎵╁睍绫讳笁"),
+ TYPE_4(54, "鎵╁睍绫诲洓"),
+ TYPE_5(55, "鎵╁睍绫讳簲"),
+ TYPE_6(56, "鎵╁睍绫诲叚"),
+ TYPE_7(57, "鎵╁睍绫讳竷"),
+ TYPE_8(58, "鎵╁睍绫诲叓"),
+ TYPE_9(59, "鎵╁睍绫讳節"),
+ TYPE_10(60, "鎵╁睍绫诲崄"),
+
+ Others(99,"鍏朵粬");
+
+ companion object {
+ fun getList(sceneTypeId: Int) = when (sceneTypeId) {
+ // FIXME: 2020/12/21 姝ゅ5浠ｈ〃椁愰ギ浼佷笟绫诲瀷锛屽悗缁簲璇ユ坊鍔犳灇涓剧被绛夎鑼冧唬鐮�
+ 5 -> listOf(RoutineRecord, TYPE_1, TYPE_2, TYPE_3, TYPE_4, TYPE_5, TYPE_6, TYPE_7, TYPE_8, TYPE_9, TYPE_10)
+ else -> listOf(RoutineRecord, MonitorDevice, Nameplate)
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3