优化了登录页面

826220679@qq.com

9 小时以前 69b40096cb0ae965f2a3e92672b880edfe7d04d2

 src/denglu/Denglu.java

@@ -9,6 +9,8 @@
import udpdell.UDPServer;
import user.Usrdell;
import Mqttmessage.Client;
import login.LoginVerifier;
import publicway.buttonset;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
@@ -21,11 +23,10 @@
    private JPasswordField passwordField;
    private JCheckBox rememberMe;
    private JButton loginButton;
    private JButton registerButton;
    private Map<String, Map<String, String>> translations;
    private JPanel mainPanel;
    private JLabel usernameLabel, passwordLabel;
    private JLabel forgotPassword, noAccountLabel, signupLink, appInfoLabel;
    private JLabel forgotPassword, noAccountLabel, signupLink;

    // 主题颜色
    private final Color THEME_COLOR = new Color(46, 139, 87);
@@ -55,7 +56,6 @@
        zh.put("sign_up", "立即注册");
        zh.put("app_title", "智能割草系统");
        zh.put("window_title", "智能割草系统 - 登录");
        zh.put("app_info", "智能割草系统 © 2023 - 智能割草解决方案");
        zh.put("register_button", "注册新账户");
        translations.put("zh", zh);

@@ -70,7 +70,6 @@
        en.put("sign_up", "Sign Up");
        en.put("app_title", "Smart Mowing System");
        en.put("window_title", "Smart Mowing System - Login");
        en.put("app_info", "Smart Mowing System © 2023 - Intelligent Lawn Care");
        en.put("register_button", "Create New Account");
        translations.put("en", en);

@@ -85,7 +84,6 @@
        es.put("sign_up", "Regístrate");
        es.put("app_title", "Sistema de Corte Inteligente");
        es.put("window_title", "Sistema de Corte Inteligente - Iniciar Sesión");
        es.put("app_info", "Sistema de Corte Inteligente © 2023 - Soluciones Inteligentes");
        es.put("register_button", "Crear Nueva Cuenta");
        translations.put("es", es);

@@ -100,7 +98,6 @@
        fr.put("sign_up", "S'inscrire");
        fr.put("app_title", "Système de Tonte Intelligent");
        fr.put("window_title", "Système de Tonte Intelligent - Connexion");
        fr.put("app_info", "Système de Tonte Intelligent © 2023 - Solutions de Tonte");
        fr.put("register_button", "Créer un Nouveau Compte");
        translations.put("fr", fr);

@@ -115,7 +112,6 @@
        de.put("sign_up", "Registrieren");
        de.put("app_title", "Intelligentes Mähsystem");
        de.put("window_title", "Intelligentes Mähsystem - Anmeldung");
        de.put("app_info", "Intelligentes Mähsystem © 2023 - Mählösungen");
        de.put("register_button", "Neues Konto Erstellen");
        translations.put("de", de);
    }
@@ -157,12 +153,12 @@
        // 主表单区域
        JPanel formPanel = createFormPanel();
        
        // 底部应用信息
        JPanel appInfoPanel = createAppInfoPanel();
        // 底部面板（包含注册链接）
        JPanel bottomPanel = createBottomPanel();
        
        mainPanel.add(topPanel, BorderLayout.NORTH);
        mainPanel.add(formPanel, BorderLayout.CENTER);
        mainPanel.add(appInfoPanel, BorderLayout.SOUTH);
        mainPanel.add(bottomPanel, BorderLayout.SOUTH);
        
        add(mainPanel);
    }
