From b39bd80a7fd5b88dd1d0e8b6540cae9c035a6b73 Mon Sep 17 00:00:00 2001
From: 826220679@qq.com <826220679@qq.com>
Date: 星期六, 22 七月 2023 21:37:16 +0800
Subject: [PATCH] 优化

---
 src/baowen/Udp_Receive.java |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/baowen/Udp_Receive.java b/src/baowen/Udp_Receive.java
index 193fbbe..2f684cd 100644
--- a/src/baowen/Udp_Receive.java
+++ b/src/baowen/Udp_Receive.java
@@ -59,27 +59,33 @@
 				byt=subBytes(packet.getData(),0, lenth);
 				//获取发送端的IP地址对象
 				String ip=packet.getAddress().getHostAddress();
-				int port=packet.getPort();	
-				String datas=Tools.Bytes2HexString(byt);
-				String upinfo=datas.toUpperCase();	
-				if(Index1.isShoware() && Index1.getTagid().equals("HEX")) {
-					Index1.ara_show(upinfo);
-				}
+				int port=packet.getPort();									
 				i=i+1;
 				Index1.getUdpnum().setText(i+"条");	
 				if(i==100000) {
 					i=0;
+				}								
+				
+				if(Index1.getInput_data_type()==2) {
+					String message=new String(packet.getData(), 0, lenth);
+					message=message.replaceAll(" ", "");
+					message=message.replaceAll("\r\n", "");
+					String infor2=message.toUpperCase();
+					Dell_AACC.dell_AACC(infor2, ip, port);
+					Dell_baotou.dell_baotou_start(infor2,ip,port);
+					if(Index1.isShoware() && Index1.getXieyi_type().equals("1")) {
+						Index1.ara_show_no_time(infor2);
+					}
+				}else {
+					String datas=Tools.Bytes2HexString(byt);
+					String upinfo=datas.toUpperCase();	
+					Dell_55AA02.dell_55aa02_start(upinfo, ip, port);
+					Dell_AACC.dell_AACC(upinfo, ip, port);
+					if(Index1.isShoware() && Index1.getXieyi_type().equals("1")) {
+						Index1.ara_show_no_time(upinfo);
+					}
 				}
-				String message=new String(packet.getData(), 0, lenth);
-				message=message.replaceAll(" ", "");
-				message=message.replaceAll("\r\n", "");
-				String infor2=message.toUpperCase();				
-				Dell_baotou.dell_baotou_start(infor2,ip,port);
-				Dell_55AA02.dell_55aa02_start(upinfo, ip, port);
-				Dell_AACC.dell_AACC(upinfo, ip, port);
-				if(Index1.isShoware() && Index1.getTagid().equals("ASCLL")) {
-					Index1.ara_show(infor2);
-				}
+				
 				byt=null;
 			} catch (Exception e) {
 				e.printStackTrace(); // 输出异常信息

--
Gitblit v1.9.3