新增了边界距离显示优化了设置页面布局

张世豪

6 天以前 5d6d890cfd10466d5d14ff5177adcc888baaa0e4

新增了边界距离显示优化了设置页面布局

 set.properties

@@ -1,16 +1,17 @@
#Mower Configuration Properties - Updated
#Wed Dec 17 16:39:38 CST 2025
#Wed Dec 17 17:45:29 CST 2025
appVersion=-1
boundaryLengthVisible=false
currentWorkLandNumber=LAND1
cuttingWidth=200
firmwareVersion=-1
handheldMarkerId=
idleTrailDurationSeconds=60
mapScale=4.96
mapScale=6.72
mowerId=1872
serialAutoConnect=true
serialBaudRate=115200
serialPortName=COM15
simCardNumber=-1
viewCenterX=-30.79
viewCenterY=22.28
viewCenterX=-124.59
viewCenterY=52.20

 src/bianjie/BoundaryLengthDrawer.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,135 @@
package bianjie;

import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.text.DecimalFormat;
import java.util.List;

/**
 * è¾¹ç•Œé•¿åº¦ç»˜åˆ¶å™¨
 * ç”¨äºŽåœ¨åœ°å›¾ä¸Šæ˜¾ç¤ºåœ°å—边界相邻两点之间的距离
 */
public class BoundaryLengthDrawer {
    
    private static final Color LENGTH_TEXT_COLOR = new Color(80, 80, 80); // ç°è‰²æ–‡å­—，与缩放文字颜色一致
    // ä¸è®¾ç½®å­—体，使用Graphics2D的默认字体（与缩放文字一致）
    private static final DecimalFormat DISTANCE_FORMAT = new DecimalFormat("0.00");
    
    /**
     * è®¡ç®—两点之间的距离（米）
     * 
     * @param p1 ç¬¬ä¸€ä¸ªç‚¹
     * @param p2 ç¬¬äºŒä¸ªç‚¹
     * @return è·ç¦»ï¼ˆç±³ï¼‰ï¼Œä¿ç•™2位小数
     */
    public static double calculateDistance(Point2D.Double p1, Point2D.Double p2) {
        if (p1 == null || p2 == null) {
            return 0.0;
        }
        double dx = p2.x - p1.x;
        double dy = p2.y - p1.y;
        double distance = Math.sqrt(dx * dx + dy * dy);
        return distance;
    }
    