@@ -225,75 +221,21 @@
        rememberForgotPanel.add(rememberMe, BorderLayout.WEST);
        rememberForgotPanel.add(forgotPassword, BorderLayout.EAST);
        
        // 登录按钮 - 水平居中，长度与文本框宽度保持相近
        // 登录按钮 - 使用buttonset创建，水平居中，长度与文本框宽度保持相近
        JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
        buttonPanel.setBackground(Color.WHITE);
        buttonPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 50));
        
        loginButton = new JButton("登录");
        loginButton.setBackground(THEME_COLOR);
        loginButton.setForeground(Color.WHITE);
        // 使用buttonset创建登录按钮，使用主题色
        loginButton = buttonset.createStyledButton("登录", THEME_COLOR);
        loginButton.setFont(new Font("PingFang SC", Font.BOLD, 15));
        // 设置登录按钮长度接近文本框宽度
        loginButton.setPreferredSize(new Dimension(300, 48));
        loginButton.setBorderPainted(false);
        loginButton.setFocusPainted(false);
        loginButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
        
        // 鼠标悬停效果
        loginButton.addMouseListener(new MouseAdapter() {
            public void mouseEntered(MouseEvent e) {
                loginButton.setBackground(THEME_HOVER_COLOR);
            }
            public void mouseExited(MouseEvent e) {
                loginButton.setBackground(THEME_COLOR);
            }
        });
        loginButton.setMinimumSize(new Dimension(300, 48));
        loginButton.setMaximumSize(new Dimension(300, 48));
        
        buttonPanel.add(loginButton);
        
        // 注册按钮 - 更明显的注册入口
        JPanel registerButtonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
        registerButtonPanel.setBackground(Color.WHITE);
        registerButtonPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 45));
        
        registerButton = new JButton("注册新账户");
        registerButton.setBackground(Color.WHITE);
        registerButton.setForeground(THEME_COLOR);
        registerButton.setFont(new Font("PingFang SC", Font.BOLD, 14));
        registerButton.setPreferredSize(new Dimension(180, 42));
        registerButton.setBorder(BorderFactory.createCompoundBorder(
            BorderFactory.createLineBorder(THEME_COLOR),
            BorderFactory.createEmptyBorder(5, 15, 5, 15)
        ));
        registerButton.setFocusPainted(false);
        registerButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
        
        // 注册按钮悬停效果
        registerButton.addMouseListener(new MouseAdapter() {
            public void mouseEntered(MouseEvent e) {
                registerButton.setBackground(new Color(240, 250, 240));
            }
            public void mouseExited(MouseEvent e) {
                registerButton.setBackground(Color.WHITE);
            }
        });
        
        registerButtonPanel.add(registerButton);
        
        // 注册链接（保留原有的文本链接）
        JPanel signupPanel = new JPanel();
        signupPanel.setBackground(Color.WHITE);
        noAccountLabel = new JLabel("还没有账户？ ");
        noAccountLabel.setFont(new Font("PingFang SC", Font.PLAIN, 12));
        noAccountLabel.setForeground(new Color(120, 120, 120));
        signupLink = new JLabel("立即注册");
        signupLink.setFont(new Font("PingFang SC", Font.BOLD, 12));
        signupLink.setForeground(THEME_COLOR);
        signupLink.setCursor(new Cursor(Cursor.HAND_CURSOR));
        signupPanel.add(noAccountLabel);
        signupPanel.add(signupLink);
        
        // 组装表单
    formPanel.add(Box.createRigidArea(new Dimension(0, 15)));
        formPanel.add(usernameLabel);
