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/Dell_AACC.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/baowen/Dell_AACC.java b/src/baowen/Dell_AACC.java
index de59d11..5d34260 100644
--- a/src/baowen/Dell_AACC.java
+++ b/src/baowen/Dell_AACC.java
@@ -56,18 +56,18 @@
 	private static String hexStr =  "0123456789ABCDEF";  
 
 	public static void dell_AACC(String message,String ip,int port) {
-		if(message.startsWith("AACC")) {
-			String[] gnggns=message.split("AACC");
-			int size=gnggns.length;
-			if(size>2) {				
-				for(int i=0;i<size;i++) {
-					if(gnggns[i].length()>5) {
-						jiexi_AACC("AACC"+gnggns[i],ip,port);
-					}
+		String[] gnggns=message.split("AACC");
+		int size=gnggns.length;
+		if(size>2) {				
+			for(int i=0;i<size;i++) {
+				if(gnggns[i].length()>80) {
+					jiexi_AACC("AACC"+gnggns[i],ip,port);
 				}
-			}else {
-				jiexi_AACC(message,ip,port);	
 			}
+		}else {
+			if(message.length()>80 && size==2) {
+				jiexi_AACC("AACC"+gnggns[1],ip,port);
+			}				
 		}
 	}
 
@@ -82,7 +82,8 @@
 		String yaw0=hex[79]+hex[78]+hex[77]+hex[76];
 		String stat0=hex[153]+hex[152];
 		String age0=hex[157]+hex[156]+hex[155]+hex[154];
-		String ns0=hex[161]+hex[160];
+		String ns0=hex[159]+hex[158];
+//		String ns20=hex[161]+hex[160];
 		lenth=decodeHEX(lenth0);		
 		lat=doubelttohex(lat0);		
 		lon=doubelttohex(lon0);		
@@ -99,15 +100,16 @@
 			if(Index1.getXieyi_type().equals("2")) {
 				mess="经度:"+lat+",纬度:"+lon+",高程:"+alt+",俯仰角:"+pitch
 						+",横滚角:"+roll+",航向角:"+yaw+",状态:"+stats+",差分龄期:"+age+",卫星颗数:"+ns;
-			}else if(Index1.getXieyi_type().equals("1")) {
-				mess=infom;
+				Index1.ara_show(mess);
 			}else if(Index1.getXieyi_type().equals("3")) {
 				mess="经度:"+lat0+",纬度:"+lon0+",高程:"+alt0+",俯仰角:"+pitch0
 						+",横滚角:"+roll0+",航向角:"+yaw0+",状态:"+stat0+",差分龄期:"+age0+",卫星颗数:"+ns0;
+				Index1.ara_show(mess);
 			}else if(Index1.getXieyi_type().equals("5")) {
 				mess="$GNGGAD,"+lat+","+lon;
+				Index1.ara_show_no_time(mess);
 			}
-			Index1.ara_show(mess);
+			
 		}		
 
 	}

--
Gitblit v1.9.3