From 2d8ded3e77b22e44985265ca4063102662e452c1 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Mon, 12 Dec 2022 18:32:19 +0800
Subject: [PATCH] initial v1.3.1
---
src/main/java/com/dji/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java b/src/main/java/com/dji/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java
index e40a341..4187d57 100644
--- a/src/main/java/com/dji/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java
+++ b/src/main/java/com/dji/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java
@@ -1,7 +1,8 @@
package com.dji.sample.manage.model.receiver;
-import com.dji.sample.manage.model.enums.StateSwitchReceiver;
+import com.dji.sample.manage.model.enums.StateSwitchEnum;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Objects;
@@ -10,6 +11,7 @@
* @version 1.3
* @date 2022/10/27
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ObstacleAvoidanceReceiver extends BasicDeviceProperty {
@@ -23,18 +25,14 @@
public boolean valid() {
boolean valid = Objects.nonNull(this.horizon) || Objects.nonNull(this.upside) || Objects.nonNull(this.downside);
- StateSwitchReceiver stateSwitch = new StateSwitchReceiver();
if (Objects.nonNull(this.horizon)) {
- stateSwitch.setValue(this.horizon);
- valid = stateSwitch.valid();
+ valid = StateSwitchEnum.find(horizon).isPresent();
}
if (Objects.nonNull(this.upside)) {
- stateSwitch.setValue(this.upside);
- valid &= stateSwitch.valid();
+ valid &= StateSwitchEnum.find(upside).isPresent();
}
if (Objects.nonNull(this.downside)) {
- stateSwitch.setValue(this.downside);
- valid &= stateSwitch.valid();
+ valid &= StateSwitchEnum.find(downside).isPresent();
}
return valid;
}
--
Gitblit v1.9.3