@@ -307,26 +249,33 @@
        formPanel.add(rememberForgotPanel);
        formPanel.add(Box.createRigidArea(new Dimension(0, 20)));
        formPanel.add(buttonPanel); // 登录按钮
        formPanel.add(Box.createRigidArea(new Dimension(0, 15)));
        formPanel.add(registerButtonPanel); // 注册按钮
        formPanel.add(Box.createRigidArea(new Dimension(0, 15)));
        formPanel.add(signupPanel); // 保留原有的注册链接
        
        return formPanel;
    }

    private JPanel createAppInfoPanel() {
        JPanel appInfoPanel = new JPanel();
        appInfoPanel.setBackground(Color.WHITE);
        appInfoPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0));
        appInfoLabel = new JLabel(
            getTranslationValue(currentLanguageCode, "app_info", "智能割草系统 © 2023")
        );
        appInfoLabel.setFont(new Font("PingFang SC", Font.PLAIN, 10));
        appInfoLabel.setForeground(new Color(150, 150, 150));
        appInfoPanel.add(appInfoLabel);
    private JPanel createBottomPanel() {
        JPanel bottomPanel = new JPanel();
        bottomPanel.setLayout(new BoxLayout(bottomPanel, BoxLayout.Y_AXIS));
        bottomPanel.setBackground(Color.WHITE);
        
        return appInfoPanel;
        // 注册链接（放到页面最下方）
        JPanel signupPanel = new JPanel();
        signupPanel.setBackground(Color.WHITE);
        noAccountLabel = new JLabel("还没有账户？ ");
        noAccountLabel.setFont(new Font("PingFang SC", Font.PLAIN, 12));
        noAccountLabel.setForeground(new Color(120, 120, 120));
        signupLink = new JLabel("立即注册");
        signupLink.setFont(new Font("PingFang SC", Font.BOLD, 12));
        signupLink.setForeground(THEME_COLOR);
        signupLink.setCursor(new Cursor(Cursor.HAND_CURSOR));
        signupPanel.add(noAccountLabel);
        signupPanel.add(signupLink);
        signupPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0));
        
        // 注册链接放在最底部
        bottomPanel.add(signupPanel);
        
        return bottomPanel;
    }

    private void setupEventHandlers() {
@@ -355,9 +304,6 @@
                openRegistrationWindow();
            }
        });
        
        // 注册按钮点击事件 - 打开注册窗口
        registerButton.addActionListener(e -> openRegistrationWindow());
    }

    private void updateLanguage(String language) {
@@ -374,10 +320,6 @@
            loginButton.setText(getTranslationValue(langCode, "login_button", loginButton.getText()));
            noAccountLabel.setText(getTranslationValue(langCode, "no_account", noAccountLabel.getText()));
            signupLink.setText(getTranslationValue(langCode, "sign_up", signupLink.getText()));
            appInfoLabel.setText(getTranslationValue(langCode, "app_info", appInfoLabel.getText()));

            // 更新注册按钮文本
            registerButton.setText(getTranslationValue(langCode, "register_button", registerButton.getText()));

            // 更新窗口标题
            setTitle(getTranslationValue(langCode, "window_title", getTitle()));
@@ -438,11 +380,17 @@
        boolean isRemember = "1".equals(rememberPwd);
        rememberMe.setSelected(isRemember);

        // 如果记住我被选中，填充密码
        // 如果记住我被选中，填充密码并自动登录（延迟执行，确保窗口已显示）
        if (isRemember) {
             String savedPassword = UserChuShiHua.getProperty("password");
             if (savedPassword != null && !savedPassword.equals("-1")) {
             String savedEmail = UserChuShiHua.getProperty("email");
             if (savedPassword != null && !savedPassword.equals("-1") && 
                 savedEmail != null && !savedEmail.equals("-1")) {
                 passwordField.setText(savedPassword);
                 // 延迟执行自动登录，确保窗口已经显示
                 SwingUtilities.invokeLater(() -> {
                     performAutoLogin(savedEmail, savedPassword);
                 });
             }
        }
    }
@@ -459,11 +407,11 @@
    }

    private void performLogin() {
        String username = usernameField.getText().trim();
        String usernameOrEmail = usernameField.getText().trim();
        String password = new String(passwordField.getPassword()).trim();
        
        // 输入验证
        if (username.isEmpty()) {
        if (usernameOrEmail.isEmpty()) {
            JOptionPane.showMessageDialog(this, 
                "请输入用户名或邮箱", 
                "输入错误", 
@@ -481,43 +429,117 @@
            return;
        }
        
        // 验证用户名和密码
        if (validateLogin(username, password)) {
            // 更新最后登录时间
            UserChuShiHua.updateProperty("lastLoginTime", String.valueOf(System.currentTimeMillis()));
            
            // 保存记住我状态
            if (rememberMe.isSelected()) {
                UserChuShiHua.updateProperty("rememberPassword", "1");
                UserChuShiHua.updateProperty("userName", username);
            } else {
                UserChuShiHua.updateProperty("rememberPassword", "0");
        // 获取邮箱地址（如果输入的是用户名，从配置文件中获取对应的邮箱）
        String email = getEmailFromInput(usernameOrEmail);
        
        // 禁用登录按钮，防止重复点击
        loginButton.setEnabled(false);
        
        // 在新线程中调用API，避免阻塞UI
        new Thread(() -> {
            try {
                // 调用登录验证API
                LoginVerifier.LoginVerifyResponse response = LoginVerifier.verifyLogin(email, password);
                
                // 在EDT线程中更新UI
                SwingUtilities.invokeLater(() -> {
                    loginButton.setEnabled(true);
                    
                    if (response.isSuccess()) {
                        // 登录成功
                        // 更新最后登录时间
                        UserChuShiHua.updateProperty("lastLoginTime", String.valueOf(System.currentTimeMillis()));
                        
                        // 保存记住我状态
                        if (rememberMe.isSelected()) {
                            UserChuShiHua.updateProperty("rememberPassword", "1");
                            UserChuShiHua.updateProperty("userName", usernameOrEmail);
                            UserChuShiHua.updateProperty("email", email);
                            UserChuShiHua.updateProperty("password", password);
                        } else {
                            UserChuShiHua.updateProperty("rememberPassword", "0");
                        }
                        
                        // 关闭登录窗口并打开首页
                        openMainApplication();
                    } else {
                        // 登录失败，显示错误信息
                        String errorMessage = response.getMessage() != null ? 
                            response.getMessage() : "用户名或密码错误！";
                        JOptionPane.showMessageDialog(this, 
                            errorMessage, 
                            "登录失败", 
                            JOptionPane.ERROR_MESSAGE);
                        passwordField.setText("");
                        passwordField.requestFocus();
                    }
                });
            } catch (Exception e) {
                // 异常处理，恢复按钮并显示错误
                SwingUtilities.invokeLater(() -> {
                    loginButton.setEnabled(true);
                    JOptionPane.showMessageDialog(this, 
                        "登录时发生错误: " + e.getMessage(), 
                        "错误", 
                        JOptionPane.ERROR_MESSAGE);
                    passwordField.setText("");
                    passwordField.requestFocus();
                });
            }
            
            // 关闭登录窗口并打开首页
            openMainApplication();
            
        } else {
            JOptionPane.showMessageDialog(this, 
                "用户名或密码错误！", 
                "登录失败", 
                JOptionPane.ERROR_MESSAGE);
            passwordField.setText("");
            passwordField.requestFocus();
        }
        }).start();
    }

    private boolean validateLogin(String username, String password) {
        // 从UserChuShiHua获取存储的用户数据进行比较
        String storedUsername = UserChuShiHua.getProperty("userName");
        String storedPassword = UserChuShiHua.getProperty("password");
        String storedEmail = UserChuShiHua.getProperty("email");
        
        // 检查用户名/邮箱和密码是否匹配
        boolean usernameMatch = username.equals(storedUsername) || username.equals(storedEmail);
        boolean passwordMatch = password.equals(storedPassword);
        
        return usernameMatch && passwordMatch;
    // 邮箱验证方法
    private boolean isValidEmail(String email) {
        // 简单的邮箱格式验证
        String emailRegex = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$";
        return email != null && email.matches(emailRegex);
    }
    
    // 获取邮箱地址（如果输入的是用户名，则从配置文件中获取邮箱）
    private String getEmailFromInput(String usernameOrEmail) {
        // 如果输入的是邮箱格式，直接返回
        if (isValidEmail(usernameOrEmail)) {
            return usernameOrEmail;
        }
        // 否则，从配置文件中获取保存的邮箱
        String savedEmail = UserChuShiHua.getProperty("email");
        if (savedEmail != null && !savedEmail.equals("-1")) {
            // 检查输入的用户名是否匹配保存的用户名
            String savedUsername = UserChuShiHua.getProperty("userName");
            if (usernameOrEmail.equals(savedUsername)) {
                return savedEmail;
            }
        }
        // 如果找不到邮箱，返回输入的字符串（可能是邮箱格式但验证失败，或者用户名不存在）
        return usernameOrEmail;
    }
    
    // 自动登录（从配置文件读取邮箱和密码）
    private void performAutoLogin(String email, String password) {
        // 在新线程中调用API，避免阻塞UI
        new Thread(() -> {
            try {
                LoginVerifier.LoginVerifyResponse response = LoginVerifier.verifyLogin(email, password);
                
                SwingUtilities.invokeLater(() -> {
                    if (response.isSuccess()) {
                        // 登录成功，跳转到主页
                        openMainApplication();
                    } else {
                        // 登录失败，清空密码字段，让用户重新输入
                        passwordField.setText("");
                        usernameField.requestFocus();
                    }
                });
            } catch (Exception e) {
                // 异常处理，清空密码字段
                SwingUtilities.invokeLater(() -> {
                    passwordField.setText("");
                    usernameField.requestFocus();
                });
            }
        }).start();
    }

    private void openMainApplication() {
@@ -526,29 +548,30 @@
    }

    public static void launchMainApp() {
        System.out.println("准备打开主应用程序...");
        SwingUtilities.invokeLater(new Runnable() {
            @Override
            public void run() {
                JFrame mainFrame = new JFrame("智能割草系统");
                mainFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);

        SwingUtilities.invokeLater(() -> {
            JFrame mainFrame = new JFrame("智能割草系统");
            mainFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
                Shouye homePanel = new Shouye();
                mainFrame.setContentPane(homePanel);

            Shouye homePanel = new Shouye();
            mainFrame.setContentPane(homePanel);

            // 设置与登录页面相同的尺寸
            mainFrame.setSize(UIConfig.DIALOG_WIDTH, UIConfig.DIALOG_HEIGHT);
            mainFrame.setMinimumSize(new Dimension(UIConfig.DIALOG_WIDTH, UIConfig.DIALOG_HEIGHT));
            mainFrame.setResizable(false);
            mainFrame.setLocationRelativeTo(null);
            mainFrame.setVisible(true);

            System.out.println("主应用程序已启动");
            
            // 启动后连接MQTT
            new Thread(() -> {
                System.out.println("正在连接MQTT服务器...");
                Client.lianjiemqqt();
            }).start();
                // 设置与登录页面相同的尺寸
                mainFrame.setSize(UIConfig.DIALOG_WIDTH, UIConfig.DIALOG_HEIGHT);
                mainFrame.setMinimumSize(new Dimension(UIConfig.DIALOG_WIDTH, UIConfig.DIALOG_HEIGHT));
                mainFrame.setResizable(true);
                mainFrame.setLocationRelativeTo(null);
                mainFrame.setVisible(true);
                
                // 启动后连接MQTT
                new Thread(new Runnable() {
                    @Override
                    public void run() {
                        Client.lianjiemqqt();
                    }
                }).start();
            }
        });
    }
    
@@ -590,22 +613,8 @@
            Device.initializeActiveDevice(setsys.getMowerId());

            UDPServer.startAsync();//启动数据接收线程
            
            // 显示初始数据
            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;
                }
            }
            
            // 启动登录界面
                       
            // 启动登录界面（自动登录逻辑在 loadUserPreferences 中处理）
            EventQueue.invokeLater(() -> {
                try {
                    new Denglu().setVisible(true);