From 68b1f4e85c29164d5de189262282454f9a0b1cc0 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期二, 16 十二月 2025 16:27:41 +0800
Subject: [PATCH] 以割草机视图为中心显示功能
---
src/zhuye/Shouye.java | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 208 insertions(+), 22 deletions(-)
diff --git a/src/zhuye/Shouye.java b/src/zhuye/Shouye.java
index c462a83..7c20720 100644
--- a/src/zhuye/Shouye.java
+++ b/src/zhuye/Shouye.java
@@ -78,6 +78,15 @@
private JLabel statusLabel;
private JLabel speedLabel; // 閫熷害鏄剧ず鏍囩
private JLabel areaNameLabel;
+
+ // 杈圭晫璀﹀憡鐩稿叧
+ private Timer boundaryWarningTimer; // 杈圭晫璀﹀憡妫�鏌ュ畾鏃跺櫒
+ private Timer warningBlinkTimer; // 璀﹀憡鍥炬爣闂儊瀹氭椂鍣�
+ private boolean isMowerOutsideBoundary = false; // 鍓茶崏鏈烘槸鍚﹀湪杈圭晫澶�
+ private boolean warningIconVisible = true; // 璀﹀憡鍥炬爣鏄剧ず鐘舵�侊紙鐢ㄤ簬闂儊锛�
+
+ // 浠ュ壊鑽夋満涓轰腑蹇冭鍥炬ā寮�
+ private boolean centerOnMowerMode = false; // 鏄惁澶勪簬浠ュ壊鑽夋満涓轰腑蹇冪殑妯″紡
// 褰撳墠閫変腑鐨勫鑸寜閽�
private JButton currentNavButton;
@@ -207,6 +216,9 @@
initializeDefaultAreaSelection();
refreshMapForSelectedArea();
+
+ // 鍚姩杈圭晫璀﹀憡妫�鏌ュ畾鏃跺櫒
+ startBoundaryWarningTimer();
}
private void scheduleIdentifierCheck() {
@@ -239,6 +251,14 @@
public void windowClosing(WindowEvent e) {
// 淇濆瓨褰撳墠缂╂斁姣斾緥
saveCurrentScale();
+ // 鍋滄杈圭晫璀﹀憡瀹氭椂鍣�
+ if (boundaryWarningTimer != null && boundaryWarningTimer.isRunning()) {
+ boundaryWarningTimer.stop();
+ }
+ // 鍋滄闂儊瀹氭椂鍣�
+ if (warningBlinkTimer != null && warningBlinkTimer.isRunning()) {
+ warningBlinkTimer.stop();
+ }
}
});
}
@@ -259,6 +279,149 @@
setsys.updateProperty("viewCenterY", String.format("%.2f", translateY));
}
}
+
+ /**
+ * 鍚姩杈圭晫璀﹀憡妫�鏌ュ畾鏃跺櫒
+ */
+ private void startBoundaryWarningTimer() {
+ // 杈圭晫妫�鏌ュ畾鏃跺櫒锛氭瘡500ms妫�鏌ヤ竴娆″壊鑽夋満鏄惁鍦ㄨ竟鐣屽唴
+ boundaryWarningTimer = new Timer(500, e -> {
+ checkMowerBoundaryStatus();
+ });
+ boundaryWarningTimer.setInitialDelay(0);
+ boundaryWarningTimer.start();
+
+ // 闂儊瀹氭椂鍣細姣�1绉掑垏鎹竴娆¤鍛婂浘鏍囨樉绀虹姸鎬�
+ warningBlinkTimer = new Timer(1000, e -> {
+ if (isMowerOutsideBoundary) {
+ warningIconVisible = !warningIconVisible;
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+ });
+ warningBlinkTimer.setInitialDelay(0);
+ warningBlinkTimer.start();
+ }
+
+ /**
+ * 鍒囨崲浠ュ壊鑽夋満涓轰腑蹇冪殑妯″紡
+ */
+ private void toggleCenterOnMowerMode() {
+ centerOnMowerMode = !centerOnMowerMode;
+
+ if (centerOnMowerMode) {
+ // 寮�鍚ā寮忥細绔嬪嵆灏嗚鍥句腑蹇冪Щ鍔ㄥ埌鍓茶崏鏈轰綅缃�
+ updateViewToCenterOnMower();
+ }
+ // 鍏抽棴妯″紡鏃朵笉闇�瑕佸仛浠讳綍鎿嶄綔锛岀敤鎴峰凡缁忓彲浠ヨ嚜鐢辩Щ鍔ㄥ湴鍥�
+
+ // 鏇存柊宸ュ叿鎻愮ず
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+
+ /**
+ * 鏇存柊瑙嗗浘涓績鍒板壊鑽夋満浣嶇疆
+ */
+ private void updateViewToCenterOnMower() {
+ if (mapRenderer == null) {
+ return;
+ }
+
+ Gecaoji mower = mapRenderer.getMower();
+ if (mower != null && mower.hasValidPosition()) {
+ Point2D.Double mowerPosition = mower.getPosition();
+ if (mowerPosition != null) {
+ // 鑾峰彇褰撳墠缂╂斁姣斾緥
+ double currentScale = mapRenderer.getScale();
+ // 璁剧疆瑙嗗浘鍙樻崲锛屼娇鍓茶崏鏈轰綅缃搴斿埌灞忓箷涓績
+ // translateX = -mowerX, translateY = -mowerY 鍙互璁╁壊鑽夋満鍦ㄥ睆骞曚腑蹇�
+ mapRenderer.setViewTransform(currentScale, -mowerPosition.x, -mowerPosition.y);
+ }
+ }
+ }
+
+ /**
+ * 妫�鏌ュ壊鑽夋満杈圭晫鐘舵��
+ */
+ private void checkMowerBoundaryStatus() {
+ // 濡傛灉澶勪簬浠ュ壊鑽夋満涓轰腑蹇冪殑妯″紡锛屽疄鏃舵洿鏂拌鍥句腑蹇�
+ if (centerOnMowerMode) {
+ updateViewToCenterOnMower();
+ }
+
+ // 妫�鏌ユ槸鍚﹀湪浣滀笟涓�
+ if (statusLabel == null || !"浣滀笟涓�".equals(statusLabel.getText())) {
+ // 涓嶅湪浣滀笟涓紝閲嶇疆鐘舵��
+ if (isMowerOutsideBoundary) {
+ isMowerOutsideBoundary = false;
+ warningIconVisible = true;
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+ return;
+ }
+
+ // 鍦ㄤ綔涓氫腑锛屾鏌ユ槸鍚﹀湪杈圭晫鍐�
+ if (mapRenderer == null) {
+ return;
+ }
+
+ // 鑾峰彇褰撳墠杈圭晫
+ List<Point2D.Double> boundary = mapRenderer.getCurrentBoundary();
+ if (boundary == null || boundary.size() < 3) {
+ // 娌℃湁杈圭晫锛岄噸缃姸鎬�
+ if (isMowerOutsideBoundary) {
+ isMowerOutsideBoundary = false;
+ warningIconVisible = true;
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+ return;
+ }
+
+ // 鑾峰彇鍓茶崏鏈轰綅缃�
+ Gecaoji mower = mapRenderer.getMower();
+ if (mower == null || !mower.hasValidPosition()) {
+ // 鏃犳硶鑾峰彇浣嶇疆锛岄噸缃姸鎬�
+ if (isMowerOutsideBoundary) {
+ isMowerOutsideBoundary = false;
+ warningIconVisible = true;
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+ return;
+ }
+
+ Point2D.Double mowerPosition = mower.getPosition();
+ if (mowerPosition == null) {
+ return;
+ }
+
+ // 浣跨敤 MowerBoundaryChecker 妫�鏌ユ槸鍚﹀湪杈圭晫鍐�
+ boolean isInside = MowerBoundaryChecker.isInsideBoundaryPoints(
+ boundary,
+ mowerPosition.x,
+ mowerPosition.y
+ );
+
+ // 鏇存柊鐘舵��
+ boolean wasOutside = isMowerOutsideBoundary;
+ isMowerOutsideBoundary = !isInside;
+
+ // 濡傛灉鐘舵�佹敼鍙橈紝绔嬪嵆閲嶇粯
+ if (wasOutside != isMowerOutsideBoundary) {
+ warningIconVisible = true;
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+ }
private void showInitialMowerSelfCheckDialogIfNeeded() {
// 宸茬Щ闄よ繘鍏ヤ富椤垫椂鐨勮嚜妫�鎻愮ず锛堟寜鐢ㄦ埛瑕佹眰鍒犻櫎锛�
@@ -405,8 +568,6 @@
{
// 鍔犺浇鍓茶崏鏈哄浘鏍囷紝澶у皬20x20鍍忕礌
gecaojiIcon = loadScaledIcon("image/gecaoji.png", GECAOJI_ICON_SIZE, GECAOJI_ICON_SIZE);
- // 鍚敤宸ュ叿鎻愮ず
- setToolTipText("");
}
/**
@@ -423,9 +584,11 @@
public String getToolTipText(MouseEvent event) {
// 濡傛灉榧犳爣鍦ㄥ壊鑽夋満鍥炬爣鍖哄煙鍐咃紝鏄剧ず鎻愮ず鏂囧瓧
if (isMouseOnGecaojiIcon(event.getPoint())) {
- return "浠ュ壊鑽夋満涓轰腑蹇�";
+ // 鏍规嵁褰撳墠妯″紡鏄剧ず涓嶅悓鐨勬彁绀烘枃瀛�
+ return centerOnMowerMode ? "鍙栨秷浠ュ壊鑽夋満涓轰腑蹇�" : "浠ュ壊鑽夋満涓轰腑蹇�";
}
- return super.getToolTipText(event);
+ // 涓嶅湪鍥炬爣涓婃椂杩斿洖null锛屼笉鏄剧ず宸ュ叿鎻愮ず妗�
+ return null;
}
@Override
@@ -435,13 +598,48 @@
if (mapRenderer != null) {
mapRenderer.renderMap(g);
}
- // 鍦ㄥ湴鍥惧乏涓婅缁樺埗鍓茶崏鏈哄浘鏍�
- // 姘村钩鏂瑰悜涓庨�熷害鎸囩ず鍣ㄥ榻愶紙x=37锛�
- // 鍨傜洿鏂瑰悜涓庡崼鏄熺姸鎬佸浘鏍囧榻愶紙y=10锛岄�熷害鎸囩ず鍣ㄩ潰鏉块《閮ㄨ竟璺�10鍍忕礌锛屼娇鍥炬爣涓績瀵归綈锛�
- if (gecaojiIcon != null) {
+
+ // 妫�鏌ユ槸鍚﹂渶瑕佹樉绀鸿鍛婂浘鏍�
+ if (isMowerOutsideBoundary && warningIconVisible) {
+ // 缁樺埗绾㈣壊涓夎褰㈣鍛婂浘鏍囷紙甯﹀徆鍙凤級
+ drawWarningIcon(g, GECAOJI_ICON_X, GECAOJI_ICON_Y, GECAOJI_ICON_SIZE);
+ } else if (gecaojiIcon != null) {
+ // 缁樺埗姝ｅ父鐨勫壊鑽夋満鍥炬爣
+ // 姘村钩鏂瑰悜涓庨�熷害鎸囩ず鍣ㄥ榻愶紙x=37锛�
+ // 鍨傜洿鏂瑰悜涓庡崼鏄熺姸鎬佸浘鏍囧榻愶紙y=10锛岄�熷害鎸囩ず鍣ㄩ潰鏉块《閮ㄨ竟璺�10鍍忕礌锛屼娇鍥炬爣涓績瀵归綈锛�
g.drawImage(gecaojiIcon.getImage(), GECAOJI_ICON_X, GECAOJI_ICON_Y, null);
}
}
+
+ /**
+ * 缁樺埗绾㈣壊涓夎褰㈣鍛婂浘鏍囷紙甯﹀徆鍙凤級
+ */
+ private void drawWarningIcon(Graphics g, int x, int y, int size) {
+ Graphics2D g2d = (Graphics2D) g.create();
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+ // 缁樺埗绾㈣壊涓夎褰�
+ int[] xPoints = {x + size / 2, x, x + size};
+ int[] yPoints = {y, y + size, y + size};
+ g2d.setColor(Color.RED);
+ g2d.fillPolygon(xPoints, yPoints, 3);
+
+ // 缁樺埗鐧借壊杈规
+ g2d.setColor(Color.WHITE);
+ g2d.setStroke(new BasicStroke(1.5f));
+ g2d.drawPolygon(xPoints, yPoints, 3);
+
+ // 缁樺埗鐧借壊鍙瑰彿
+ g2d.setColor(Color.WHITE);
+ g2d.setFont(new Font("Arial", Font.BOLD, size * 3 / 4));
+ FontMetrics fm = g2d.getFontMetrics();
+ String exclamation = "!";
+ int textWidth = fm.stringWidth(exclamation);
+ int textHeight = fm.getAscent();
+ g2d.drawString(exclamation, x + (size - textWidth) / 2, y + (size + textHeight) / 2 - 2);
+
+ g2d.dispose();
+ }
};
visualizationPanel.setLayout(new BorderLayout());
@@ -454,20 +652,8 @@
// 妫�鏌ユ槸鍚︾偣鍑讳簡鍓茶崏鏈哄浘鏍囧尯鍩燂紙37, 10, 20, 20锛�
if (clickPoint.x >= 37 && clickPoint.x <= 57 &&
clickPoint.y >= 10 && clickPoint.y <= 30) {
- // 鐐瑰嚮浜嗗壊鑽夋満鍥炬爣锛屽皢鍦板浘瑙嗗浘涓績绉诲姩鍒板壊鑽夋満浣嶇疆
- if (mapRenderer != null) {
- Gecaoji mower = mapRenderer.getMower();
- if (mower != null && mower.hasValidPosition()) {
- Point2D.Double mowerPosition = mower.getPosition();
- if (mowerPosition != null) {
- // 鑾峰彇褰撳墠缂╂斁姣斾緥
- double currentScale = mapRenderer.getScale();
- // 璁剧疆瑙嗗浘鍙樻崲锛屼娇鍓茶崏鏈轰綅缃搴斿埌灞忓箷涓績
- // translateX = -mowerX, translateY = -mowerY 鍙互璁╁壊鑽夋満鍦ㄥ睆骞曚腑蹇�
- mapRenderer.setViewTransform(currentScale, -mowerPosition.x, -mowerPosition.y);
- }
- }
- }
+ // 鍒囨崲浠ュ壊鑽夋満涓轰腑蹇冪殑妯″紡
+ toggleCenterOnMowerMode();
}
}
}
--
Gitblit v1.10.0