From 19cd10e376652b0c22d8f4a910ae0bce0ccdb491 Mon Sep 17 00:00:00 2001
From: limqhz <540344226@qq.com>
Date: Fri, 8 Dec 2023 09:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sv/barcode/ListenKeyFrame.java   | 21 ++++++++++++-------
 .../java/com/sv/netty/MessageHandler.java     |  4 ++++
 .../java/com/sv/service/ClientService.java    | 18 ++++++++--------
 3 files changed, 27 insertions(+), 16 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 c6c0991..159c44f 100644
--- a/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java
+++ b/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java
@@ -7,12 +7,15 @@ import com.sv.barcode.button.TestCodeClick;
 import javax.swing.*;
 import java.awt.*;
 
-public class ListenKeyFrame extends Thread{
+public class ListenKeyFrame {
 
-    Frame frame;
+    private Frame frame;
 
-    public void newFrame (String title) {
-        frame = new Frame("智慧云馆门禁new" + title);
+    public ListenKeyFrame(String title) {
+        frame = new Frame("智慧云馆门禁" + title);
+    }
+
+    public void newFrame () {
         frame.setBounds(300,100,600,500);
         frame.setLayout(new FlowLayout(FlowLayout.CENTER,20,50));//设计布局
         JLabel label = new JLabel("请保持该界面被选中，否则将无法监听二维码扫描！");
@@ -28,15 +31,19 @@ public class ListenKeyFrame extends Thread{
         frame.add(label);
         frame.add(buttonIn);
         frame.add(buttonOut);
-//        frame.add(jTextField); // 注释
-//        frame.add(buttonSubmit); // 注释
-        frame.setVisible(true);
+        frame.add(jTextField); // 注释
+        frame.add(buttonSubmit); // 注释
+        frame.setFocusableWindowState(true);
+        frame.setAlwaysOnTop(true);
+        frame.setExtendedState(JFrame.MAXIMIZED_BOTH);
         frame.setFocusable(true);
+        frame.setVisible(true);
     }
 
     public void close() {
         if (frame != null) {
             frame.dispose();
+            frame = null;
         }
     }
 
diff --git a/netty-client/src/main/java/com/sv/netty/MessageHandler.java b/netty-client/src/main/java/com/sv/netty/MessageHandler.java
index 29a48a5..64e2bdd 100644
--- a/netty-client/src/main/java/com/sv/netty/MessageHandler.java
+++ b/netty-client/src/main/java/com/sv/netty/MessageHandler.java
@@ -29,6 +29,10 @@ public class MessageHandler {
      */
     public static String checkBarcode(String barcode) {
         String decrypt = AesUtil.decrypt(barcode);
+        if (decrypt == null) {
+            logger.error("二维码不合法" + barcode);
+            return null;
+        }
         // 这个二维码是线下的二维码
         if (!decrypt.startsWith("venue-")){
             VenueBarCode venueBarCode = MakeCode.decodeCode(barcode);
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 2893c23..ef394dc 100644
--- a/netty-client/src/main/java/com/sv/service/ClientService.java
+++ b/netty-client/src/main/java/com/sv/service/ClientService.java
@@ -38,21 +38,21 @@ public class ClientService {
         ClientThread instance = ClientThread.getInstance();
         instance.start();
 
-        Thread.sleep(3000);
-        ListenKeyFrame listenKeyFrame = new ListenKeyFrame();
-        listenKeyFrame.newFrame("-加载中12%");
+        Thread.sleep(10000);
+        ListenKeyFrame listenKeyFrame = new ListenKeyFrame("");
+        listenKeyFrame.newFrame();
         Thread.sleep(3000);
         listenKeyFrame.close();
-        ListenKeyFrame listenKeyFrame1 = new ListenKeyFrame();
-        listenKeyFrame1.newFrame("-加载中53%");
+        ListenKeyFrame listenKeyFrame1 = new ListenKeyFrame("-加载中53%");
+        listenKeyFrame1.newFrame();
         Thread.sleep(3000);
         listenKeyFrame1.close();
-        ListenKeyFrame listenKeyFrame2 = new ListenKeyFrame();
-        listenKeyFrame2.newFrame("-加载中94%");
+        ListenKeyFrame listenKeyFrame2 = new ListenKeyFrame("-加载中94%");
+        listenKeyFrame2.newFrame();
         Thread.sleep(3000);
         listenKeyFrame2.close();
-        ListenKeyFrame listenKeyFrame3 = new ListenKeyFrame();
-        listenKeyFrame3.newFrame("aaa");
+        ListenKeyFrame listenKeyFrame3 = new ListenKeyFrame("");
+        listenKeyFrame3.newFrame();
         listenKeyFrame3.focus();
 
     }