    /**
     * åœ¨åœ°å›¾ä¸Šç»˜åˆ¶è¾¹ç•Œé•¿åº¦
     * åœ¨ç›¸é‚»ä¸¤ä¸ªè¾¹ç•Œç‚¹çš„中点位置显示距离
     * 
     * @param g2d Graphics2D对象
     * @param boundary è¾¹ç•Œç‚¹åˆ—表
     * @param scale å½“前缩放比例
     * @param panelWidth é¢æ¿å®½åº¦
     * @param panelHeight é¢æ¿é«˜åº¦
     * @param translateX X方向平移量
     * @param translateY Y方向平移量
     */
    public static void drawBoundaryLengths(Graphics2D g2d, List<Point2D.Double> boundary, 
                                          double scale, int panelWidth, int panelHeight, 
                                          double translateX, double translateY) {
        if (boundary == null || boundary.size() < 2) {
            return;
        }
        
        // ä¿å­˜åŽŸå§‹å˜æ¢
        AffineTransform savedTransform = g2d.getTransform();
        
        // ä¿å­˜å½“前字体（使用默认字体，与缩放文字一致）
        Font originalFont = g2d.getFont();
        FontMetrics fontMetrics = g2d.getFontMetrics(originalFont);
        g2d.setColor(LENGTH_TEXT_COLOR);
        
        // åˆ¤æ–­è¾¹ç•Œæ˜¯å¦é—­åˆ
        int totalPoints = boundary.size();
        boolean closed = totalPoints > 2 && arePointsClose(
            boundary.get(0), 
            boundary.get(totalPoints - 1)
        );
        int effectiveCount = closed ? totalPoints - 1 : totalPoints;
        
        // ç»˜åˆ¶æ¯ç›¸é‚»ä¸¤ç‚¹ä¹‹é—´çš„距离
        for (int i = 0; i < effectiveCount; i++) {
            int nextIndex = (i + 1) % totalPoints;
            Point2D.Double p1 = boundary.get(i);
            Point2D.Double p2 = boundary.get(nextIndex);
            
            // è®¡ç®—距离（米）
            double distance = calculateDistance(p1, p2);
            if (distance <= 0) {
                continue; // è·³è¿‡è·ç¦»ä¸º0的点
            }
            String distanceText = DISTANCE_FORMAT.format(distance) + "m";
            
            // è®¡ç®—中点位置（世界坐标）
            double midX = (p1.x + p2.x) / 2.0;
            double midY = (p1.y + p2.y) / 2.0;
            
            // å°†ä¸–界坐标转换为屏幕坐标（使用与MapRenderer相同的转换公式）
            double screenX = (midX + translateX) * scale + panelWidth / 2.0;
            double screenY = (midY + translateY) * scale + panelHeight / 2.0;
            Point2D.Double screenPoint = new Point2D.Double(screenX, screenY);
            
            // ä¿å­˜å½“前变换（此时g2d已经是原始变换，不包含视图变换）
            AffineTransform currentTransform = g2d.getTransform();
            
            // ç¡®ä¿ä½¿ç”¨å±å¹•åæ ‡ç³»ç»Ÿï¼ˆä¸éšç¼©æ”¾å˜åŒ–）
            g2d.setTransform(new AffineTransform());
            
            // è®¡ç®—文字位置（居中显示）
            int textWidth = fontMetrics.stringWidth(distanceText);
            int textHeight = fontMetrics.getHeight();
            int textX = (int)(screenPoint.x - textWidth / 2.0);
            int textY = (int)(screenPoint.y + textHeight / 4.0);
            
            // ç»˜åˆ¶è·ç¦»æ–‡å­—
            g2d.drawString(distanceText, textX, textY);
            
            // æ¢å¤å˜æ¢
            g2d.setTransform(currentTransform);
        }
        
        // æ¢å¤åŽŸå§‹å˜æ¢
        g2d.setTransform(savedTransform);
    }
    
    /**
     * æ£€æŸ¥ä¸¤ä¸ªç‚¹æ˜¯å¦æŽ¥è¿‘（用于判断边界是否闭合）
     * 
     * @param a ç¬¬ä¸€ä¸ªç‚¹
     * @param b ç¬¬äºŒä¸ªç‚¹
     * @return å¦‚果两点距离小于阈值则返回true
     */
    private static boolean arePointsClose(Point2D.Double a, Point2D.Double b) {
        if (a == null || b == null) {
            return false;
        }
        double dx = a.x - b.x;
        double dy = a.y - b.y;
        double threshold = 0.05; // 5厘米的阈值
        return Math.hypot(dx, dy) <= threshold;
    }
}

 src/set/Sets.java

@@ -12,6 +12,7 @@

import java.awt.*;
import java.awt.event.*;
import java.awt.geom.RoundRectangle2D;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -21,14 +22,15 @@
 */
public class Sets extends JDialog {
    private static final long serialVersionUID = 1L;
    private static final int ROW_HEIGHT = 40;
    private static final int ROW_SPACING = 25;
    private static final int ROW_HEIGHT = 50;  // å¢žåŠ è¡Œé«˜ä»¥é€‚应分割线
    private static final int ITEM_PADDING = 16;  // åˆ—表项内边距
    
