From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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..da402fe 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;
}
@@ -56,7 +54,7 @@
Objects.nonNull(obstacleAvoidance.getDownside()) &&
obstacleAvoidance.getDownside().intValue() != this.downside;
default:
- throw new RuntimeException("Property " + fieldName + " does not exist.");
+ throw new RuntimeException("属性 " + fieldName + "不存在");
}
}
}
--
Gitblit v1.9.3