优化了首页

张世豪

13 小时以前 a541fbdc8812337de120aad3792a2033a5dd7afe

 src/zhuye/Shouye.java

@@ -113,10 +113,13 @@
   private final Consumer<String> serialLineListener = line -> {
      SwingUtilities.invokeLater(() -> {
         updateDataPacketCountLabel();
         // 如果收到$GNGGA数据，立即更新拖尾
         if (line != null && line.trim().startsWith("$GNGGA")) {
            if (mapRenderer != null && !pathPreviewActive) {
               mapRenderer.forceUpdateIdleMowerTrail();
         // 如果收到GGA数据，立即更新拖尾
         if (line != null) {
            String trimmed = line.trim();
            if (trimmed.startsWith("$GNGGA") || trimmed.startsWith("$GPGGA") || trimmed.startsWith("$GBGGA")) {
               if (mapRenderer != null && !pathPreviewActive) {
                  mapRenderer.forceUpdateIdleMowerTrail();
               }
            }
         }
      });
@@ -131,10 +134,8 @@
   private Runnable pathPreviewReturnAction;
   private JButton settingsReturnButton;  // 返回系统设置页面的悬浮按钮
   private JButton saveManualBoundaryButton;  // 保存手动绘制边界的按钮
   private JButton toggleBoundaryDisplayButton;  // 切换边界显示按钮（只显示原始边界/显示全部）
   private String previewRestoreLandNumber;
   private String previewRestoreLandName;
   private Dikuai currentBoundaryPreviewDikuai;  // 当前边界预览的地块引用
   private boolean drawingPaused;
   private ImageIcon pauseIcon;
   private ImageIcon pauseActiveIcon;
@@ -577,9 +578,9 @@
            if (setsys.isManualBoundaryDrawingMode()) {
               setsys.setManualBoundaryDrawingMode(false);
               setsys.updateProperty("manualBoundaryDrawingMode", "false");
               // 关闭MapRenderer中的手动绘制边界模式（这会清除鼠标位置和边界点）
               // 清空手动绘制的边界点
               if (mapRenderer != null) {
                  mapRenderer.setManualBoundaryDrawingMode(false);
                  mapRenderer.clearManualBoundaryPoints();
               }
               modeChanged = true;
            }
@@ -842,7 +843,7 @@
      try {
         ImageIcon settingsIcon = new ImageIcon("image/sets.png");
         // 调整图片大小以适应按钮
         Image scaledImage = settingsIcon.getImage().getScaledInstance(30, 30, Image.SCALE_SMOOTH);
         Image scaledImage = settingsIcon.getImage().getScaledInstance(25, 25, Image.SCALE_SMOOTH);
         settingsBtn.setIcon(new ImageIcon(scaledImage));
      } catch (Exception e) {
         // 如果图片加载失败，使用默认文本
@@ -1208,15 +1209,15 @@
      controlPanel = new JPanel(new BorderLayout());
      controlPanel.setBackground(PANEL_BACKGROUND);
      controlPanel.setBorder(BorderFactory.createEmptyBorder(15, 20, 15, 20));
      controlPanel.setPreferredSize(new Dimension(0, 100));
      controlPanel.setPreferredSize(new Dimension(0, 80));

      JPanel buttonPanel = new JPanel(new GridLayout(1, 2, 20, 0));
      buttonPanel.setBackground(PANEL_BACKGROUND);

      startBtn = createControlButton("暂停", THEME_COLOR);
      startBtn = createControlButton("暂停割草", THEME_COLOR);
      updateStartButtonAppearance();

      stopBtn = createControlButton("结束", Color.ORANGE);
      stopBtn = createControlButton("结束割草", Color.ORANGE);
      updateStopButtonIcon();

      buttonPanel.add(startBtn);
@@ -1322,7 +1323,8 @@
      button.setFont(new Font("微软雅黑", Font.BOLD, 16));
      button.setBackground(color);
      button.setForeground(Color.WHITE);
      button.setBorder(BorderFactory.createEmptyBorder(15, 0, 15, 0));
      button.setPreferredSize(new Dimension(0, 50));
      button.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
      button.setFocusPainted(false);

      // 悬停效果
@@ -2126,7 +2128,7 @@
         updateStartButtonAppearance();
      }
      if (stopBtn != null) {
         stopBtn.setText("结束");
         stopBtn.setText("结束割草");
         updateStopButtonIcon();
      }
      if (statusLabel != null) {
@@ -2169,17 +2171,16 @@
      if (startBtn == null) {
         return;
      }
      String iconPath = startButtonShowingPause ? "image/start0.png" : "image/start1.png";
      startBtn.setText(startButtonShowingPause ? "暂停" : "开始");
      applyButtonIcon(startBtn, iconPath);
      startBtn.setText(startButtonShowingPause ? "暂停割草" : "开始割草");
      startBtn.setIcon(null);
   }

   private void updateStopButtonIcon() {
      if (stopBtn == null) {
         return;
      }
      String iconPath = stopButtonActive ? "image/stop1.png" : "image/stop0.png";
      applyButtonIcon(stopBtn, iconPath);
      stopBtn.setText("结束割草");
      stopBtn.setIcon(null);
   }

   private void toggleBluetoothConnection() {
@@ -2994,10 +2995,10 @@

   private void ensureBluetoothIconsLoaded() {
      if (bluetoothIcon == null) {
         bluetoothIcon = loadScaledIcon("image/blue.png", 28, 28);
         bluetoothIcon = loadScaledIcon("image/blue.png", 25, 25);
      }
      if (bluetoothLinkedIcon == null) {
         bluetoothLinkedIcon = loadScaledIcon("image/bluelink.png", 28, 28);
         bluetoothLinkedIcon = loadScaledIcon("image/bluelink.png", 25, 25);
      }
   }

@@ -3240,13 +3241,6 @@
         floatingButtonColumn.add(pathPreviewReturnButton);
         added = true;
      }
      if (toggleBoundaryDisplayButton != null && toggleBoundaryDisplayButton.isVisible()) {
         if (added) {
            floatingButtonColumn.add(Box.createRigidArea(new Dimension(0, 10)));
         }
         floatingButtonColumn.add(toggleBoundaryDisplayButton);
         added = true;
      }
      if (saveManualBoundaryButton != null && saveManualBoundaryButton.isVisible()) {
         if (added) {
            floatingButtonColumn.add(Box.createRigidArea(new Dimension(0, 10)));
@@ -4318,32 +4312,12 @@
            return;
        }
        
        // 保存当前地块引用
        shouye.currentBoundaryPreviewDikuai = dikuai;
        
        // 获取原始边界XY坐标
        String originalBoundaryXY = dikuai.getBoundaryOriginalXY();
        
        // 设置边界预览
        shouye.mapRenderer.setBoundaryPreview(originalBoundaryXY, optimizedBoundary);
        
        // 设置边界预览更新回调，用于保存删除坐标点后的边界
        shouye.mapRenderer.setBoundaryPreviewUpdateCallback(updatedBoundary -> {
            if (shouye.currentBoundaryPreviewDikuai != null && updatedBoundary != null) {
                // 保存更新后的边界坐标
                Dikuai.updateField(shouye.currentBoundaryPreviewDikuai.getLandNumber(), "boundaryCoordinates", updatedBoundary);
                java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                Dikuai.updateField(shouye.currentBoundaryPreviewDikuai.getLandNumber(), "updateTime", sdf.format(new java.util.Date()));
                Dikuai.saveToProperties();
                
                // 同步更新当前地块对象的内存值（确保返回时能获取到最新值）
                shouye.currentBoundaryPreviewDikuai.setBoundaryCoordinates(updatedBoundary);
                
                // 更新预览边界（重新设置以刷新显示）
                shouye.mapRenderer.setBoundaryPreview(originalBoundaryXY, updatedBoundary);
            }
        });
        
        // 停止绘制割草机实时拖尾
        if (shouye.mapRenderer != null) {
            shouye.mapRenderer.setIdleTrailSuppressed(true);
@@ -4362,23 +4336,11 @@
            shouye.pathPreviewReturnButton.setToolTipText("返回边界编辑页面");
        }
        
        // 创建或显示切换边界显示按钮
        if (shouye.toggleBoundaryDisplayButton == null) {
            shouye.toggleBoundaryDisplayButton = shouye.createToggleBoundaryDisplayButton();
        }
        
        // 重置切换按钮状态（默认显示全部边界）
        if (shouye.mapRenderer != null) {
            shouye.mapRenderer.setShowOnlyOriginalBoundary(false);
        }
        shouye.updateToggleBoundaryDisplayButtonText();
        
        // 隐藏其他悬浮按钮
        shouye.hideFloatingDrawingControls();
        
        // 显示返回按钮和切换按钮
        // 显示返回按钮
        shouye.pathPreviewReturnButton.setVisible(true);
        shouye.toggleBoundaryDisplayButton.setVisible(true);
        if (shouye.floatingButtonPanel != null) {
            shouye.floatingButtonPanel.setVisible(true);
            if (shouye.floatingButtonPanel.getParent() != shouye.visualizationPanel) {
@@ -4408,28 +4370,20 @@
    private void exitBoundaryPreview() {
        pathPreviewActive = false;
        
        // 清除当前地块引用
        currentBoundaryPreviewDikuai = null;
        
        // 恢复绘制割草机实时拖尾
        if (mapRenderer != null) {
            mapRenderer.setIdleTrailSuppressed(false);
        }
        
        // 清除边界预览并重置显示状态
        // 清除边界预览
        if (mapRenderer != null) {
            mapRenderer.clearBoundaryPreview();
            mapRenderer.setBoundaryPreviewUpdateCallback(null);
            mapRenderer.setShowOnlyOriginalBoundary(false); // 重置为显示全部边界
        }
        
        // 隐藏返回按钮和切换按钮
        // 隐藏返回按钮
        if (pathPreviewReturnButton != null) {
            pathPreviewReturnButton.setVisible(false);
        }
        if (toggleBoundaryDisplayButton != null) {
            toggleBoundaryDisplayButton.setVisible(false);
        }
        
        // 隐藏悬浮面板
        if (floatingButtonPanel != null) {
@@ -4439,68 +4393,5 @@
        visualizationPanel.revalidate();
        visualizationPanel.repaint();
    }
    
    /**
     * 创建切换边界显示按钮
     */
    private JButton createToggleBoundaryDisplayButton() {
        JButton button = new JButton("隐藏优化边界");
        button.setFont(new Font("微软雅黑", Font.PLAIN, 13));
        button.setBackground(new Color(46, 139, 87));
        button.setForeground(Color.WHITE);
        button.setBorder(BorderFactory.createEmptyBorder(8, 16, 8, 16));
        button.setFocusPainted(false);
        button.setCursor(new Cursor(Cursor.HAND_CURSOR));
        button.setToolTipText("切换显示：只显示原始边界/显示全部边界");
        
        button.addActionListener(e -> {
            if (mapRenderer == null) {
                return;
            }
            // 切换显示状态
            boolean currentState = mapRenderer.isShowOnlyOriginalBoundary();
            mapRenderer.setShowOnlyOriginalBoundary(!currentState);
            updateToggleBoundaryDisplayButtonText();
        });
        
        button.addMouseListener(new java.awt.event.MouseAdapter() {
            public void mouseEntered(java.awt.event.MouseEvent e) {
                button.setBackground(new Color(30, 107, 69));
            }
            
            public void mouseExited(java.awt.event.MouseEvent e) {
                button.setBackground(new Color(46, 139, 87));
            }
        });
        
        return button;
    }
    
    /**
     * 更新切换边界显示按钮的文本
     */
    private void updateToggleBoundaryDisplayButtonText() {
        if (toggleBoundaryDisplayButton == null || mapRenderer == null) {
            return;
        }
        if (mapRenderer.isShowOnlyOriginalBoundary()) {
            toggleBoundaryDisplayButton.setText("显示全部边界");
        } else {
            toggleBoundaryDisplayButton.setText("隐藏优化边界");
        }
    }

   // 测试方法
    public static void main(String[] args) {
        JFrame frame = new JFrame("AutoMow - 首页");
        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
        frame.setSize(400, 800);
        frame.setLocationRelativeTo(null);
        
        Shouye shouye = new Shouye();
        frame.add(shouye);
        
        frame.setVisible(true);
        UDPServer.startAsync();//启动数据接收线程
    }
}