From a541fbdc8812337de120aad3792a2033a5dd7afe Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期四, 25 十二月 2025 12:23:01 +0800
Subject: [PATCH] 优化了首页
---
src/denglu/Denglu.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/denglu/Denglu.java b/src/denglu/Denglu.java
index d1af97c..98117a5 100644
--- a/src/denglu/Denglu.java
+++ b/src/denglu/Denglu.java
@@ -8,6 +8,7 @@
import set.Setsys;
import udpdell.UDPServer;
import user.Usrdell;
+import Mqttmessage.Client;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
@@ -156,17 +157,11 @@
// 涓昏〃鍗曞尯鍩�
JPanel formPanel = createFormPanel();
- // 鍖呰鍦ㄦ粴鍔ㄧ獥鏍间腑锛屼互闃插唴瀹规樉绀轰笉鍏�
- JScrollPane scrollPane = new JScrollPane(formPanel);
- scrollPane.setBorder(null);
- scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
- scrollPane.getVerticalScrollBar().setUnitIncrement(16);
-
// 搴曢儴搴旂敤淇℃伅
JPanel appInfoPanel = createAppInfoPanel();
mainPanel.add(topPanel, BorderLayout.NORTH);
- mainPanel.add(scrollPane, BorderLayout.CENTER);
+ mainPanel.add(formPanel, BorderLayout.CENTER);
mainPanel.add(appInfoPanel, BorderLayout.SOUTH);
add(mainPanel);
@@ -350,10 +345,7 @@
// 蹇樿瀵嗙爜鐐瑰嚮浜嬩欢
forgotPassword.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
- JOptionPane.showMessageDialog(Denglu.this,
- "璇疯仈绯荤鐞嗗憳閲嶇疆瀵嗙爜",
- "蹇樿瀵嗙爜",
- JOptionPane.INFORMATION_MESSAGE);
+ new user.ZhaohuiMima(Denglu.this).setVisible(true);
}
});
@@ -529,7 +521,12 @@
}
private void openMainApplication() {
- System.out.println("鐧诲綍鎴愬姛锛屽噯澶囨墦寮�涓诲簲鐢ㄧ▼搴�...");
+ launchMainApp();
+ dispose();
+ }
+
+ public static void launchMainApp() {
+ System.out.println("鍑嗗鎵撳紑涓诲簲鐢ㄧ▼搴�...");
SwingUtilities.invokeLater(() -> {
JFrame mainFrame = new JFrame("鏅鸿兘鍓茶崏绯荤粺");
@@ -545,8 +542,13 @@
mainFrame.setLocationRelativeTo(null);
mainFrame.setVisible(true);
- dispose();
- System.out.println("鐧诲綍绐楀彛宸插叧闂紝涓诲簲鐢ㄧ▼搴忓凡鍚姩");
+ System.out.println("涓诲簲鐢ㄧ▼搴忓凡鍚姩");
+
+ // 鍚姩鍚庤繛鎺QTT
+ new Thread(() -> {
+ System.out.println("姝ｅ湪杩炴帴MQTT鏈嶅姟鍣�...");
+ Client.lianjiemqqt();
+ }).start();
});
}
@@ -593,6 +595,16 @@
System.out.println("鍒濆鐢ㄦ埛鍚�: " + UserChuShiHua.getProperty("userName"));
System.out.println("鍒濆瀵嗙爜: " + UserChuShiHua.getProperty("password"));
+ // 妫�鏌ユ槸鍚﹁浣忓瘑鐮侊紝濡傛灉鏄垯鐩存帴杩涘叆涓婚〉
+ String rememberPwd = UserChuShiHua.getProperty("rememberPassword");
+ if ("1".equals(rememberPwd)) {
+ String storedUser = UserChuShiHua.getProperty("userName");
+ if (storedUser != null && !storedUser.equals("-1")) {
+ launchMainApp();
+ return;
+ }
+ }
+
// 鍚姩鐧诲綍鐣岄潰
EventQueue.invokeLater(() -> {
try {
--
Gitblit v1.10.0