From f4a2ce6f608049dc11f00908ee8a829060882de3 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期四, 25 十二月 2025 16:38:32 +0800
Subject: [PATCH] 优化了部分内容
---
src/dikuai/Dikuaiguanli.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/dikuai/Dikuaiguanli.java b/src/dikuai/Dikuaiguanli.java
index ce8aafb..a9b2a9a 100644
--- a/src/dikuai/Dikuaiguanli.java
+++ b/src/dikuai/Dikuaiguanli.java
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.Objects;
import java.util.Properties;
+import java.util.Locale;
import lujing.Lunjingguihua;
import lujing.MowingPathGenerationPage;
@@ -271,14 +272,17 @@
contentPanel.add(mowingPatternPanel);
contentPanel.add(Box.createRigidArea(new Dimension(0, 10)));
- // 鍓茶崏鏈哄壊鍒�瀹藉害
+ // 鍓茶崏鏈哄壊鍒�瀹藉害锛堝崟浣嶏細绫筹紝淇濈暀2浣嶅皬鏁帮級
String mowingBladeWidthValue = dikuai.getMowingBladeWidth();
String displayBladeWidth = "鏈缃�";
if (mowingBladeWidthValue != null && !"-1".equals(mowingBladeWidthValue) && !mowingBladeWidthValue.trim().isEmpty()) {
try {
double bladeWidthMeters = Double.parseDouble(mowingBladeWidthValue.trim());
- double bladeWidthCm = bladeWidthMeters * 100.0;
- displayBladeWidth = String.format("%.2f鍘樼背", bladeWidthCm);
+ // 濡傛灉鍊煎ぇ浜�100锛岃涓烘槸鍘樼背锛岄渶瑕佽浆鎹负绫�
+ if (bladeWidthMeters > 100) {
+ bladeWidthMeters = bladeWidthMeters / 100.0;
+ }
+ displayBladeWidth = String.format(Locale.US, "%.2fm", bladeWidthMeters);
} catch (NumberFormatException e) {
displayBladeWidth = "鏈缃�";
}
@@ -287,10 +291,18 @@
contentPanel.add(mowingBladeWidthPanel);
contentPanel.add(Box.createRigidArea(new Dimension(0, 10)));
+ // 鍓茶崏瀹藉害锛堝崟浣嶏細绫筹紝淇濈暀2浣嶅皬鏁帮級
String mowingWidthValue = dikuai.getMowingWidth();
String displayWidth = "鏈缃�";
if (mowingWidthValue != null && !"-1".equals(mowingWidthValue) && !mowingWidthValue.trim().isEmpty()) {
- displayWidth = mowingWidthValue + "鍘樼背";
+ try {
+ double widthCm = Double.parseDouble(mowingWidthValue.trim());
+ // 灏嗗帢绫宠浆鎹负绫筹紝淇濈暀2浣嶅皬鏁�
+ double widthMeters = widthCm / 100.0;
+ displayWidth = String.format(Locale.US, "%.2fm", widthMeters);
+ } catch (NumberFormatException e) {
+ displayWidth = "鏈缃�";
+ }
}
JPanel mowingWidthPanel = createCardInfoItem("鍓茶崏瀹藉害:", displayWidth);
contentPanel.add(mowingWidthPanel);
@@ -306,7 +318,7 @@
if (distanceMeters > 100) {
distanceMeters = distanceMeters / 100.0;
}
- displaySafetyDistance = String.format("%.2f绫�", distanceMeters);
+ displaySafetyDistance = String.format(Locale.US, "%.2fm", distanceMeters);
} catch (NumberFormatException e) {
displaySafetyDistance = "鏈缃�";
}
@@ -1037,7 +1049,7 @@
}
// 鎵撳紑杈圭晫缂栬緫椤甸潰
- Dikuanbianjipage page = new Dikuanbianjipage(owner, "鍦板潡杈圭晫绠＄悊椤甸潰", dikuai.getBoundaryCoordinates(), dikuai);
+ Dikuanbianjipage page = new Dikuanbianjipage(owner, "杈圭晫绠＄悊椤甸潰", dikuai.getBoundaryCoordinates(), dikuai);
page.setVisible(true);
// 鍏抽棴鍦板潡绠＄悊椤甸潰
@@ -1636,6 +1648,9 @@
return false;
}
+ // 鍚屾椂淇濆瓨鍒� dikuai.properties
+ saveFieldAndRefresh(dikuai, "obstacleCoordinates", obstaclePayload);
+
obstacleSummaryCache = loadObstacleSummaries();
boolean isCurrent = landNumber.equals(currentWorkLandNumber);
loadDikuaiData();
--
Gitblit v1.10.0