From faedd5d2f0ee850464f0507da93c37459bd5e3bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 26 Sep 2023 16:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/manage/model/receiver/OsdSubDeviceReceiver.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/receiver/OsdSubDeviceReceiver.java b/src/main/java/com/dji/sample/manage/model/receiver/OsdSubDeviceReceiver.java
index 24d101e..148ad9a 100644
--- a/src/main/java/com/dji/sample/manage/model/receiver/OsdSubDeviceReceiver.java
+++ b/src/main/java/com/dji/sample/manage/model/receiver/OsdSubDeviceReceiver.java
@@ -1,9 +1,14 @@
package com.dji.sample.manage.model.receiver;
+import com.dji.sample.manage.model.enums.DeviceModeCodeEnum;
+import com.dji.sample.manage.model.enums.DroneRcLostActionEnum;
+import com.dji.sample.manage.model.enums.WaylineRcLostActionEnum;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data;
+
+import java.util.List;
/**
* @author sean.zhou
@@ -39,7 +44,7 @@
private Double longitude;
- private Integer modeCode;
+ private DeviceModeCodeEnum modeCode;
private Double totalFlightDistance;
@@ -49,7 +54,31 @@
private Double windDirection;
- private Double windSpeed;
+ private Float windSpeed;
private PositionStateReceiver positionState;
+
+ private List<OsdPayloadReceiver> payloads;
+
+ private StorageReceiver storage;
+
+ private Integer nightLightsState;
+
+ private Integer heightLimit;
+
+ private DistanceLimitStatusReceiver distanceLimitStatus;
+
+ private ObstacleAvoidanceReceiver obstacleAvoidance;
+
+ private Long activationTime;
+
+ private List<OsdCameraReceiver> cameras;
+
+ private DroneRcLostActionEnum rcLostAction;
+
+ private Integer rthAltitude;
+
+ private Integer totalFlightSorties;
+
+ private WaylineRcLostActionEnum exitWaylineWhenRcLost;
}
\ No newline at end of file
--
Gitblit v1.9.3