From 1175f5fbe8fd832943880bfc37c0e2a451a0688a Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期四, 25 十二月 2025 19:34:38 +0800
Subject: [PATCH] 删除了几个类优化了路径生成的逻辑
---
src/zhangaiwu/AddDikuai.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/zhangaiwu/AddDikuai.java b/src/zhangaiwu/AddDikuai.java
index 65e96d6..24452c3 100644
--- a/src/zhangaiwu/AddDikuai.java
+++ b/src/zhangaiwu/AddDikuai.java
@@ -23,7 +23,7 @@
import dikuai.Gecaokuanjisuan;
import dikuai.Gecaoanquanjuli;
import bianjie.Bianjieyouhuatoxy;
-import lujing.Lunjingguihua;
+
import lujing.Qufenxingzhuang;
import lujing.AoxinglujingNoObstacle;
import lujing.YixinglujingNoObstacle;
@@ -1469,17 +1469,10 @@
YixinglujingNoObstacle.planPath(boundaryCoords, widthMetersStr, safetyDistanceMetersStr);
plannedPath = formatYixingPathSegments(segments);
} else {
- // 鏃犳硶鍒ゆ柇鍦板潡绫诲瀷锛屼娇鐢ㄩ粯璁ゆ柟娉曚綔涓哄悗澶�
- JOptionPane.showMessageDialog(this, "鏃犳硶鍒ゆ柇鍦板潡绫诲瀷锛屼娇鐢ㄩ粯璁よ矾寰勭敓鎴愭柟娉�",
+ // 鏃犳硶鍒ゆ柇鍦板潡绫诲瀷
+ JOptionPane.showMessageDialog(this, "鏃犳硶鍒ゆ柇鍦板潡绫诲瀷锛屾棤娉曠敓鎴愯矾寰�",
"鎻愮ず", JOptionPane.WARNING_MESSAGE);
- String plannerMode = resolvePlannerMode(patternDisplay);
- plannedPath = Lunjingguihua.generatePathFromStrings(
- boundaryCoords,
- obstacleCoords != null ? obstacleCoords : "",
- widthMetersStr,
- safetyDistanceMetersStr,
- plannerMode
- );
+ plannedPath = "";
}
if (!isMeaningfulValue(plannedPath)) {
@@ -2684,6 +2677,25 @@
private String generateNewLandNumber() {
Map<String, Dikuai> existing = Dikuai.getAllDikuai();
+
+ // 鑾峰彇鍓茶崏鏈虹紪鍙�
+ String mowerId = Setsys.getPropertyValue("mowerId");
+
+ // 濡傛灉鏈夊壊鑽夋満缂栧彿锛屼娇鐢� 缂栧彿+涓や綅鑷鏁板瓧 鏍煎紡
+ if (mowerId != null && !mowerId.trim().isEmpty() && !"-1".equals(mowerId)) {
+ int attempt = 1;
+ while (true) {
+ // 鏍煎紡鍖栦负涓や綅鏁板瓧锛屽 01, 02, ...
+ String suffix = String.format("%02d", attempt);
+ String candidate = mowerId + suffix;
+ if (!existing.containsKey(candidate)) {
+ return candidate;
+ }
+ attempt++;
+ }
+ }
+
+ // 濡傛灉娌℃湁鍓茶崏鏈虹紪鍙凤紝鍥為��鍒伴粯璁ら�昏緫
int attempt = 1;
while (true) {
String candidate = "LAND" + attempt;
--
Gitblit v1.10.0