From 17a67dd7b7756e2684807aac2f0fe2624bd99fa7 Mon Sep 17 00:00:00 2001 From: DELL <1525436766@qq.com> Date: 星期二, 19 十一月 2024 14:48:42 +0800 Subject: [PATCH] V1.107 edit by lijun 2024-11-19 IAC600KW调试工具修改如下 1.开始连接,取消退出界面命令 2.工作状态和当前界面文本字体调整 3.修复按钮点击时,焦点异常 4.修改稳态中的功率1改成功率段1…… 5.软件默认打开全屏 --- Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$24.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$14.class | 0 Device_Simulator_DTS_Tester/bin/main/main_window_computer.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$1.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$8.class | 0 Device_Simulator_DTS_Tester/bin/version.txt | 8 + Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/SPCommIAC_600KW.java | 18 +- Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$4.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$5.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$19.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$26.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$29.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$16.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$11.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$2.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$7.class | 0 Device_Simulator_DTS_Tester/src/version.txt | 8 + Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$21.class | 0 Device_Simulator_DTS_Tester/src/main/main_window_computer.java | 6 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$15.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$25.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$10.class | 0 Device_Simulator_DTS_Tester/bin/main/main_window_computer$25.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$9.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$13.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$23.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/SPCommIAC_600KW.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page.class | 0 Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/iac_600kw_page.java | 356 ++++++++++++++++++++++++++++++++++++++++++++++++-- Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$28.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$12.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$18.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$27.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$17.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$22.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$20.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$30.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$3.class | 0 Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$6.class | 0 39 files changed, 366 insertions(+), 30 deletions(-) diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/SPCommIAC_600KW.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/SPCommIAC_600KW.class index d85852b..c15e482 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/SPCommIAC_600KW.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/SPCommIAC_600KW.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$1.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$1.class index efbc87a..7b0cd06 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$1.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$1.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$10.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$10.class index c561056..2698962 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$10.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$10.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$11.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$11.class index fc1856a..f6c58c6 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$11.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$11.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$12.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$12.class index fffbbfe..6906972 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$12.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$12.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$13.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$13.class index 17a9715..187200e 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$13.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$13.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$14.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$14.class index 8056459..9eb8e87 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$14.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$14.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$15.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$15.class index 60020aa..3adf58a 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$15.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$15.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$16.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$16.class index 8d33091..48f39fd 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$16.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$16.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$17.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$17.class index 39d4ae3..dea497a 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$17.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$17.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$18.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$18.class index 86eb215..603ce6c 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$18.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$18.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$19.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$19.class index dd8dace..d29c244 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$19.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$19.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$2.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$2.class index 7613172..5fc49ae 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$2.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$2.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$20.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$20.class index cbb5354..eaf0ac8 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$20.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$20.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$21.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$21.class index b4e4638..7606582 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$21.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$21.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$22.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$22.class index fb753e9..c72d807 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$22.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$22.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$23.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$23.class index 5369950..2494300 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$23.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$23.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$24.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$24.class index d6127fe..ff1ea08 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$24.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$24.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$25.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$25.class index 6d43634..045df37 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$25.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$25.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$26.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$26.class index 9e93cd1..64104c8 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$26.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$26.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$27.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$27.class index b75e9ff..8c3ea0e 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$27.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$27.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$28.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$28.class index c856dab..b4f311e 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$28.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$28.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$29.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$29.class index 5418508..08d362e 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$29.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$29.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$3.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$3.class index dec40cd..74b6017 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$3.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$3.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$30.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$30.class index eca04f0..15bf6c9 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$30.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$30.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$4.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$4.class index 00f5783..05df282 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$4.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$4.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$5.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$5.class index cdd035e..77e7712 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$5.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$5.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$6.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$6.class index 47feff5..a61c0be 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$6.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$6.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$7.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$7.class index 60de89e..82ca790 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$7.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$7.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$8.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$8.class index c64328c..2df5eb8 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$8.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$8.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$9.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$9.class index 42de77b..0498ef2 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$9.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$9.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page.class b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page.class index e85e48b..6cac4f8 100644 --- a/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page.class +++ b/Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/main/main_window_computer$25.class b/Device_Simulator_DTS_Tester/bin/main/main_window_computer$25.class index 83c9a62..5a1571e 100644 --- a/Device_Simulator_DTS_Tester/bin/main/main_window_computer$25.class +++ b/Device_Simulator_DTS_Tester/bin/main/main_window_computer$25.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class b/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class index 12bc88e..4818c6b 100644 --- a/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class +++ b/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class Binary files differ diff --git a/Device_Simulator_DTS_Tester/bin/version.txt b/Device_Simulator_DTS_Tester/bin/version.txt index cbbe48e..09bf2c0 100644 --- a/Device_Simulator_DTS_Tester/bin/version.txt +++ b/Device_Simulator_DTS_Tester/bin/version.txt @@ -24,4 +24,12 @@ 1.BTS4810调试工具兼容加密与不加密协议以及添加当前设备协议类型标识 2.新增BTS4810调试工具程序升级功能 +V1.107 edit by lijun 2024-11-19 + IAC600KW调试工具修改如下 + 1.开始连接,取消退出界面命令 + 2.工作状态和当前界面文本字体调整 + 3.修复按钮点击时,焦点异常 + 4.修改稳态中的功率1改成功率段1…… + 5.软件默认打开全屏 + diff --git a/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/SPCommIAC_600KW.java b/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/SPCommIAC_600KW.java index 17b74a4..893ed6c 100644 --- a/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/SPCommIAC_600KW.java +++ b/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/SPCommIAC_600KW.java @@ -228,15 +228,15 @@ rtu_rt.reg_addr = IAC_ComBase.CMD_RealData_Addr; rtu_rt.reg_count = IAC_RealData.REG_Count; - if((dt_cmd_cnt % 3 == 0) && !is_ClosePage) { - //退出界面 - rtu_rt.Cmd = MyModBusRtu.CMD_TYPE_WRITE_STD; - - rtu_rt.reg_addr = IAC_ComBase.CMD_ClosePage_Addr; - - dt_data = IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF); - rtu_rt.reg_count = dt_data.capacity()/2; - } +// if((dt_cmd_cnt % 3 == 0) && !is_ClosePage) { +// //退出界面[重连时不在发送退出界面命令] +// rtu_rt.Cmd = MyModBusRtu.CMD_TYPE_WRITE_STD; +// +// rtu_rt.reg_addr = IAC_ComBase.CMD_ClosePage_Addr; +// +// dt_data = IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF); +// rtu_rt.reg_count = dt_data.capacity()/2; +// } } else { //数据 diff --git a/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/iac_600kw_page.java b/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/iac_600kw_page.java index e30cb8b..1e4bc7a 100644 --- a/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/iac_600kw_page.java +++ b/Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/iac_600kw_page.java @@ -398,6 +398,8 @@ panel_100.add(panel_117); SysWorkState = new JTextField(); + SysWorkState.setFont(new Font("宋体", Font.BOLD, 15)); + SysWorkState.setForeground(Color.BLUE); panel_117.add(SysWorkState); SysWorkState.setColumns(10); @@ -618,6 +620,8 @@ tf_PageType = new JTextField(); tf_PageType.setColumns(10); + tf_PageType.setFont(new Font("宋体", Font.BOLD, 15)); + tf_PageType.setForeground(Color.BLUE); panel_181.add(tf_PageType); @@ -711,7 +715,7 @@ tf_VolHigh_wt.setColumns(10); JPanel panel_138 = new JPanel(); - panel_138.setBorder(new TitledBorder(null, "功率1(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_138.setBorder(new TitledBorder(null, "功率段1(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_138); panel_138.setLayout(new BorderLayout(0, 0)); @@ -731,7 +735,7 @@ tf_TestTime1_wt.setColumns(10); JPanel panel_140 = new JPanel(); - panel_140.setBorder(new TitledBorder(null, "功率2(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_140.setBorder(new TitledBorder(null, "功率段2(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_140); panel_140.setLayout(new BorderLayout(0, 0)); @@ -751,7 +755,7 @@ tf_TestTime2_wt.setColumns(10); JPanel panel_142 = new JPanel(); - panel_142.setBorder(new TitledBorder(null, "功率3(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_142.setBorder(new TitledBorder(null, "功率段3(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_142); panel_142.setLayout(new BorderLayout(0, 0)); @@ -771,7 +775,7 @@ tf_TestTime3_wt.setColumns(10); JPanel panel_144 = new JPanel(); - panel_144.setBorder(new TitledBorder(null, "功率4(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_144.setBorder(new TitledBorder(null, "功率段4(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_144); panel_144.setLayout(new BorderLayout(0, 0)); @@ -791,7 +795,7 @@ tf_TestTime4_wt.setColumns(10); JPanel panel_146 = new JPanel(); - panel_146.setBorder(new TitledBorder(null, "功率5(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_146.setBorder(new TitledBorder(null, "功率段5(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_146); panel_146.setLayout(new BorderLayout(0, 0)); @@ -811,7 +815,7 @@ tf_TestTime5_wt.setColumns(10); JPanel panel_148 = new JPanel(); - panel_148.setBorder(new TitledBorder(null, "功率6(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_148.setBorder(new TitledBorder(null, "功率段6(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_148); panel_148.setLayout(new BorderLayout(0, 0)); @@ -831,7 +835,7 @@ tf_TestTime6_wt.setColumns(10); JPanel panel_150 = new JPanel(); - panel_150.setBorder(new TitledBorder(null, "功率7(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_150.setBorder(new TitledBorder(null, "功率段7(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_150); panel_150.setLayout(new BorderLayout(0, 0)); @@ -851,7 +855,7 @@ tf_TestTime7_wt.setColumns(10); JPanel panel_152 = new JPanel(); - panel_152.setBorder(new TitledBorder(null, "功率8(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_152.setBorder(new TitledBorder(null, "功率段8(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_152); panel_152.setLayout(new BorderLayout(0, 0)); @@ -871,7 +875,7 @@ tf_TestTime8_wt.setColumns(10); JPanel panel_154 = new JPanel(); - panel_154.setBorder(new TitledBorder(null, "功率9(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_154.setBorder(new TitledBorder(null, "功率段9(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_154); panel_154.setLayout(new BorderLayout(0, 0)); @@ -891,7 +895,7 @@ tf_TestTime9_wt.setColumns(10); JPanel panel_80 = new JPanel(); - panel_80.setBorder(new TitledBorder(null, "功率10(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_80.setBorder(new TitledBorder(null, "功率段10(KVA)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_131.add(panel_80); panel_80.setLayout(new BorderLayout(0, 0)); @@ -2028,6 +2032,7 @@ if(IAC_RealData.Stopped == tmp_real.getSysWorkState()) { setButttonState(true); + System.out.println("########"); //告警情况下不允许启动测试 // if(tmp_real.getAlmState() > 8) { // @@ -2037,6 +2042,7 @@ // btn_st_start.setEnabled(false); //启动 // btn_xb_start.setEnabled(false); //启动 // } + btn_wt_pause.setEnabled(false); //暂停 btn_wt_stop.setEnabled(false); //停止 @@ -2055,7 +2061,38 @@ }else if(IAC_RealData.WTtesting == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_start.setEnabled(false); //启动 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_wt_read.setEnabled(true); //读取 btn_wt_write.setEnabled(true); //设置 @@ -2063,14 +2100,76 @@ btn_wt_stop.setEnabled(true); //停止 }else if(IAC_RealData.WTPause == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_pause.setEnabled(false); //暂停 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_wt_read.setEnabled(true); //读取 btn_wt_write.setEnabled(true); //设置 btn_wt_start.setEnabled(true); //启动 btn_wt_stop.setEnabled(true); //停止 }else if(IAC_RealData.ZDtesting == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_start.setEnabled(false); //启动 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_zd_read.setEnabled(true); //读取 btn_zd_write.setEnabled(true); //设置 @@ -2078,7 +2177,38 @@ btn_zd_stop.setEnabled(true); //停止 }else if(IAC_RealData.ZDPause == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_pause.setEnabled(false); //暂停 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_zd_read.setEnabled(true); //读取 btn_zd_write.setEnabled(true); //设置 @@ -2086,42 +2216,228 @@ btn_zd_stop.setEnabled(true); //停止 }else if(IAC_RealData.BDtesting == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_start.setEnabled(false); //启动 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_bd_read.setEnabled(true); //读取 btn_bd_write.setEnabled(true); //设置 btn_bd_pause.setEnabled(true); //暂停 btn_bd_stop.setEnabled(true); //停止 }else if(IAC_RealData.BDPause == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_pause.setEnabled(false); //暂停 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_bd_read.setEnabled(true); //读取 btn_bd_write.setEnabled(true); //设置 btn_bd_start.setEnabled(true); //启动 btn_bd_stop.setEnabled(true); //停止 }else if(IAC_RealData.STtesting == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_start.setEnabled(false); //启动 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_st_read.setEnabled(true); //读取 btn_st_write.setEnabled(true); //设置 btn_st_pause.setEnabled(true); //暂停 btn_st_stop.setEnabled(true); //停止 }else if(IAC_RealData.STPause == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_pause.setEnabled(false); //暂停 + + btn_xb_read.setEnabled(false); //读取 + btn_xb_write.setEnabled(false); //设置 + btn_xb_start.setEnabled(false); //启动 + btn_xb_pause.setEnabled(false); //暂停 + btn_xb_stop.setEnabled(false); //停止 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_st_read.setEnabled(true); //读取 btn_st_write.setEnabled(true); //设置 btn_st_start.setEnabled(true); //启动 btn_st_stop.setEnabled(true); //停止 }else if(IAC_RealData.XBtesting == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_start.setEnabled(false); //启动 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_xb_read.setEnabled(true); //读取 btn_xb_write.setEnabled(true); //设置 btn_xb_pause.setEnabled(true); //暂停 btn_xb_stop.setEnabled(true); //停止 }else if(IAC_RealData.XBPause == tmp_real.getSysWorkState()) { - setButttonState(false); + //setButttonState(false); + btn_wt_read.setEnabled(false); //读取 + btn_wt_write.setEnabled(false); //设置 + btn_wt_start.setEnabled(false); //启动 + btn_wt_pause.setEnabled(false); //暂停 + btn_wt_stop.setEnabled(false); //停止 + + btn_zd_read.setEnabled(false); //读取 + btn_zd_write.setEnabled(false); //设置 + btn_zd_start.setEnabled(false); //启动 + btn_zd_pause.setEnabled(false); //暂停 + btn_zd_stop.setEnabled(false); //停止 + + btn_bd_read.setEnabled(false); //读取 + btn_bd_write.setEnabled(false); //设置 + btn_bd_start.setEnabled(false); //启动 + btn_bd_pause.setEnabled(false); //暂停 + btn_bd_stop.setEnabled(false); //停止 + + btn_st_read.setEnabled(false); //读取 + btn_st_write.setEnabled(false); //设置 + btn_st_start.setEnabled(false); //启动 + btn_st_pause.setEnabled(false); //暂停 + btn_st_stop.setEnabled(false); //停止 + + btn_xb_pause.setEnabled(false); //暂停 + + btn_wt_exit.setEnabled(false); + btn_zd_exit.setEnabled(false); + btn_bd_exit.setEnabled(false); + btn_st_exit.setEnabled(false); + btn_xb_exit.setEnabled(false); btn_xb_read.setEnabled(true); //读取 btn_xb_write.setEnabled(true); //设置 diff --git a/Device_Simulator_DTS_Tester/src/main/main_window_computer.java b/Device_Simulator_DTS_Tester/src/main/main_window_computer.java index 4a484f9..4e7eac6 100644 --- a/Device_Simulator_DTS_Tester/src/main/main_window_computer.java +++ b/Device_Simulator_DTS_Tester/src/main/main_window_computer.java @@ -110,7 +110,7 @@ //public String mTitle = "MSP&SAM&SWM&Curr_V1.523_220424G"; public String mTitle = "调试工具"; - public String mVerSioin = "_V1.106"; + public String mVerSioin = "_V1.107"; public static int LANG_TYPE = LANG_TYPE_CN; @@ -1827,6 +1827,10 @@ }else { main_TabbedPane.add(bybb_title, main_TabbedRightPane16); main_TabbedPane.setIconAt(CommDevType_ICA_200KW, new ImageIcon(main_window_computer.class.getResource("/png_16x16/layer_treansparent.png"))); + if(DebugMode == DebugMode_TYPE_Package) { + //设置软件打开时默认软件全屏 + frmSerialport.setExtendedState(JFrame.MAXIMIZED_BOTH); + } } main_TabbedRightPane16.add(main_TabbedTopPane16,BorderLayout.NORTH); diff --git a/Device_Simulator_DTS_Tester/src/version.txt b/Device_Simulator_DTS_Tester/src/version.txt index cbbe48e..09bf2c0 100644 --- a/Device_Simulator_DTS_Tester/src/version.txt +++ b/Device_Simulator_DTS_Tester/src/version.txt @@ -24,4 +24,12 @@ 1.BTS4810调试工具兼容加密与不加密协议以及添加当前设备协议类型标识 2.新增BTS4810调试工具程序升级功能 +V1.107 edit by lijun 2024-11-19 + IAC600KW调试工具修改如下 + 1.开始连接,取消退出界面命令 + 2.工作状态和当前界面文本字体调整 + 3.修复按钮点击时,焦点异常 + 4.修改稳态中的功率1改成功率段1…… + 5.软件默认打开全屏 + -- Gitblit v1.9.1