From 100f4dcea20a32663a07e91525de111f7515eb79 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期五, 21 十一月 2025 17:25:53 +0800
Subject: [PATCH] 可发布版本202517.25
---
src/chushihua/Chushihua.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/chushihua/Chushihua.java b/src/chushihua/Chushihua.java
index 648c9e8..4773b12 100644
--- a/src/chushihua/Chushihua.java
+++ b/src/chushihua/Chushihua.java
@@ -2,6 +2,9 @@
import java.io.File;
import java.util.List;
+
+import dialog.Dingshidialog;
+import dialog.Errlog;
import home.MachineConfig;
/**
@@ -62,11 +65,11 @@
initialize(DEFAULT_CONFIG_PATH);
// 绉婚櫎鑷姩鍚姩杞鐨勯�昏緫锛岀敱Homein缁熶竴绠＄悊
- System.out.println("绯荤粺閰嶇疆鍒濆鍖栧畬鎴愶紝杞灏嗙敱涓诲惎鍔ㄧ被缁熶竴绠＄悊");
+ ////System.out.println("绯荤粺閰嶇疆鍒濆鍖栧畬鎴愶紝杞灏嗙敱涓诲惎鍔ㄧ被缁熶竴绠＄悊");
return true;
} catch (Exception e) {
- System.err.println("绯荤粺鍒濆鍖栧紓甯�: " + e.getMessage());
+ Errlog.logOperation("绯荤粺鍒濆鍖栧紓甯�: " + e.getMessage());
e.printStackTrace();
return false;
}
@@ -80,10 +83,10 @@
// 鍋滄杞鏌ヨ
if (lunxun.isPolling()) {
lunxun.stopPolling();
- System.out.println("绯荤粺鍏抽棴锛氳疆璇㈡煡璇㈠凡鍋滄");
+ ////System.out.println("绯荤粺鍏抽棴锛氳疆璇㈡煡璇㈠凡鍋滄");
}
} catch (Exception e) {
- System.err.println("绯荤粺鍏抽棴寮傚父: " + e.getMessage());
+ Errlog.logOperation("绯荤粺鍏抽棴寮傚父: " + e.getMessage());
}
}
@@ -96,7 +99,7 @@
// 妫�鏌ラ厤缃枃浠舵槸鍚﹀瓨鍦�
File configFile = new File(configFilePath);
if (!configFile.exists()) {
- System.err.println("閰嶇疆鏂囦欢涓嶅瓨鍦�: " + configFilePath);
+ Errlog.logOperation("閰嶇疆鏂囦欢涓嶅瓨鍦�: " + configFilePath);
return false;
}
@@ -109,17 +112,17 @@
// 鏍囪鍒濆鍖栧畬鎴�
initialized = true;
- System.out.println("绯荤粺鍒濆鍖栧畬鎴愶紝閰嶇疆宸插姞杞�");
- System.out.println("璁惧缂栧彿: " + machineConfig.getMachineId());
- System.out.println("鏈嶅姟鍣ㄥ湴鍧�: " + machineConfig.getServerAddress() + ":" + machineConfig.getServerPort());
- System.out.println("鍗℃Ы鎬绘暟: " + machineConfig.getTotalSlots());
- System.out.println("杞闂撮殧: " + machineConfig.getPollingInterval() + "ms");
- System.out.println("娉㈢壒鐜�: " + machineConfig.getBaudrate());
+ ////System.out.println("绯荤粺鍒濆鍖栧畬鎴愶紝閰嶇疆宸插姞杞�");
+ ////System.out.println("璁惧缂栧彿: " + machineConfig.getMachineId());
+ ////System.out.println("鏈嶅姟鍣ㄥ湴鍧�: " + machineConfig.getServerAddress() + ":" + machineConfig.getServerPort());
+ ////System.out.println("鍗℃Ы鎬绘暟: " + machineConfig.getTotalSlots());
+ ////System.out.println("杞闂撮殧: " + machineConfig.getPollingInterval() + "ms");
+ ////System.out.println("娉㈢壒鐜�: " + machineConfig.getBaudrate());
return true;
} catch (Exception e) {
- System.err.println("绯荤粺鍒濆鍖栧け璐�: " + e.getMessage());
+ Errlog.logOperation("绯荤粺鍒濆鍖栧け璐�: " + e.getMessage());
e.printStackTrace();
return false;
}
@@ -176,16 +179,16 @@
*/
public boolean saveConfig(String configFilePath) {
if (machineConfig == null) {
- System.err.println("閰嶇疆鏈姞杞斤紝鏃犳硶淇濆瓨");
+ Errlog.logOperation("閰嶇疆鏈姞杞斤紝鏃犳硶淇濆瓨");
return false;
}
try {
machineConfig.saveToFile(configFilePath);
- System.out.println("閰嶇疆宸蹭繚瀛樺埌: " + configFilePath);
+ ////System.out.println("閰嶇疆宸蹭繚瀛樺埌: " + configFilePath);
return true;
} catch (Exception e) {
- System.err.println("淇濆瓨閰嶇疆澶辫触: " + e.getMessage());
+ Errlog.logOperation("淇濆瓨閰嶇疆澶辫触: " + e.getMessage());
return false;
}
}
@@ -195,7 +198,7 @@
*/
public MachineConfig getMachineConfig() {
if (!initialized) {
- throw new IllegalStateException("绯荤粺鏈垵濮嬪寲锛岃鍏堣皟鐢╥nitialize()鏂规硶");
+ Dingshidialog.showTimedDialog(null,10,"绯荤粺鏈垵濮嬪寲鎴愬姛");
}
return machineConfig;
}
--
Gitblit v1.9.3