    // ä¸»é¢˜é¢œè‰²
    private final Color THEME_COLOR;
    private final Color BACKGROUND_COLOR = new Color(250, 250, 250);
    private final Color PANEL_BACKGROUND = new Color(255, 255, 255);
    private final Color BORDER_COLOR = new Color(220, 220, 220);
    private final Color BACKGROUND_COLOR = new Color(245, 247, 250);  // æ›´æŸ”和的浅灰色背景
    private final Color PANEL_BACKGROUND = new Color(255, 255, 255);  // ç™½è‰²é¢æ¿
    private final Color BORDER_COLOR = new Color(233, 236, 239);  // æµ…边框色
    private final Color DIVIDER_COLOR = new Color(233, 236, 239);  // åˆ†å‰²çº¿é¢œè‰²
    
    // è®¾ç½®é¡¹ç»„件
    private JLabel mowerIdLabel;
@@ -39,6 +41,7 @@
    private JLabel firmwareVersionLabel;
    private JLabel appVersionLabel;
    private JLabel idleTrailDurationLabel;
    private JLabel boundaryLengthVisibleLabel;
    
    private JButton mowerIdEditBtn;
    private JButton baseStationIdEditBtn;
@@ -78,30 +81,42 @@
        setLocationRelativeTo(getParent());
        setResizable(false);
        
        // åˆ›å»ºä¸»å†…容面板
        // åˆ›å»ºä¸»å†…容面板（使用更柔和的浅灰色背景）
        JPanel mainPanel = new JPanel();
        mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
        mainPanel.setLayout(new BorderLayout());
        mainPanel.setBackground(BACKGROUND_COLOR);
        mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
        
        // åˆ›å»ºè®¾ç½®é¡¹é¢æ¿
        // åˆ›å»ºè®¾ç½®é¡¹é¢æ¿ï¼ˆåœ†è§’白色面板）
        JPanel settingsPanel = createSettingsPanel();
        
        // æ·»åŠ ç»„件到主面板
        mainPanel.add(settingsPanel);
        mainPanel.add(Box.createVerticalGlue());
        mainPanel.add(settingsPanel, BorderLayout.CENTER);
        
