From 97082b60eb2fbccb66f7f0beefb5cb591448ec10 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 01 Apr 2024 15:55:32 +0800
Subject: [PATCH] 升级版本1.9.0

---
 src/main/java/com/dji/sample/manage/model/enums/CommanderModeLostActionEnum.java |   35 +++++++++++
 src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java        |   16 ++++
 src/main/java/com/dji/sample/manage/model/enums/CommanderFlightModeEnum.java     |   36 ++++++++++++
 src/main/java/com/dji/sample/manage/model/enums/RthModeEnum.java                 |   36 ++++++++++++
 4 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java b/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java
index 4de1273..0714eb0 100644
--- a/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java
+++ b/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java
@@ -1,10 +1,11 @@
 package com.dji.sample.control.model.param;
 
-import com.dji.sample.manage.model.enums.DroneRcLostActionEnum;
-import com.dji.sample.manage.model.enums.WaylineRcLostActionEnum;
+import com.dji.sample.manage.model.enums.*;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -46,4 +47,15 @@
     @Range(min = 1, max = 15)
     @NotNull
     private Double maxSpeed;
+
+    private RthModeEnum rthMode;
+
+    private CommanderModeLostActionEnum commanderModeLostAction;
+
+    private CommanderFlightModeEnum commanderFlightMode;
+
+    @Min(2)
+    @Max(3000)
+    private Float commanderFlightHeight;
+
 }
diff --git a/src/main/java/com/dji/sample/manage/model/enums/CommanderFlightModeEnum.java b/src/main/java/com/dji/sample/manage/model/enums/CommanderFlightModeEnum.java
new file mode 100644
index 0000000..e100ab7
--- /dev/null
+++ b/src/main/java/com/dji/sample/manage/model/enums/CommanderFlightModeEnum.java
@@ -0,0 +1,36 @@
+package com.dji.sample.manage.model.enums;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author sean
+ * @version 1.7
+ * @date 2023/8/7
+ */
+public enum CommanderFlightModeEnum {
+
+    SMART_HEIGHT(0),
+
+    SETTING_HEIGHT(1);
+
+    private final int mode;
+
+    CommanderFlightModeEnum(int mode) {
+        this.mode = mode;
+    }
+
+    @JsonValue
+    public int getMode() {
+        return mode;
+    }
+
+    @JsonCreator
+    public static Optional<CommanderFlightModeEnum> find(int value) {
+        return Arrays.stream(CommanderFlightModeEnum.values()).filter(state -> state.ordinal() == value).findAny();
+    }
+
+}
diff --git a/src/main/java/com/dji/sample/manage/model/enums/CommanderModeLostActionEnum.java b/src/main/java/com/dji/sample/manage/model/enums/CommanderModeLostActionEnum.java
new file mode 100644
index 0000000..d7e26ec
--- /dev/null
+++ b/src/main/java/com/dji/sample/manage/model/enums/CommanderModeLostActionEnum.java
@@ -0,0 +1,35 @@
+package com.dji.sample.manage.model.enums;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author sean
+ * @version 1.7
+ * @date 2023/6/6
+ */
+public enum CommanderModeLostActionEnum {
+
+    CONTINUE(0),
+
+    EXECUTE_RC_LOST_ACTION(1);
+
+    private final int action;
+
+    CommanderModeLostActionEnum(int action) {
+        this.action = action;
+    }
+
+    @JsonValue
+    public int getAction() {
+        return action;
+    }
+
+    @JsonCreator
+    public static Optional<CommanderModeLostActionEnum> find(int value) {
+        return Arrays.stream(CommanderModeLostActionEnum.values()).filter(state -> state.ordinal() == value).findAny();
+    }
+}
diff --git a/src/main/java/com/dji/sample/manage/model/enums/RthModeEnum.java b/src/main/java/com/dji/sample/manage/model/enums/RthModeEnum.java
new file mode 100644
index 0000000..53714f8
--- /dev/null
+++ b/src/main/java/com/dji/sample/manage/model/enums/RthModeEnum.java
@@ -0,0 +1,36 @@
+package com.dji.sample.manage.model.enums;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author sean
+ * @version 1.7
+ * @date 2023/8/4
+ */
+public enum RthModeEnum {
+
+    OPTIMAL_HEIGHT(0),
+
+    PRESET_HEIGHT(1);
+
+    private final int rthMode;
+
+    RthModeEnum(int rthMode) {
+        this.rthMode = rthMode;
+    }
+
+    @JsonValue
+    public int getRthMode() {
+        return rthMode;
+    }
+
+    @JsonCreator
+    public static Optional<RthModeEnum> find(int value) {
+        return Arrays.stream(RthModeEnum.values()).filter(state -> state.ordinal() == value).findAny();
+    }
+
+}

--
Gitblit v1.9.3