From 69b40096cb0ae965f2a3e92672b880edfe7d04d2 Mon Sep 17 00:00:00 2001
From: 826220679@qq.com <826220679@qq.com>
Date: 星期六, 27 十二月 2025 21:14:09 +0800
Subject: [PATCH] 优化了登录页面
---
src/set/Setsys.java | 70 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/src/set/Setsys.java b/src/set/Setsys.java
index 2523a0f..ebdccbc 100644
--- a/src/set/Setsys.java
+++ b/src/set/Setsys.java
@@ -13,6 +13,9 @@
private String firmwareVersion;
private String appVersion;
private int idleTrailDurationSeconds = DEFAULT_IDLE_TRAIL_DURATION_SECONDS;
+ private boolean boundaryLengthVisible = false; // 榛樿鍏抽棴鏄剧ず杈圭晫璺濈
+ private boolean measurementModeEnabled = false; // 榛樿鍏抽棴娴嬮噺妯″紡
+ private boolean manualBoundaryDrawingMode = false; // 榛樿鍏抽棴鎵嬪姩缁樺埗杈圭晫妯″紡
private static final String PROPERTIES_FILE = "set.properties";
@@ -86,6 +89,30 @@
public void setIdleTrailDurationSeconds(int seconds) {
this.idleTrailDurationSeconds = sanitizeIdleTrailDuration(String.valueOf(seconds));
}
+
+ public boolean isBoundaryLengthVisible() {
+ return boundaryLengthVisible;
+ }
+
+ public void setBoundaryLengthVisible(boolean visible) {
+ this.boundaryLengthVisible = visible;
+ }
+
+ public boolean isMeasurementModeEnabled() {
+ return measurementModeEnabled;
+ }
+
+ public void setMeasurementModeEnabled(boolean enabled) {
+ this.measurementModeEnabled = enabled;
+ }
+
+ public boolean isManualBoundaryDrawingMode() {
+ return manualBoundaryDrawingMode;
+ }
+
+ public void setManualBoundaryDrawingMode(boolean enabled) {
+ this.manualBoundaryDrawingMode = enabled;
+ }
/**
* 鍒濆鍖栨柟娉� - 浠巔roperties鏂囦欢璇诲彇鏁版嵁
@@ -104,6 +131,12 @@
this.firmwareVersion = "-1".equals(props.getProperty("firmwareVersion")) ? null : props.getProperty("firmwareVersion");
this.appVersion = "-1".equals(props.getProperty("appVersion")) ? null : props.getProperty("appVersion");
this.idleTrailDurationSeconds = sanitizeIdleTrailDuration(props.getProperty("idleTrailDurationSeconds"));
+ String boundaryLengthVisibleStr = props.getProperty("boundaryLengthVisible");
+ this.boundaryLengthVisible = "true".equalsIgnoreCase(boundaryLengthVisibleStr);
+ String measurementModeEnabledStr = props.getProperty("measurementModeEnabled");
+ this.measurementModeEnabled = "true".equalsIgnoreCase(measurementModeEnabledStr);
+ String manualBoundaryDrawingModeStr = props.getProperty("manualBoundaryDrawingMode");
+ this.manualBoundaryDrawingMode = "true".equalsIgnoreCase(manualBoundaryDrawingModeStr);
} catch (FileNotFoundException e) {
// 鏂囦欢涓嶅瓨鍦ㄦ椂锛岃缃墍鏈夊睘鎬т负null
@@ -145,9 +178,21 @@
this.idleTrailDurationSeconds = durationSeconds;
value = String.valueOf(durationSeconds);
break;
+ case "boundaryLengthVisible":
+ this.boundaryLengthVisible = "true".equalsIgnoreCase(value);
+ break;
+ case "measurementModeEnabled":
+ this.measurementModeEnabled = "true".equalsIgnoreCase(value);
+ break;
+ case "manualBoundaryDrawingMode":
+ this.manualBoundaryDrawingMode = "true".equalsIgnoreCase(value);
+ break;
+ case "mapScale":
+ // mapScale涓嶉渶瑕佸湪鍐呭瓨涓瓨鍌紝鐩存帴鏇存柊鍒版枃浠�
+ break;
default:
- System.err.println("鏈煡鐨勫睘鎬у悕: " + propertyName);
- return false;
+ // 瀵逛簬鍏朵粬灞炴�э紝涔熷厑璁哥洿鎺ユ洿鏂板埌鏂囦欢锛堜笉鎵撳嵃閿欒锛�
+ break;
}
// 鏇存柊properties鏂囦欢
@@ -173,7 +218,6 @@
// 鍐欏洖鏂囦欢
try (FileOutputStream output = new FileOutputStream(PROPERTIES_FILE)) {
props.store(output, "Mower Configuration Properties - Updated");
- System.out.println("灞炴�� " + propertyName + " 宸叉洿鏂颁负: " + value);
return true;
} catch (IOException e) {
System.err.println("鏇存柊灞炴�ф枃浠跺け璐�: " + e.getMessage());
@@ -211,20 +255,24 @@
this.firmwareVersion = null;
this.appVersion = null;
this.idleTrailDurationSeconds = DEFAULT_IDLE_TRAIL_DURATION_SECONDS;
+ this.boundaryLengthVisible = false; // 榛樿鍏抽棴
+ this.measurementModeEnabled = false; // 榛樿鍏抽棴娴嬮噺妯″紡
+ this.manualBoundaryDrawingMode = false; // 榛樿鍏抽棴鎵嬪姩缁樺埗杈圭晫妯″紡
}
/**
* 鏄剧ず褰撳墠鎵�鏈夊睘鎬у��
*/
public void displayProperties() {
- System.out.println("褰撳墠灞炴�у��:");
- System.out.println("mowerId: " + (mowerId != null ? mowerId : "鏈缃�"));
- System.out.println("cuttingWidth: " + (cuttingWidth != null ? cuttingWidth : "鏈缃�"));
- System.out.println("simCardNumber: " + (simCardNumber != null ? simCardNumber : "鏈缃�"));
- System.out.println("handheldMarkerId: " + (handheldMarkerId != null ? handheldMarkerId : "鏈缃�"));
- System.out.println("firmwareVersion: " + (firmwareVersion != null ? firmwareVersion : "鏈缃�"));
- System.out.println("appVersion: " + (appVersion != null ? appVersion : "鏈缃�"));
- System.out.println("idleTrailDurationSeconds: " + idleTrailDurationSeconds);
+ // 鏄剧ず灞炴�у姛鑳藉凡绂佺敤
+ }
+
+ /**
+ * 鑾峰彇鍓茶崏鏈虹紪鍙�
+ * @return 鍓茶崏鏈虹紪鍙�
+ */
+ public static String getMowerIdValue() {
+ return getPropertyValue("mowerId");
}
// 鏍规嵁set.properties涓殑閿悕鑾峰彇瀵瑰簲鐨勫�硷紝娌℃湁鎴栦负-1鏃惰繑鍥瀗ull
--
Gitblit v1.10.0