From d069507ca6cd945fc4672ec09e6ed1ae776b546d Mon Sep 17 00:00:00 2001 From: wirsnow Date: Sat, 4 Feb 2023 16:59:11 +0800 Subject: [PATCH] remove unnecessary methods. --- .../chatroom/server/ServerMessageInput.java | 51 +++++++++---------- .../chatroom/swingui/ChatLeftPanel.java | 6 ++- .../swingui/listener/ChatFrameListener.java | 2 +- .../chatroom/util/ChatUniversalUtil.java | 13 ----- 4 files changed, 29 insertions(+), 43 deletions(-) diff --git a/src/main/java/indi/wirsnow/chatroom/server/ServerMessageInput.java b/src/main/java/indi/wirsnow/chatroom/server/ServerMessageInput.java index c5c8eab..0a41a5b 100644 --- a/src/main/java/indi/wirsnow/chatroom/server/ServerMessageInput.java +++ b/src/main/java/indi/wirsnow/chatroom/server/ServerMessageInput.java @@ -82,37 +82,32 @@ public void run() { } continue; } - switch (result) { - case "GetUserList" -> out.println("Server-from:list://" + allOnlineUser.toString()); - case "LogOut" -> { - // 如果是退出消息，就将用户从在线用户列表中移除并刷新用户列表 - allOnlineUser.get(targetUser).close(); - allOnlineUser.remove(targetUser); - flushUserList(chatUniversalData); - // 通知其他用户有用户下线 - for (Map.Entry entry : allOnlineUser.entrySet()) { - if (entry.getValue() != null) { - Socket targetSocket = entry.getValue(); - PrintWriter outTemp = new PrintWriter((new OutputStreamWriter(targetSocket.getOutputStream())), true); - outTemp.println("Server-from:exit://" + targetUser); - } - } - - } - default -> { - // 如果目标用户为Server，则正常接收，否则转发消息 - if (Objects.equals(targetUser, "Server")) { - // 解析并插入消息到消息面板 - message = userName + "-from:" + result; - result = parseMessage(chatUniversalData, message); - messageInsertText(chatUniversalData.getMessagePane(), result); - } else { - // 获取目标用户的socket并转发消息 - Socket targetSocket = allOnlineUser.get(targetUser); + if (result.equals("LogOut")) { + // 如果是退出消息，就将用户从在线用户列表中移除并刷新用户列表 + allOnlineUser.get(targetUser).close(); + allOnlineUser.remove(targetUser); + flushUserList(chatUniversalData); + // 通知其他用户有用户下线 + for (Map.Entry entry : allOnlineUser.entrySet()) { + if (entry.getValue() != null) { + Socket targetSocket = entry.getValue(); PrintWriter outTemp = new PrintWriter((new OutputStreamWriter(targetSocket.getOutputStream())), true); - outTemp.println(userName + "-from:" + result); + outTemp.println("Server-from:exit://" + targetUser); } } + } else { + // 如果目标用户为Server，则正常接收，否则转发消息 + if (Objects.equals(targetUser, "Server")) { + // 解析并插入消息到消息面板 + message = userName + "-from:" + result; + result = parseMessage(chatUniversalData, message); + messageInsertText(chatUniversalData.getMessagePane(), result); + } else { + // 获取目标用户的socket并转发消息 + Socket targetSocket = allOnlineUser.get(targetUser); + PrintWriter outTemp = new PrintWriter((new OutputStreamWriter(targetSocket.getOutputStream())), true); + outTemp.println(userName + "-from:" + result); + } } } } catch (IOException e) { diff --git a/src/main/java/indi/wirsnow/chatroom/swingui/ChatLeftPanel.java b/src/main/java/indi/wirsnow/chatroom/swingui/ChatLeftPanel.java index c3c4fb8..cc36cef 100644 --- a/src/main/java/indi/wirsnow/chatroom/swingui/ChatLeftPanel.java +++ b/src/main/java/indi/wirsnow/chatroom/swingui/ChatLeftPanel.java @@ -84,7 +84,11 @@ public void createLeftPanel() { // 设置文字输入框 { - setAreaDefault(editorArea); // 设置输入框格式 + editorArea.setTabSize(4); // 设置tab键的长度 + editorArea.setLineWrap(true); // 设置自动换行 + editorArea.setWrapStyleWord(true); // 设置断行不断字 + editorArea.setBackground(Color.WHITE); // 设置聊天记录显示框背景颜色 + editorArea.setFont(new Font("微软雅黑", Font.PLAIN, 14)); // 设置字体 editorScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); // 设置水平滚动条不可见 } diff --git a/src/main/java/indi/wirsnow/chatroom/swingui/listener/ChatFrameListener.java b/src/main/java/indi/wirsnow/chatroom/swingui/listener/ChatFrameListener.java index b11bc96..3c16152 100644 --- a/src/main/java/indi/wirsnow/chatroom/swingui/listener/ChatFrameListener.java +++ b/src/main/java/indi/wirsnow/chatroom/swingui/listener/ChatFrameListener.java @@ -224,7 +224,7 @@ private void sendAudio() { String userName = chatUniversalData.getUserName(); String toUserName = chatUniversalData.getToUserName(); String filename = "audio_" + date.getTime() + ".wav"; - String thisPath = System.getProperty("user.dir") + "\\" + userName + "\\audio\\"; + String thisPath = System.getProperty("user.dir") + "\\" + userName + "\\myAudio\\"; // 如果文件夹不存在，创建 File file = new File(thisPath + filename); diff --git a/src/main/java/indi/wirsnow/chatroom/util/ChatUniversalUtil.java b/src/main/java/indi/wirsnow/chatroom/util/ChatUniversalUtil.java index cf1ed5d..61d572b 100644 --- a/src/main/java/indi/wirsnow/chatroom/util/ChatUniversalUtil.java +++ b/src/main/java/indi/wirsnow/chatroom/util/ChatUniversalUtil.java @@ -175,19 +175,6 @@ public static void setTLC(JButton button, String Tips, String command, ChatFrame button.addActionListener(listener); // 设置按钮监听器 } - /** - * 设置文本框的默认格式 - * - * @param area 文本框 - */ - public static void setAreaDefault(JTextArea area) { - area.setTabSize(4); // 设置tab键的长度 - area.setLineWrap(true); // 设置自动换行 - area.setWrapStyleWord(true); // 设置断行不断字 - area.setBackground(Color.WHITE); // 设置聊天记录显示框背景颜色 - area.setFont(new Font("微软雅黑", Font.PLAIN, 14)); // 设置字体 - } - /** * 添加组件 *