        add(mainPanel, BorderLayout.CENTER);
    }
    
    private JPanel createSettingsPanel() {
        // åˆ›å»ºåœ†è§’白色面板容器
        JPanel container = new JPanel() {
            @Override
            protected void paintComponent(Graphics g) {
                Graphics2D g2d = (Graphics2D) g.create();
                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
                g2d.setColor(PANEL_BACKGROUND);
                // ç»˜åˆ¶åœ†è§’矩形背景
                g2d.fillRoundRect(0, 0, getWidth(), getHeight(), 16, 16);
                g2d.dispose();
            }
        };
        container.setLayout(new BorderLayout());
        container.setOpaque(false);
        
        // å†…容面板
        JPanel panel = new JPanel();
        panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
        panel.setBackground(PANEL_BACKGROUND);
        panel.setBorder(BorderFactory.createCompoundBorder(
            BorderFactory.createLineBorder(BORDER_COLOR),
            BorderFactory.createEmptyBorder(20, 20, 20, 20)
        ));
        panel.setOpaque(false);
        panel.setBorder(BorderFactory.createEmptyBorder(8, 0, 8, 0));
        
        // å‰²è‰æœºç¼–号
        JPanel mowerIdPanel = createSettingItemPanel("割草机编号", 
@@ -137,23 +152,45 @@
            formatIdleTrailDurationValue(), true);
        idleTrailDurationLabel = (JLabel) idleTrailPanel.getClientProperty("valueLabel");
        idleTrailEditBtn = (JButton) idleTrailPanel.getClientProperty("editButton");
        
        // æ˜¾ç¤ºè¾¹ç•Œè·ç¦»è®¾ç½®é¡¹
        JPanel boundaryLengthPanel = createBoundaryLengthPanel();
        boundaryLengthVisibleLabel = (JLabel) boundaryLengthPanel.getClientProperty("valueLabel");

        JPanel feedbackPanel = createFeedbackPanel();
        
        // APP版本
        JPanel appVersionPanel = createAppVersionPanel();
        
    addRowWithSpacing(panel, mowerIdPanel);
    addRowWithSpacing(panel, baseStationIdPanel);
        addRowWithSpacing(panel, handheldPanel);
    addRowWithSpacing(panel, simCardPanel);
    addRowWithSpacing(panel, baseStationSimPanel);
    addRowWithSpacing(panel, firmwarePanel);
    addRowWithSpacing(panel, idleTrailPanel);
    addRowWithSpacing(panel, feedbackPanel);
    addRowWithSpacing(panel, appVersionPanel);
        // æ·»åŠ è®¾ç½®é¡¹ï¼Œä½¿ç”¨åˆ†å‰²çº¿åˆ†éš”
        addSettingItem(panel, mowerIdPanel, true);
        addSettingItem(panel, baseStationIdPanel, true);
        addSettingItem(panel, handheldPanel, true);
        addSettingItem(panel, simCardPanel, true);
        addSettingItem(panel, baseStationSimPanel, true);
        addSettingItem(panel, firmwarePanel, true);
        addSettingItem(panel, idleTrailPanel, true);
        addSettingItem(panel, boundaryLengthPanel, true);
        addSettingItem(panel, feedbackPanel, true);
        addSettingItem(panel, appVersionPanel, false);  // æœ€åŽä¸€é¡¹ä¸åŠ åˆ†å‰²çº¿
        
        return panel;
        container.add(panel, BorderLayout.CENTER);
        return container;
    }
    
    /**
     * æ·»åŠ è®¾ç½®é¡¹ï¼ˆå¸¦åˆ†å‰²çº¿ï¼‰
     */
    private void addSettingItem(JPanel container, JPanel itemPanel, boolean showDivider) {
        container.add(itemPanel);
        if (showDivider) {
            // æ·»åŠ åˆ†å‰²çº¿
            JSeparator divider = new JSeparator();
            divider.setForeground(DIVIDER_COLOR);
            divider.setMaximumSize(new Dimension(Integer.MAX_VALUE, 1));
            divider.setAlignmentX(Component.LEFT_ALIGNMENT);
            container.add(divider);
        }
    }

    private String formatIdleTrailDurationValue() {
@@ -164,18 +201,15 @@
        return seconds + "秒";
    }

    private void addRowWithSpacing(JPanel container, JPanel row) {
        container.add(row);
        container.add(Box.createRigidArea(new Dimension(0, ROW_SPACING)));
    }
    
    private JPanel createSettingItemPanel(String title, String value, boolean editable) {
        JPanel panel = new JPanel(new GridBagLayout());
        panel.setBackground(PANEL_BACKGROUND);
        panel.setOpaque(false);  // é€æ˜ŽèƒŒæ™¯ï¼Œç”±å®¹å™¨ç»˜åˆ¶
        panel.setAlignmentX(Component.LEFT_ALIGNMENT);
        panel.setMaximumSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setPreferredSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setMinimumSize(new Dimension(0, ROW_HEIGHT));
        panel.setBorder(BorderFactory.createEmptyBorder(ITEM_PADDING, ITEM_PADDING, ITEM_PADDING, ITEM_PADDING));

        GridBagConstraints gbc = new GridBagConstraints();

@@ -221,11 +255,12 @@
    
    private JPanel createAppVersionPanel() {
        JPanel panel = new JPanel(new GridBagLayout());
        panel.setBackground(PANEL_BACKGROUND);
        panel.setOpaque(false);  // é€æ˜ŽèƒŒæ™¯
        panel.setAlignmentX(Component.LEFT_ALIGNMENT);
        panel.setMaximumSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setPreferredSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setMinimumSize(new Dimension(0, ROW_HEIGHT));
        panel.setBorder(BorderFactory.createEmptyBorder(ITEM_PADDING, ITEM_PADDING, ITEM_PADDING, ITEM_PADDING));

        GridBagConstraints gbc = new GridBagConstraints();

@@ -265,11 +300,12 @@

    private JPanel createFeedbackPanel() {
        JPanel panel = new JPanel(new GridBagLayout());
        panel.setBackground(PANEL_BACKGROUND);
        panel.setOpaque(false);  // é€æ˜ŽèƒŒæ™¯
        panel.setAlignmentX(Component.LEFT_ALIGNMENT);
        panel.setMaximumSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setPreferredSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setMinimumSize(new Dimension(0, ROW_HEIGHT));
        panel.setBorder(BorderFactory.createEmptyBorder(ITEM_PADDING, ITEM_PADDING, ITEM_PADDING, ITEM_PADDING));

        GridBagConstraints gbc = new GridBagConstraints();

@@ -297,6 +333,125 @@
        return panel;
    }
    
    /**
     * åˆ›å»ºæ˜¾ç¤ºè¾¹ç•Œè·ç¦»è®¾ç½®é¢æ¿
     */
    private JPanel createBoundaryLengthPanel() {
        JPanel panel = new JPanel(new GridBagLayout());
        panel.setOpaque(false);  // é€æ˜ŽèƒŒæ™¯
        panel.setAlignmentX(Component.LEFT_ALIGNMENT);
        panel.setMaximumSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setPreferredSize(new Dimension(Integer.MAX_VALUE, ROW_HEIGHT));
        panel.setMinimumSize(new Dimension(0, ROW_HEIGHT));
        panel.setBorder(BorderFactory.createEmptyBorder(ITEM_PADDING, ITEM_PADDING, ITEM_PADDING, ITEM_PADDING));

        GridBagConstraints gbc = new GridBagConstraints();

        JLabel titleLabel = new JLabel("显示边界距离");
        titleLabel.setFont(new Font("微软雅黑", Font.BOLD, 14));
        titleLabel.setForeground(Color.BLACK);
        titleLabel.setHorizontalAlignment(SwingConstants.RIGHT);
        gbc.gridx = 0;
        gbc.gridy = 0;
        gbc.weightx = 0;
        gbc.anchor = GridBagConstraints.EAST;
        gbc.insets = new Insets(0, 0, 0, 12);
        panel.add(titleLabel, gbc);

        boundaryLengthVisibleLabel = new JLabel(setData.isBoundaryLengthVisible() ? "已开启" : "已关闭");
        boundaryLengthVisibleLabel.setFont(new Font("微软雅黑", Font.PLAIN, 14));
        boundaryLengthVisibleLabel.setForeground(Color.DARK_GRAY);
        gbc = new GridBagConstraints();
        gbc.gridx = 1;
        gbc.gridy = 0;
        gbc.weightx = 1.0;
        gbc.anchor = GridBagConstraints.EAST;
        panel.add(boundaryLengthVisibleLabel, gbc);

        panel.putClientProperty("valueLabel", boundaryLengthVisibleLabel);

        // åˆ›å»ºåˆ‡æ¢æŒ‰é’®ï¼ˆä½¿ç”¨å›¾æ ‡ï¼‰
        JButton toggleBtn = createBoundaryLengthToggleButton();
        gbc = new GridBagConstraints();
        gbc.gridx = 2;
        gbc.gridy = 0;
        gbc.weightx = 0;
        gbc.anchor = GridBagConstraints.EAST;
        panel.add(toggleBtn, gbc);
        panel.putClientProperty("toggleButton", toggleBtn);

        return panel;
    }
    
    /**
     * åˆ›å»ºè¾¹ç•Œè·ç¦»æ˜¾ç¤ºåˆ‡æ¢æŒ‰é’®
     */
    private JButton createBoundaryLengthToggleButton() {
        JButton button = new JButton();
        button.setContentAreaFilled(false);
        button.setBorder(null);
        button.setFocusPainted(false);
        button.setCursor(new Cursor(Cursor.HAND_CURSOR));
        button.setPreferredSize(new Dimension(32, 32));
        button.setMinimumSize(new Dimension(32, 32));
        button.setMaximumSize(new Dimension(32, 32));
        
        updateBoundaryLengthToggleButton(button);
        
        button.addActionListener(e -> toggleBoundaryLengthVisible(button));
        
        return button;
    }
    
    /**
     * æ›´æ–°è¾¹ç•Œè·ç¦»åˆ‡æ¢æŒ‰é’®å›¾æ ‡
     */
    private void updateBoundaryLengthToggleButton(JButton button) {
        boolean isVisible = setData.isBoundaryLengthVisible();
        try {
            String iconPath = isVisible ? "image/open.png" : "image/close.png";
            ImageIcon icon = new ImageIcon(iconPath);
            if (icon.getIconWidth() > 0) {
                Image scaledImage = icon.getImage().getScaledInstance(32, 32, Image.SCALE_SMOOTH);
                button.setIcon(new ImageIcon(scaledImage));
                button.setText(null);
            } else {
                button.setIcon(null);
                button.setText(isVisible ? "开" : "关");
            }
        } catch (Exception e) {
            button.setIcon(null);
            button.setText(isVisible ? "开" : "关");
            System.err.println("无法加载边界距离图标: " + e.getMessage());
        }
    }
    
    /**
     * åˆ‡æ¢è¾¹ç•Œè·ç¦»æ˜¾ç¤ºçŠ¶æ€
     */
    private void toggleBoundaryLengthVisible(JButton button) {
        boolean newValue = !setData.isBoundaryLengthVisible();
        setData.setBoundaryLengthVisible(newValue);
        
        // ä¿å­˜åˆ°é…ç½®æ–‡ä»¶
        setData.updateProperty("boundaryLengthVisible", String.valueOf(newValue));
        
        // æ›´æ–°UI
        if (boundaryLengthVisibleLabel != null) {
            boundaryLengthVisibleLabel.setText(newValue ? "已开启" : "已关闭");
        }
        updateBoundaryLengthToggleButton(button);
        
        // é€šçŸ¥MapRenderer更新
        Shouye shouye = Shouye.getInstance();
        if (shouye != null) {
            MapRenderer renderer = shouye.getMapRenderer();
            if (renderer != null) {
                renderer.setBoundaryLengthVisible(newValue);
            }
        }
    }
    
    private JButton createEditButton() {
        JButton button = new JButton();
        try {
@@ -412,6 +567,19 @@
            idleTrailDurationLabel.setText(formatIdleTrailDurationValue());
        }
        
        // æ›´æ–°æ˜¾ç¤ºè¾¹ç•Œè·ç¦»çŠ¶æ€
        if (boundaryLengthVisibleLabel != null) {
            boundaryLengthVisibleLabel.setText(setData.isBoundaryLengthVisible() ? "已开启" : "已关闭");
        }
        // æ›´æ–°åˆ‡æ¢æŒ‰é’®å›¾æ ‡
        JPanel boundaryLengthPanel = (JPanel) boundaryLengthVisibleLabel.getParent();
        if (boundaryLengthPanel != null) {
            JButton toggleBtn = (JButton) boundaryLengthPanel.getClientProperty("toggleButton");
            if (toggleBtn != null) {
                updateBoundaryLengthToggleButton(toggleBtn);
            }
        }
        
        // æ›´æ–°APP版本显示
        if (appVersionLabel != null) {
            appVersionLabel.setText(setData.getAppVersion() != null ? 

 src/set/Setsys.java

@@ -13,6 +13,7 @@
    private String firmwareVersion;
    private String appVersion;
    private int idleTrailDurationSeconds = DEFAULT_IDLE_TRAIL_DURATION_SECONDS;
    private boolean boundaryLengthVisible = false;  // é»˜è®¤å…³é—­æ˜¾ç¤ºè¾¹ç•Œè·ç¦»
    
    private static final String PROPERTIES_FILE = "set.properties";

@@ -86,6 +87,14 @@
    public void setIdleTrailDurationSeconds(int seconds) {
        this.idleTrailDurationSeconds = sanitizeIdleTrailDuration(String.valueOf(seconds));
    }
    
    public boolean isBoundaryLengthVisible() {
        return boundaryLengthVisible;
    }
    
    public void setBoundaryLengthVisible(boolean visible) {
        this.boundaryLengthVisible = visible;
    }

    /**
     * åˆå§‹åŒ–方法 - ä»Žproperties文件读取数据
@@ -104,6 +113,8 @@
            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);
                        
        } catch (FileNotFoundException e) {           
            // æ–‡ä»¶ä¸å­˜åœ¨æ—¶ï¼Œè®¾ç½®æ‰€æœ‰å±žæ€§ä¸ºnull
@@ -145,6 +156,9 @@
                this.idleTrailDurationSeconds = durationSeconds;
                value = String.valueOf(durationSeconds);
                break;
            case "boundaryLengthVisible":
                this.boundaryLengthVisible = "true".equalsIgnoreCase(value);
                break;
            case "mapScale":
                // mapScale不需要在内存中存储，直接更新到文件
                break;
@@ -213,6 +227,7 @@
        this.firmwareVersion = null;
        this.appVersion = null;
        this.idleTrailDurationSeconds = DEFAULT_IDLE_TRAIL_DURATION_SECONDS;
        this.boundaryLengthVisible = false;  // é»˜è®¤å…³é—­
    }

    /**

 src/zhuye/MapRenderer.java

@@ -74,6 +74,7 @@
    private String boundaryName;
    private boolean boundaryPointsVisible;
    private boolean obstaclePointsVisible;
    private boolean boundaryLengthVisible = false;  // æ˜¯å¦æ˜¾ç¤ºè¾¹ç•Œè·ç¦»ï¼Œé»˜è®¤å…³é—­
    private double boundaryPointSizeScale = 1.0d;
    private boolean previewSizingEnabled;
    private String currentBoundaryLandNumber;
@@ -381,7 +382,8 @@
            Obstacledraw.drawObstacles(g2d, currentObstacles, scale, selectedObstacleName);
        }

        if (boundaryPointsVisible && hasBoundary) {
        // æ˜¾ç¤ºè¾¹ç•Œç‚¹ï¼ˆå¦‚果边界点可见，或者边界距离可见）
        if ((boundaryPointsVisible || boundaryLengthVisible) && hasBoundary) {
            // é¢„览模式下显示序号
            if (previewSizingEnabled) {
                drawBoundaryPointsWithNumbers(g2d, currentBoundary, scale);
@@ -397,7 +399,7 @@
                );
            }
        }

        
        // ç»˜åˆ¶éšœç¢ç‰©åæ ‡ç‚¹ï¼ˆå¸¦åºå·ï¼‰
        if (obstaclePointsVisible && hasObstacles) {
            drawObstaclePointsWithNumbers(g2d, currentObstacles, scale);
@@ -413,9 +415,18 @@

        drawMower(g2d);
        
        // ä¿å­˜å½“前变换（包含视图变换）用于坐标转换
        AffineTransform currentTransformForLength = g2d.getTransform();
        
        // æ¢å¤åŽŸå§‹å˜æ¢
        g2d.setTransform(originalTransform);
        
        // ç»˜åˆ¶è¾¹ç•Œé•¿åº¦ï¼ˆå¦‚果启用）- åœ¨æ¢å¤åŽŸå§‹å˜æ¢åŽç»˜åˆ¶
        if (boundaryLengthVisible && hasBoundary) {
            bianjie.BoundaryLengthDrawer.drawBoundaryLengths(g2d, currentBoundary, scale, 
                visualizationPanel.getWidth(), visualizationPanel.getHeight(), translateX, translateY);
        }
        
        // ç»˜åˆ¶è§†å›¾ä¿¡æ¯
        drawViewInfo(g2d);
    }
@@ -1690,14 +1701,10 @@
            return;
        }
        
        // è®¾ç½®ç‚¹çš„大小（随缩放变化）
        // è®¾ç½®ç‚¹çš„大小（与边界线宽度一致）
        // è¾¹ç•Œçº¿å®½åº¦ï¼š3 / Math.max(0.5, scale)
        double scaleFactor = Math.max(0.5, scale);
        double clampedScale = boundaryPointSizeScale * (previewSizingEnabled ? PREVIEW_BOUNDARY_MARKER_SCALE : 1.0d);
        if (!Double.isFinite(clampedScale) || clampedScale <= 0.0d) {
            clampedScale = 1.0d;
        }
        double minimumDiameter = clampedScale < 1.0 ? 0.5 : 1.0;
        double markerDiameter = Math.max(minimumDiameter, (10.0 / scaleFactor) * 0.2 * clampedScale);
        double markerDiameter = 3.0 / scaleFactor;  // ä¸Žè¾¹ç•Œçº¿å®½åº¦ä¸€è‡´
        double markerRadius = markerDiameter / 2.0;
        
        // è®¾ç½®å­—体（与障碍物序号一致，不随缩放变化）
@@ -2370,6 +2377,23 @@
        this.obstaclePointsVisible = visible;
        visualizationPanel.repaint();
    }
    
    /**
     * è®¾ç½®æ˜¯å¦æ˜¾ç¤ºè¾¹ç•Œè·ç¦»
     */
    public void setBoundaryLengthVisible(boolean visible) {
        boundaryLengthVisible = visible;
        if (visualizationPanel != null) {
            visualizationPanel.repaint();
        }
    }
    
    /**
     * èŽ·å–是否显示边界距离
     */
    public boolean isBoundaryLengthVisible() {
        return boundaryLengthVisible;
    }

    public void setBoundaryPointSizeScale(double sizeScale) {
        double normalized = (Double.isFinite(sizeScale) && sizeScale > 0.0d) ? sizeScale : 1.0d;

 src/zhuye/Shouye.java

@@ -452,6 +452,11 @@
            }
        }
        mapRenderer.setIdleTrailDurationSeconds(durationSeconds);
		
        // åº”用边界距离显示设置
        Setsys setsys = new Setsys();
        setsys.initializeFromProperties();
        mapRenderer.setBoundaryLengthVisible(setsys.isBoundaryLengthVisible());
    }

    private void createHeaderPanel() {

 src/zhuye/pointandnumber.java

@@ -34,9 +34,8 @@
        }

    double scaleFactor = Math.max(0.5, scale); // é˜²æ­¢è¿‡å°ç¼©æ”¾
    double clampedScale = diameterScale > 0 ? diameterScale : 1.0; // é˜²æ­¢éžæ³•ç¼©æ”¾
    double minimumDiameter = clampedScale < 1.0 ? 0.5 : 1.0; // ç¼©å°æ—¶å…è®¸æ›´å°çš„最小值
    double markerDiameter = Math.max(minimumDiameter, (10.0 / scaleFactor) * 0.2 * clampedScale); // æç‚¹ç›´å¾„
    // è¾¹ç•Œç‚¹ç›´å¾„与边界线宽度一致：3 / Math.max(0.5, scale)
    double markerDiameter = 3.0 / scaleFactor; // æç‚¹ç›´å¾„（与边界线宽度一致）
        double markerRadius = markerDiameter / 2.0; // åŠå¾„

        for (int i = 0; i < effectiveCount; i++) { // éåŽ†æœ‰æ•ˆç‚¹