From 35c8aca3b8107ee2a4fbb5790ce1eeb70f4bb461 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 22 Mar 2024 18:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/manage/model/receiver/OsdDockReceiver.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/receiver/OsdDockReceiver.java b/src/main/java/com/dji/sample/manage/model/receiver/OsdDockReceiver.java
index 0cd5196..8826d35 100644
--- a/src/main/java/com/dji/sample/manage/model/receiver/OsdDockReceiver.java
+++ b/src/main/java/com/dji/sample/manage/model/receiver/OsdDockReceiver.java
@@ -1,5 +1,7 @@
package com.dji.sample.manage.model.receiver;
+import com.dji.sample.manage.model.enums.DockDrcStateEnum;
+import com.dji.sample.manage.model.enums.DockModeCodeEnum;
import lombok.Data;
/**
@@ -40,13 +42,13 @@
private StorageReceiver storage;
- private Integer modeCode;
+ private DockModeCodeEnum modeCode;
private Integer coverState;
private Integer supplementLightState;
- private Integer emergencyStopState;
+ private Boolean emergencyStopState;
private Integer airConditionerMode;
@@ -85,4 +87,6 @@
private DockSdrReceiver sdr;
private DockWirelessLinkReceiver wirelessLink;
+
+ private DockDrcStateEnum drcState;
}
--
Gitblit v1.9.3