From 1cdbf1b7b56ad238049771ba4a4481f282fe4122 Mon Sep 17 00:00:00 2001
From: "huidong.tan" <huidong.tan@dji.com>
Date: Thu, 29 Feb 2024 17:49:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BB=A5=E9=A3=9E?=
=?UTF-8?q?=E8=A1=8C=E5=8C=BA=E5=8A=9F=E8=83=BD=E9=80=82=E9=85=8DEA220?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/dji/sdk/cloudapi/control/LensStorageSettingsEnum.java | 2 ++
.../cloudapi/flightarea/api/AbstractFlightAreaService.java | 2 +-
.../java/com/dji/sdk/config/version/CloudSDKVersionEnum.java | 4 +++-
.../com/dji/sdk/config/version/Dock2ThingVersionEnum.java | 2 ++
.../com/dji/sdk/config/version/DroneThingVersionEnum.java | 2 ++
pom.xml | 4 ++--
6 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/LensStorageSettingsEnum.java b/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/LensStorageSettingsEnum.java
index 869c5ea..0cee0a9 100644
--- a/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/LensStorageSettingsEnum.java
+++ b/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/LensStorageSettingsEnum.java
@@ -19,6 +19,8 @@ public enum LensStorageSettingsEnum {
WIDE("wide"),
+ VISION("vision"),
+
INFRARED("ir");
private final String lens;
diff --git a/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/api/AbstractFlightAreaService.java b/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/api/AbstractFlightAreaService.java
index c0bc9bc..910acca 100644
--- a/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/api/AbstractFlightAreaService.java
+++ b/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/api/AbstractFlightAreaService.java
@@ -35,7 +35,7 @@ public abstract class AbstractFlightAreaService {
* @param gateway gateway device
* @return services_reply
*/
- @CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_0, exclude = GatewayTypeEnum.RC, include = GatewayTypeEnum.DOCK)
+ @CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_0, exclude = GatewayTypeEnum.RC, include = {GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2})
public TopicServicesResponse<ServicesReplyData> flightAreasUpdate(GatewayManager gateway) {
return servicesPublish.publish(
gateway.getGatewaySn(),
diff --git a/cloud-sdk/src/main/java/com/dji/sdk/config/version/CloudSDKVersionEnum.java b/cloud-sdk/src/main/java/com/dji/sdk/config/version/CloudSDKVersionEnum.java
index 52a20b0..ec37034 100644
--- a/cloud-sdk/src/main/java/com/dji/sdk/config/version/CloudSDKVersionEnum.java
+++ b/cloud-sdk/src/main/java/com/dji/sdk/config/version/CloudSDKVersionEnum.java
@@ -15,7 +15,9 @@ public enum CloudSDKVersionEnum {
V1_0_2("1.0.2"),
- DEFAULT("1.0.2"),
+ V1_0_3("1.0.3"),
+
+ DEFAULT("1.0.3"),
V99("99");
diff --git a/cloud-sdk/src/main/java/com/dji/sdk/config/version/Dock2ThingVersionEnum.java b/cloud-sdk/src/main/java/com/dji/sdk/config/version/Dock2ThingVersionEnum.java
index 9f0d15d..0b10d77 100644
--- a/cloud-sdk/src/main/java/com/dji/sdk/config/version/Dock2ThingVersionEnum.java
+++ b/cloud-sdk/src/main/java/com/dji/sdk/config/version/Dock2ThingVersionEnum.java
@@ -14,6 +14,8 @@ public enum Dock2ThingVersionEnum implements IThingVersion {
V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_1),
+ V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3),
+
;
private final String thingVersion;
diff --git a/cloud-sdk/src/main/java/com/dji/sdk/config/version/DroneThingVersionEnum.java b/cloud-sdk/src/main/java/com/dji/sdk/config/version/DroneThingVersionEnum.java
index 3d3ca79..280542a 100644
--- a/cloud-sdk/src/main/java/com/dji/sdk/config/version/DroneThingVersionEnum.java
+++ b/cloud-sdk/src/main/java/com/dji/sdk/config/version/DroneThingVersionEnum.java
@@ -23,6 +23,8 @@ public enum DroneThingVersionEnum implements IThingVersion {
V1_1_3("1.1.3", CloudSDKVersionEnum.V1_0_2),
+ V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3),
+
;
private static final Logger log = LoggerFactory.getLogger(DroneThingVersionEnum.class);
diff --git a/pom.xml b/pom.xml
index fd51c25..363dc0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
<name>cloud-api-sample</name>
<properties>
- <revision>1.9.0</revision>
- <cloud-sdk.revision>1.0.2</cloud-sdk.revision>
+ <revision>1.10.0</revision>
+ <cloud-sdk.revision>1.0.3</cloud-sdk.revision>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
From 9fb39873fae405018e7fe93c16ae3fc1a9715da9 Mon Sep 17 00:00:00 2001
From: "huidong.tan" <huidong.tan@dji.com>
Date: Sun, 7 Apr 2024 16:58:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 27b59c7..b3aa75e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ For more documentation, please visit the [DJI Developer Documentation](https://d
## Latest Release
-Cloud API 1.8.0 was released on 22 Feb 2024. For more information, please visit the [Release Note](https://developer.dji.com/doc/cloud-api-tutorial/cn/).
+Cloud API 1.10.0 was released on 7 Apr 2024.. For more information, please visit the [Release Note](https://developer.dji.com/doc/cloud-api-tutorial/cn/).
## License