From 150963f1d7a048e5f64a2bad339be824de5e4d89 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 07 Aug 2024 17:15:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/control/model/enums/CameraModeEnum.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dji/sample/control/model/enums/CameraModeEnum.java b/src/main/java/com/dji/sample/control/model/enums/CameraModeEnum.java
index a6dfe3c..f8143da 100644
--- a/src/main/java/com/dji/sample/control/model/enums/CameraModeEnum.java
+++ b/src/main/java/com/dji/sample/control/model/enums/CameraModeEnum.java
@@ -1,9 +1,11 @@
package com.dji.sample.control.model.enums;
+
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.Arrays;
+import java.util.Optional;
/**
* @author sean
@@ -12,15 +14,31 @@
*/
public enum CameraModeEnum {
- PHOTO, VIDEO;
+ NONE(-1),PHOTO(0), VIDEO(1), DGZN(2), QJPZ(3);
+
+ Integer mode;
+
+ CameraModeEnum(Integer mode) {this.mode = mode;}
@JsonValue
- public int getVal() {
- return ordinal();
+ public Integer getMode() {
+ return mode;
}
@JsonCreator
- public static CameraModeEnum find(int val) {
- return Arrays.stream(values()).filter(modeEnum -> modeEnum.ordinal() == val).findAny().get();
+ public static CameraModeEnum find(int mode) {
+ return Arrays.stream(values()).filter(modeEnum -> modeEnum.mode == mode).findAny().get();
}
+
+// @JsonValue
+// public int getVal() {
+// return ordinal();
+// }
+//
+// @JsonCreator
+// public static CameraModeEnum find(int val) {
+//// return Arrays.stream(values()).filter(modeEnum -> modeEnum.ordinal() == val).findAny().get();
+// return Arrays.stream(values()).filter(modeEnum -> modeEnum.ordinal() == val).findAny()
+// .orElseThrow(() -> new IllegalArgumentException("Invalid enum value: " + val));
+// }
}
--
Gitblit v1.9.3