From b7b520bfe8b35683112284861f0dca8e645cbd56 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:22:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hc-satellite-data-import-1227_2'
---
src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt | 6 ++++--
1 files changed, 4 insertions(+), 2 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 c354375..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,14 +6,16 @@
enum class UWDeviceType(val value: String, val des: String) {
UAV("0b", "鏃犱汉鏈鸿澶�"),
VEHICLE("0a", "杞﹁浇璁惧"),
- BOAT("0c", "鏃犱汉鑸�"),
+ 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
--
Gitblit v1.9.3