From 78a7d56860d51233f53fb930f7dd9112f4c31170 Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Wed, 13 Dec 2023 18:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AFNetty=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sv/barcode/ListenKeyFrame.java   | 52 +++++++++++++++++--
 .../com/sv/intergration/MessageService.java   |  9 ++++
 .../java/com/sv/service/ClientService.java    |  2 +-
 netty-client/src/main/resources/venue.conf    |  2 +-
 .../java/com/sv/netty/config/MessageType.java |  3 +-
 5 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java b/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java
index 159c44f..8622ef6 100644
--- a/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java
+++ b/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java
@@ -6,6 +6,8 @@ import com.sv.barcode.button.TestCodeClick;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 public class ListenKeyFrame {
 
@@ -31,11 +33,55 @@ public class ListenKeyFrame {
         frame.add(label);
         frame.add(buttonIn);
         frame.add(buttonOut);
-        frame.add(jTextField); // 注释
-        frame.add(buttonSubmit); // 注释
+//        frame.add(jTextField); // 注释
+//        frame.add(buttonSubmit); // 注释
         frame.setFocusableWindowState(true);
         frame.setAlwaysOnTop(true);
-        frame.setExtendedState(JFrame.MAXIMIZED_BOTH);
+//        frame.setExtendedState(JFrame.MAXIMIZED_BOTH); //最大化
+        frame.setFocusTraversalKeysEnabled(false);
+        frame.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                frame.setExtendedState(JFrame.NORMAL);
+                frame.setFocusable(true);
+                frame.setVisible(true);
+            }
+
+            @Override
+            public void windowIconified(WindowEvent e) {
+                frame.setExtendedState(JFrame.NORMAL);
+                frame.setFocusable(true);
+                frame.setVisible(true);
+            }
+
+            @Override
+            public void windowStateChanged(WindowEvent e) {
+                frame.setExtendedState(JFrame.NORMAL);
+                frame.setFocusable(true);
+                frame.setVisible(true);
+            }
+
+            @Override
+            public void windowDeiconified(WindowEvent e) {
+                frame.setExtendedState(JFrame.NORMAL);
+                frame.setFocusable(true);
+                frame.setVisible(true);
+            }
+
+            @Override
+            public void windowGainedFocus(WindowEvent e) {
+                frame.setExtendedState(JFrame.NORMAL);
+                frame.setFocusable(true);
+                frame.setVisible(true);
+            }
+
+            @Override
+            public void windowLostFocus(WindowEvent e) {
+                frame.setExtendedState(JFrame.NORMAL);
+                frame.setFocusable(true);
+                frame.setVisible(true);
+            }
+        });
         frame.setFocusable(true);
         frame.setVisible(true);
     }
diff --git a/netty-client/src/main/java/com/sv/intergration/MessageService.java b/netty-client/src/main/java/com/sv/intergration/MessageService.java
index 8992c56..63a5865 100644
--- a/netty-client/src/main/java/com/sv/intergration/MessageService.java
+++ b/netty-client/src/main/java/com/sv/intergration/MessageService.java
@@ -5,6 +5,9 @@ import com.sv.netty.config.VenueMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.lang.reflect.Field;
+
 /**
  * 消息服务
  * MessageService.java
@@ -41,11 +44,17 @@ public class MessageService {
 			case OUT_DOOR:
 				outDoor();
 				break;
+			case LOG:
+				sendlog();
 			default:
 				logger.info( "default");
 		}
 	}
 
+	private void sendlog() {
+//		File file = new File();
+	}
+
 	/**
 	 * 门禁开门
 	 */
diff --git a/netty-client/src/main/java/com/sv/service/ClientService.java b/netty-client/src/main/java/com/sv/service/ClientService.java
index ef394dc..942e6aa 100644
--- a/netty-client/src/main/java/com/sv/service/ClientService.java
+++ b/netty-client/src/main/java/com/sv/service/ClientService.java
@@ -39,7 +39,7 @@ public class ClientService {
         instance.start();
 
         Thread.sleep(10000);
-        ListenKeyFrame listenKeyFrame = new ListenKeyFrame("");
+        ListenKeyFrame listenKeyFrame = new ListenKeyFrame("-加载中12%");
         listenKeyFrame.newFrame();
         Thread.sleep(3000);
         listenKeyFrame.close();
diff --git a/netty-client/src/main/resources/venue.conf b/netty-client/src/main/resources/venue.conf
index ac21643..437ecc5 100644
--- a/netty-client/src/main/resources/venue.conf
+++ b/netty-client/src/main/resources/venue.conf
@@ -1 +1 @@
-{"serverIp":"127.0.0.1","serverPort":"56792","clientSN":"MC-5824T23014127","clientVid":"41"}
+{"serverIp":"127.0.0.1","serverPort":"56791","clientSN":"MC-5824T23014127","clientVid":"41"}
\ No newline at end of file
diff --git a/netty-model/src/main/java/com/sv/netty/config/MessageType.java b/netty-model/src/main/java/com/sv/netty/config/MessageType.java
index 201a311..0055189 100644
--- a/netty-model/src/main/java/com/sv/netty/config/MessageType.java
+++ b/netty-model/src/main/java/com/sv/netty/config/MessageType.java
@@ -4,7 +4,8 @@ public enum MessageType {
     HB("心跳"),
     SCAN_CODE("扫码"),
     ENTER_DOOR("进门"),
-    OUT_DOOR("出门");
+    OUT_DOOR("出门"),
+    LOG("日志");
 
     private String message;
     MessageType(String message) {