From 350782fa02a61cbe112d32905b4ecc39198710cb Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期五, 12 十二月 2025 17:06:59 +0800
Subject: [PATCH] 删除了系统设置调试改到点击蓝牙图标调试
---
src/zhuye/Shouye.java | 93 ++++++++++++----------------------------------
1 files changed, 24 insertions(+), 69 deletions(-)
diff --git a/src/zhuye/Shouye.java b/src/zhuye/Shouye.java
index bf46c63..5c2923d 100644
--- a/src/zhuye/Shouye.java
+++ b/src/zhuye/Shouye.java
@@ -16,6 +16,7 @@
import dikuai.addzhangaiwu;
import gecaoji.Device;
import set.Sets;
+import set.debug;
import udpdell.UDPServer;
import zhangaiwu.AddDikuai;
import yaokong.Control04;
@@ -64,7 +65,7 @@
private JLabel mowerSpeedValueLabel;
private JLabel mowerSpeedUnitLabel;
private JLabel mowingProgressLabel;
- private FixQualityIndicator fixQualityIndicator;
+ private gpszhuangtai fixQualityIndicator;
// 瀵艰埅鎸夐挳
private JButton homeNavBtn;
@@ -213,7 +214,8 @@
}
private void showInitialMowerSelfCheckDialogIfNeeded() {
- zijian.showInitialPromptIfNeeded(this, this::showRemoteControlDialog);
+ // 宸茬Щ闄よ繘鍏ヤ富椤垫椂鐨勮嚜妫�鎻愮ず锛堟寜鐢ㄦ埛瑕佹眰鍒犻櫎锛�
+ // 浠ュ墠杩欓噷浼氳皟鐢� zijian.showInitialPromptIfNeeded(...) 灞曠ず鑷瀵硅瘽妗嗭紝鐜板凡绂佺敤銆�
}
private void applyIdleTrailDurationFromSettings() {
@@ -1125,9 +1127,9 @@
return;
}
if (startButtonShowingPause) {
- if (!zijian.ensureBeforeMowing(this, this::showRemoteControlDialog)) {
- return;
- }
+ // 鐐瑰嚮寮�濮嬫寜閽椂涓嶅啀寮瑰嚭鑷鎻愮ず锛堟寜鐢ㄦ埛瑕佹眰鍒犻櫎锛�
+ // 鏃ч�昏緫锛氳皟鐢� zijian.ensureBeforeMowing(...) 骞跺湪鏈‘璁よ嚜妫�鏃堕樆姝㈠紑濮�
+ // 鏂伴�昏緫锛氱洿鎺ュ厑璁稿紑濮嬩綔涓�
}
startButtonShowingPause = !startButtonShowingPause;
if (!startButtonShowingPause) {
@@ -1136,17 +1138,15 @@
stopButtonActive = false;
updateStopButtonIcon();
}
- if (!beginMowingSession()) {
- startButtonShowingPause = true;
- statusLabel.setText("寰呮満");
- updateStartButtonAppearance();
- return;
- }
- Control04.sendStartCommandIfDebugSerialOpen();
+ if (!beginMowingSession()) {
+ startButtonShowingPause = true;
+ statusLabel.setText("寰呮満");
+ updateStartButtonAppearance();
+ return;
+ }
} else {
statusLabel.setText("鏆傚仠涓�");
pauseMowingSession();
- Control04.sendPauseCommandIfDebugSerialOpen();
}
updateStartButtonAppearance();
}
@@ -1166,7 +1166,6 @@
statusLabel.setText("宸茬粨鏉�");
startButtonShowingPause = false;
stopMowingSession();
- Control04.sendStopCommandIfDebugSerialOpen();
} else {
statusLabel.setText("寰呮満");
startButtonShowingPause = true;
@@ -1458,19 +1457,15 @@
if (bluetoothBtn == null) {
return;
}
- if (Bluelink.isConnected()) {
- Bluelink.disconnect();
- bluetoothConnected = false;
- } else {
- boolean success = Bluelink.connect();
- if (success) {
- bluetoothConnected = true;
- } else {
- bluetoothConnected = false;
- JOptionPane.showMessageDialog(this, "钃濈墮杩炴帴澶辫触锛岃閲嶈瘯", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
- }
- }
- updateBluetoothButtonIcon();
+ // 寮瑰嚭绯荤粺璋冭瘯椤甸潰
+ showDebugDialog();
+ }
+
+ private void showDebugDialog() {
+ Window parentWindow = SwingUtilities.getWindowAncestor(this);
+ debug debugDialog = new debug(parentWindow, THEME_COLOR);
+ debugDialog.setLocationRelativeTo(this); // 灞呬腑鏄剧ず鍦ㄩ椤�
+ debugDialog.setVisible(true);
}
private void updateBluetoothButtonIcon() {
@@ -1496,7 +1491,7 @@
JPanel rightPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 0));
rightPanel.setOpaque(false);
- fixQualityIndicator = new FixQualityIndicator();
+ fixQualityIndicator = new gpszhuangtai(THEME_COLOR);
fixQualityIndicator.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
fixQualityIndicator.addMouseListener(new MouseAdapter() {
@Override
@@ -3289,47 +3284,7 @@
return !"鏈�夋嫨鍦板潡".equals(trimmed);
}
- private final class FixQualityIndicator extends JComponent {
- private static final long serialVersionUID = 1L;
- private static final int DIAMETER = 16;
- private String currentCode;
- private Color currentColor = new Color(160, 160, 160);
-
- private FixQualityIndicator() {
- setPreferredSize(new Dimension(DIAMETER, DIAMETER));
- setMinimumSize(new Dimension(DIAMETER, DIAMETER));
- setMaximumSize(new Dimension(DIAMETER, DIAMETER));
- setToolTipText("鏈煡");
- }
-
- private void setQuality(String code) {
- if (Objects.equals(currentCode, code)) {
- return;
- }
- currentCode = code;
- currentColor = resolveFixQualityColor(code);
- setToolTipText(resolveFixQualityDescription(code));
- repaint();
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
- Graphics2D g2 = (Graphics2D) g.create();
- try {
- g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- int diameter = Math.min(getWidth(), getHeight()) - 2;
- int x = (getWidth() - diameter) / 2;
- int y = (getHeight() - diameter) / 2;
- g2.setColor(currentColor);
- g2.fillOval(x, y, diameter, diameter);
- g2.setColor(new Color(255, 255, 255, 128));
- g2.drawOval(x, y, diameter, diameter);
- } finally {
- g2.dispose();
- }
- }
- }
+
// 娴嬭瘯鏂规硶
public static void main(String[] args) {
--
Gitblit v1.10.0