From 992ec9bd29cb874777aac24b1e0a5e65e32e0a80 Mon Sep 17 00:00:00 2001
From: 826220679@qq.com <826220679@qq.com>
Date: 星期六, 22 七月 2023 19:32:05 +0800
Subject: [PATCH] 新增解析AACC华测数据

---
 src/frame/Index1.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/frame/Index1.java b/src/frame/Index1.java
index 61a72da..6b2112c 100644
--- a/src/frame/Index1.java
+++ b/src/frame/Index1.java
@@ -84,7 +84,7 @@
 	static boolean start_jiexi=false;
 	static String tagid="0";
 	JComboBox<String> box=null;
-	static String xieyi_type="1";//协议类型选择
+	static String xieyi_type="2";//协议类型选择
 
 	public Index1() {//构造方法
 		Toolkit toolkit = getToolkit();// 获得窗体工具包
@@ -366,7 +366,7 @@
 	}
 
 	public static void ara_show(String message) {
-		are.append(GetNowTime.sss()+":"+message+"\n");
+		are.append(GetNowTime.sss()+","+message+"\n");
 		are.setCaretPosition(are.getText().length());
 	}
 
@@ -541,11 +541,11 @@
 	public JComboBox<String> getBox() {
 		if(box==null) {
 			box=new JComboBox<String>();
-			String[] neixing= {"原始数据","解析后数据","HEX显示","ASCLL显示"};
+			String[] neixing= {"原始数据","解析后数据","HEX显示","ASCLL显示","定制格式"};
 			ComboBoxModel<String > coModel=new DefaultComboBoxModel<>(neixing);//下拉列表模型	        
 			box.setModel(coModel);
 			box.setBackground(Color.white);
-			box.setSelectedIndex(2);
+			box.setSelectedIndex(1);
 			box.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					if(box.getSelectedIndex()==0) {
@@ -556,6 +556,8 @@
 						xieyi_type="3";
 					}else if(box.getSelectedIndex()==3) {
 						xieyi_type="4";
+					}else if(box.getSelectedIndex()==4) {
+						xieyi_type="5";
 					}
 
 				}

--
Gitblit v1.9.3