From 0412a0125f484282c28d76905ca1f6397014b982 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期一, 30 十二月 2024 14:32:48 +0800 Subject: [PATCH] 1. 测试部分新增数据后期调整代码(一次性) 2. 优化走航路径自动归集路段功能 --- src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt b/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt index d3e193e..9385288 100644 --- a/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt +++ b/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt @@ -6,15 +6,19 @@ enum class UWDeviceType(val value: String, val des: String) { UAV("0b", "鏃犱汉鏈鸿澶�"), VEHICLE("0a", "杞﹁浇璁惧"), + BOAT("0c", "鏃犱汉鑸硅澶�"), GRID("0d", "缃戞牸鍖栬澶�"); companion object { /** * 鏍规嵁璁惧缂栧彿鑾峰彇璁惧绫诲瀷 */ - fun getType(deviceCode: String?): UWDeviceType? = when (deviceCode?.substring(0, 2)) { + fun getType(deviceCode: String?): UWDeviceType? = fromValue(deviceCode?.substring(0, 2)) + + fun fromValue(value: String?): UWDeviceType? = when (value) { UAV.value -> UAV VEHICLE.value -> VEHICLE + BOAT.value -> BOAT GRID.value -> GRID else -> null } -- Gitblit v1.9.3