From 077d9291fd27df0510e416c1ba7b36a495343641 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 12 Oct 2023 11:12:01 +0800
Subject: [PATCH] 英文改中文
---
src/main/java/com/dji/sample/control/model/enums/DrcModeReasonEnum.java | 12 +++---
/dev/null | 74 -------------------------------------
src/main/java/com/dji/sample/control/model/enums/FlyToStatusEnum.java | 8 ++--
src/main/java/com/dji/sample/control/model/enums/DrcStatusErrorEnum.java | 14 +++---
src/main/java/com/dji/sample/control/model/enums/TakeoffStatusEnum.java | 12 +++---
5 files changed, 23 insertions(+), 97 deletions(-)
diff --git a/src/main/java/com/dji/sample/control/model/enums/DrcModeReasonEnum.java b/src/main/java/com/dji/sample/control/model/enums/DrcModeReasonEnum.java
index ceb20ac..4ee682d 100644
--- a/src/main/java/com/dji/sample/control/model/enums/DrcModeReasonEnum.java
+++ b/src/main/java/com/dji/sample/control/model/enums/DrcModeReasonEnum.java
@@ -11,17 +11,17 @@
*/
public enum DrcModeReasonEnum {
- UNKNOWN(-1, "unknown"),
+ UNKNOWN(-1, "未知"),
- RC_LOST(0, "The remote controller is lost."),
+ RC_LOST(0, "远程控制器丢失"),
- BATTERY_LOW_GO_HOME(1, "Due to low battery, the drone automatically returned home."),
+ BATTERY_LOW_GO_HOME(1, "由于电池电量不足，无人机自动返回"),
- BATTERY_SUPER_LOW_LANDING(2, "Due to the serious low battery, the drone landed automatically."),
+ BATTERY_SUPER_LOW_LANDING(2, "由于电池电量严重不足，无人机自动着陆"),
- NEAR_BOUNDARY(3, "The drone is near a not-fly zone."),
+ NEAR_BOUNDARY(3, "无人机在禁飞区附近"),
- RC_AUTHORITY(4, "The remote controller grabs control authority.");
+ RC_AUTHORITY(4, "远程控制器获取控制权限");
int val;
diff --git a/src/main/java/com/dji/sample/control/model/enums/DrcStatusErrorEnum.java b/src/main/java/com/dji/sample/control/model/enums/DrcStatusErrorEnum.java
index 1cee634..e96db8c 100644
--- a/src/main/java/com/dji/sample/control/model/enums/DrcStatusErrorEnum.java
+++ b/src/main/java/com/dji/sample/control/model/enums/DrcStatusErrorEnum.java
@@ -12,19 +12,19 @@
*/
public enum DrcStatusErrorEnum implements IErrorInfo {
- SUCCESS(0, "success"),
+ SUCCESS(0, "成功"),
- MQTT_ERR(514300, "The mqtt connection error."),
+ MQTT_ERR(514300, "mqtt连接错误"),
- HEARTBEAT_TIMEOUT(514301, "The heartbeat times out and the dock disconnects."),
+ HEARTBEAT_TIMEOUT(514301, "心跳超时，连接断开"),
- MQTT_CERTIFICATE_ERR(514302, "The mqtt certificate is abnormal and the connection fails."),
+ MQTT_CERTIFICATE_ERR(514302, "mqtt证书异常，连接失败"),
- MQTT_LOST(514303, "The dock network is abnormal and the mqtt connection is lost."),
+ MQTT_LOST(514303, "机场网络异常，mqtt连接丢失"),
- MQTT_REFUSE(514304, "The dock connection to mqtt server was refused."),
+ MQTT_REFUSE(514304, "到mqtt服务器的机场连接被拒绝"),
- UNKNOWN(-1, "Unknown");
+ UNKNOWN(-1, "未知");
String msg;
diff --git a/src/main/java/com/dji/sample/control/model/enums/FlyToStatusEnum.java b/src/main/java/com/dji/sample/control/model/enums/FlyToStatusEnum.java
index 4291769..644b5b9 100644
--- a/src/main/java/com/dji/sample/control/model/enums/FlyToStatusEnum.java
+++ b/src/main/java/com/dji/sample/control/model/enums/FlyToStatusEnum.java
@@ -11,13 +11,13 @@
*/
public enum FlyToStatusEnum {
- WAYLINE_PROGRESS("wayline_progress", "The FlyTo job is in progress."),
+ WAYLINE_PROGRESS("wayline_progress", "飞向目标作业正在进行中"),
- WAYLINE_FAILED("wayline_failed", "The Fly To task execution failed."),
+ WAYLINE_FAILED("wayline_failed", "飞向目标作业执行失败"),
- WAYLINE_OK("wayline_ok", "The FlyTo job executed successfully."),
+ WAYLINE_OK("wayline_ok", "飞向目标作业执行成功"),
- WAYLINE_CANCEL("wayline_cancel", "The FlyTo job is closed.");
+ WAYLINE_CANCEL("wayline_cancel", "飞向目标作业取消");
String status;
diff --git a/src/main/java/com/dji/sample/control/model/enums/TakeoffStatusEnum.java b/src/main/java/com/dji/sample/control/model/enums/TakeoffStatusEnum.java
index 94ae3de..31758e3 100644
--- a/src/main/java/com/dji/sample/control/model/enums/TakeoffStatusEnum.java
+++ b/src/main/java/com/dji/sample/control/model/enums/TakeoffStatusEnum.java
@@ -11,17 +11,17 @@
*/
public enum TakeoffStatusEnum {
- TASK_READY("task_ready", "The drone is preparing to take off."),
+ TASK_READY("task_ready", "无人机正准备起飞"),
- WAYLINE_PROGRESS("wayline_progress", "The drone is taking off."),
+ WAYLINE_PROGRESS("wayline_progress", "无人机正在起飞"),
- WAYLINE_FAILED("wayline_failed", "The drone failed to take off."),
+ WAYLINE_FAILED("wayline_failed", "无人机起飞失败"),
- WAYLINE_OK("wayline_ok", "The drone took off successfully."),
+ WAYLINE_OK("wayline_ok", "无人机起飞成功"),
- WAYLINE_CANCEL("wayline_cancel", "The drone takeoff job has been cancelled."),
+ WAYLINE_CANCEL("wayline_cancel", "无人机起飞作业已被取消"),
- TASK_FINISH("task_finish", "The drone takeoff job is completed.");
+ TASK_FINISH("task_finish", "无人机起飞工作完成");
String status;
diff --git a/src/main/java/com/dji/sample/wayline/utils/JobTimeUtils.java b/src/main/java/com/dji/sample/wayline/utils/JobTimeUtils.java
deleted file mode 100644
index 4b7f424..0000000
--- a/src/main/java/com/dji/sample/wayline/utils/JobTimeUtils.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.dji.sample.wayline.utils;
-
-import com.dji.sample.wayline.model.entity.WaylineJobEntity;
-import com.dji.sample.wayline.model.enums.WaylineRepFreTypeEnum;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 处理任务时间
- */
-public class JobTimeUtils {
-
- public static void getJobTime(WaylineJobEntity waylineJobEntity) {
- //获取开始时间
-
- if (waylineJobEntity.getRepFreType() == WaylineRepFreTypeEnum.DAY.getVal()) {
- //日
-
-
- } else if (waylineJobEntity.getRepFreType() == WaylineRepFreTypeEnum.WEEK.getVal()) {
- //周
-
-
- } else if (waylineJobEntity.getRepFreType() == WaylineRepFreTypeEnum.MONTH.getVal()) {
- //月
-
-
- } else {
-
- }
-
-
- }
-
-
- /**
- * 根据开始时间和结束时间获取日期列表
- * @param beginTime
- * @param endTime
- * @return
- */
- public static List<LocalDate> getDateBetweenTime(Long beginTime,Long endTime){
- //开始日期
- LocalDate beginDate = LocalDate.ofInstant(Instant.ofEpochMilli(beginTime), ZoneId.systemDefault());
- //结束日期
- LocalDate endDate =LocalDate.ofInstant(Instant.ofEpochMilli(endTime), ZoneId.systemDefault());
-
- LocalDate date = beginDate;
- List<LocalDate> dates = new ArrayList<>();
- //遍历日期
- while (!date.equals(endDate.plusDays(1))) {
- dates.add(date);
- date = date.plusDays(1);
- }
- return dates;
- }
-
-
-// public static void main(String[] args) {
-// LocalTime localTime = LocalTime.ofInstant(Instant.ofEpochSecond(1696761468L), ZoneId.systemDefault());
-// DateFormat dateFormat = new SimpleDateFormat("HH:mm");
-// String format = localTime.format(DateTimeFormatter.ofPattern("HH:mm"));
-// System.out.println(format);
-// }
-}
--
Gitblit v1.9.3