diff --git a/src/main/java/com/tuoheng/machine/state/AirportState.java b/src/main/java/com/tuoheng/machine/state/AirportState.java index 0e7ab9b..e3ba072 100644 --- a/src/main/java/com/tuoheng/machine/state/AirportState.java +++ b/src/main/java/com/tuoheng/machine/state/AirportState.java @@ -5,14 +5,10 @@ package com.tuoheng.machine.state; */ public enum AirportState { /** - * 未知状态(服务器重启后的初始状态,等待第一次心跳同步) + * 未知状态(服务器重启后的初始状态,等待第一次心跳同步),同时也是离线状态 */ UNKNOWN, - /** - * 离线 - */ - OFFLINE, /** * 在线 diff --git a/src/main/java/com/tuoheng/machine/state/DebugModeState.java b/src/main/java/com/tuoheng/machine/state/DebugModeState.java index bf6cb3a..f3ad9ae 100644 --- a/src/main/java/com/tuoheng/machine/state/DebugModeState.java +++ b/src/main/java/com/tuoheng/machine/state/DebugModeState.java @@ -17,5 +17,5 @@ public enum DebugModeState { /** * 退出调试模式 */ - EXITED_DEBUG + EXITED } diff --git a/src/main/java/com/tuoheng/machine/state/DrcState.java b/src/main/java/com/tuoheng/machine/state/DrcState.java index 2b86ee7..91faf51 100644 --- a/src/main/java/com/tuoheng/machine/state/DrcState.java +++ b/src/main/java/com/tuoheng/machine/state/DrcState.java @@ -14,7 +14,6 @@ public enum DrcState { */ EXITED, - /** * 进入状态(已进入DRC模式) */ diff --git a/src/main/java/com/tuoheng/machine/state/DroneState.java b/src/main/java/com/tuoheng/machine/state/DroneState.java index 3bd4da0..e28cf56 100644 --- a/src/main/java/com/tuoheng/machine/state/DroneState.java +++ b/src/main/java/com/tuoheng/machine/state/DroneState.java @@ -5,15 +5,15 @@ package com.tuoheng.machine.state; * 分为:准备中 -> 飞行中 -> 返航 三个大状态 */ public enum DroneState { - /** - * 未知状态(服务器重启后的初始状态,等待第一次心跳同步) + * 未知状态(服务器重启后的初始状态,等待第一次心跳同步),同时也是离线状态 */ UNKNOWN, + /** - * 离线 + * 在线 */ - OFFLINE, + ONLINE, /** * 飞行中 @@ -30,5 +30,4 @@ public enum DroneState { */ RETURNING, - } diff --git a/src/main/java/com/tuoheng/machine/vendor/dji/DjiVendorConfig.java b/src/main/java/com/tuoheng/machine/vendor/dji/DjiVendorConfig.java index e9406aa..c39e6e7 100644 --- a/src/main/java/com/tuoheng/machine/vendor/dji/DjiVendorConfig.java +++ b/src/main/java/com/tuoheng/machine/vendor/dji/DjiVendorConfig.java @@ -52,7 +52,7 @@ public class DjiVendorConfig implements VendorConfig { switch (commandType) { case TAKE_OFF: // 未知状态或离线状态且未急停时可以起飞 - return (droneState == DroneState.UNKNOWN || droneState == DroneState.OFFLINE) && + return (droneState == DroneState.UNKNOWN || droneState == DroneState.ONLINE) && stopState != StopState.ENTERED; case LAND: @@ -87,7 +87,7 @@ public class DjiVendorConfig implements VendorConfig { case START_MISSION: // 未知状态或离线状态且未急停时可以开始航线任务 - return (droneState == DroneState.UNKNOWN || droneState == DroneState.OFFLINE) && + return (droneState == DroneState.UNKNOWN || droneState == DroneState.ONLINE) && stopState != StopState.ENTERED; case OPEN_COVER: