From 6b1447fb1794e08f8e5f580b83ae5eabe4e617d8 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期三, 24 十二月 2025 16:28:46 +0800
Subject: [PATCH] 登录页面启用
---
src/homein/Homein.java | 71 ++---------------------------------
1 files changed, 5 insertions(+), 66 deletions(-)
diff --git a/src/homein/Homein.java b/src/homein/Homein.java
index acd24f6..c7dd7ef 100644
--- a/src/homein/Homein.java
+++ b/src/homein/Homein.java
@@ -1,72 +1,11 @@
package homein;
-
-import denglu.UserChuShiHua;
-import gecaoji.Device;
-import chuankou.SerialPortAutoConnector;
-import chuankou.SerialPortNativeLoader;
-import set.Setsys;
-import udpdell.UDPServer;
import denglu.Denglu;
-import java.awt.EventQueue;
-import javax.swing.JOptionPane;
-
public class Homein {
+ /**
+ * 绋嬪簭鍏ュ彛鐐� - 宸茶縼绉诲埌Denglu绫�
+ * 淇濈暀姝ゆ柟娉曚互淇濇寔鍚戝悗鍏煎鎬э紝瀹為檯璋冪敤Denglu.main
+ */
public static void main(String[] args) {
- // 妫�鏌ョ▼搴忔槸鍚﹀凡缁忚繍琛�
- if (WenJianSuo.isAlreadyRunning()) {
- JOptionPane.showMessageDialog(null,
- "绋嬪簭宸茬粡鍦ㄨ繍琛屼腑锛乗n涓嶈兘鍚屾椂鎵撳紑澶氫釜瀹炰緥銆�",
- "璀﹀憡",
- JOptionPane.WARNING_MESSAGE);
- System.exit(0);
- return;
- }
-
- // 娣诲姞鍏抽棴閽╁瓙锛岀‘淇濈▼搴忛��鍑烘椂閲婃斁閿�
- Runtime.getRuntime().addShutdownHook(new Thread(() -> {
- WenJianSuo.releaseLock();
- }));
-
- try {
- SerialPortNativeLoader.ensureLibraryPresent();
- // 鍒濆鍖栨暟鎹�
- UserChuShiHua.initialize();
-
- Setsys setsys = new Setsys();
- setsys.initializeFromProperties();
- Device.initializeActiveDevice(setsys.getMowerId());
-
- UDPServer.startAsync();//鍚姩鏁版嵁鎺ユ敹绾跨▼
-// SerialPortAutoConnector.initialize();//鍚姩涓插彛鑷姩杩炴帴
-
- // 鏄剧ず鍒濆鏁版嵁
- System.out.println("鍒濆鐢ㄦ埛鍚�: " + UserChuShiHua.getProperty("userName"));
- System.out.println("鍒濆瀵嗙爜: " + UserChuShiHua.getProperty("password"));
-
- // 鍚姩鐧诲綍鐣岄潰
- startLoginInterface();
-
- } catch (Exception e) {
- e.printStackTrace();
- JOptionPane.showMessageDialog(null,
- "绋嬪簭鍚姩澶辫触: " + e.getMessage(),
- "閿欒",
- JOptionPane.ERROR_MESSAGE);
- }
- }
-
- private static void startLoginInterface() {
- // 鍦‥DT涓惎鍔ㄧ櫥褰曠晫闈�
- EventQueue.invokeLater(() -> {
- try {
- new Denglu().setVisible(true);
- } catch (Exception e) {
- e.printStackTrace();
- JOptionPane.showMessageDialog(null,
- "鐧诲綍鐣岄潰鍚姩澶辫触: " + e.getMessage(),
- "閿欒",
- JOptionPane.ERROR_MESSAGE);
- }
- });
+ Denglu.main(args);
}
}
\ No newline at end of file
--
Gitblit v1.10.0