修改代码
This commit is contained in:
parent
f84450768b
commit
d18b4cd7b8
|
|
@ -5,14 +5,10 @@ package com.tuoheng.machine.state;
|
||||||
*/
|
*/
|
||||||
public enum AirportState {
|
public enum AirportState {
|
||||||
/**
|
/**
|
||||||
* 未知状态(服务器重启后的初始状态,等待第一次心跳同步)
|
* 未知状态(服务器重启后的初始状态,等待第一次心跳同步),同时也是离线状态
|
||||||
*/
|
*/
|
||||||
UNKNOWN,
|
UNKNOWN,
|
||||||
|
|
||||||
/**
|
|
||||||
* 离线
|
|
||||||
*/
|
|
||||||
OFFLINE,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 在线
|
* 在线
|
||||||
|
|
|
||||||
|
|
@ -17,5 +17,5 @@ public enum DebugModeState {
|
||||||
/**
|
/**
|
||||||
* 退出调试模式
|
* 退出调试模式
|
||||||
*/
|
*/
|
||||||
EXITED_DEBUG
|
EXITED
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ public enum DrcState {
|
||||||
*/
|
*/
|
||||||
EXITED,
|
EXITED,
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 进入状态(已进入DRC模式)
|
* 进入状态(已进入DRC模式)
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -5,15 +5,15 @@ package com.tuoheng.machine.state;
|
||||||
* 分为:准备中 -> 飞行中 -> 返航 三个大状态
|
* 分为:准备中 -> 飞行中 -> 返航 三个大状态
|
||||||
*/
|
*/
|
||||||
public enum DroneState {
|
public enum DroneState {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 未知状态(服务器重启后的初始状态,等待第一次心跳同步)
|
* 未知状态(服务器重启后的初始状态,等待第一次心跳同步),同时也是离线状态
|
||||||
*/
|
*/
|
||||||
UNKNOWN,
|
UNKNOWN,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 离线
|
* 在线
|
||||||
*/
|
*/
|
||||||
OFFLINE,
|
ONLINE,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 飞行中
|
* 飞行中
|
||||||
|
|
@ -30,5 +30,4 @@ public enum DroneState {
|
||||||
*/
|
*/
|
||||||
RETURNING,
|
RETURNING,
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ public class DjiVendorConfig implements VendorConfig {
|
||||||
switch (commandType) {
|
switch (commandType) {
|
||||||
case TAKE_OFF:
|
case TAKE_OFF:
|
||||||
// 未知状态或离线状态且未急停时可以起飞
|
// 未知状态或离线状态且未急停时可以起飞
|
||||||
return (droneState == DroneState.UNKNOWN || droneState == DroneState.OFFLINE) &&
|
return (droneState == DroneState.UNKNOWN || droneState == DroneState.ONLINE) &&
|
||||||
stopState != StopState.ENTERED;
|
stopState != StopState.ENTERED;
|
||||||
|
|
||||||
case LAND:
|
case LAND:
|
||||||
|
|
@ -87,7 +87,7 @@ public class DjiVendorConfig implements VendorConfig {
|
||||||
|
|
||||||
case START_MISSION:
|
case START_MISSION:
|
||||||
// 未知状态或离线状态且未急停时可以开始航线任务
|
// 未知状态或离线状态且未急停时可以开始航线任务
|
||||||
return (droneState == DroneState.UNKNOWN || droneState == DroneState.OFFLINE) &&
|
return (droneState == DroneState.UNKNOWN || droneState == DroneState.ONLINE) &&
|
||||||
stopState != StopState.ENTERED;
|
stopState != StopState.ENTERED;
|
||||||
|
|
||||||
case OPEN_COVER:
|
case OPEN_COVER:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue