From 8b96cadc838caf8d664e2d54576874bec299972a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 24 七月 2025 17:36:32 +0800
Subject: [PATCH] 1.EAP模拟器，增加Link Report加载功能，列表展示功能，修改Report ID功能，但未真正下发到指令到Master.
---
SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
index ee40fd2..756b7b2 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
@@ -9,6 +9,10 @@
#include "afxdialogex.h"
#include "Common.h"
#include <regex>
+#include "CTerminalDisplayDlg.h"
+#include "CEDEventReportDlg.h"
+#include "CDefineReportsDlg.h"
+#include "CLinkReportDlg.h"
#ifdef _DEBUG
@@ -73,6 +77,13 @@
ON_WM_DESTROY()
ON_BN_CLICKED(IDC_BUTTON_CONNECT, &CEAPSimulatorDlg::OnBnClickedButtonConnect)
ON_BN_CLICKED(IDC_BUTTON_DISCONNECT, &CEAPSimulatorDlg::OnBnClickedButtonDisconnect)
+ ON_BN_CLICKED(IDC_BUTTON_ARE_YOU_THERE, &CEAPSimulatorDlg::OnBnClickedButtonAreYouThere)
+ ON_BN_CLICKED(IDC_BUTTON_DATETIME_SYNC, &CEAPSimulatorDlg::OnBnClickedButtonDatetimeSync)
+ ON_BN_CLICKED(IDC_BUTTON_TERMINAL_DISPLAY, &CEAPSimulatorDlg::OnBnClickedButtonTerminalDisplay)
+ ON_BN_CLICKED(IDC_BUTTON_ED_EVENT_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonEdEventReport)
+ ON_BN_CLICKED(IDC_BUTTON_ED_ALARM_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonEdAlarmReport)
+ ON_BN_CLICKED(IDC_BUTTON_DEFINE_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonDefineReport)
+ ON_BN_CLICKED(IDC_BUTTON_LINE_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonLineReport)
END_MESSAGE_MAP()
@@ -103,13 +114,11 @@
int state;
if (pAny->getIntValue("exCode", state)) {
if ((ACTIVESTATE)state == ACTIVESTATE::SELECTED) {
- GetDlgItem(IDC_BUTTON_DISCONNECT)->EnableWindow(TRUE);
+ SetGroup2Enabled(TRUE);
}
if ((ACTIVESTATE)state == ACTIVESTATE::NOT_CONNECTED) {
- GetDlgItem(IDC_BUTTON_DISCONNECT)->EnableWindow(FALSE);
- GetDlgItem(IDC_EDIT_IP)->EnableWindow(TRUE);
- GetDlgItem(IDC_EDIT_PORT)->EnableWindow(TRUE);
- GetDlgItem(IDC_BUTTON_CONNECT)->EnableWindow(TRUE);
+ SetGroup2Enabled(FALSE);
+ SetGroup1Enabled(TRUE);
}
}
}
@@ -125,6 +134,8 @@
theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())
->subscribe(m_pObserver);
}
+
+ theApp.m_model.init();
}
BOOL CEAPSimulatorDlg::OnInitDialog()
@@ -158,6 +169,9 @@
SetDlgItemText(IDC_EDIT_IP, _T("127.0.0.1"));
SetDlgItemInt(IDC_EDIT_PORT, 7000);
+ SetGroup2Enabled(FALSE);
+ SetGroup1Enabled(TRUE);
+ ::SetProp(GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->m_hWnd, _T("Enable"), (void*)1);
// log edit
@@ -236,6 +250,25 @@
m_pObserver = NULL;
}
+void CEAPSimulatorDlg::SetGroup1Enabled(bool enabled)
+{
+ GetDlgItem(IDC_EDIT_IP)->EnableWindow(enabled);
+ GetDlgItem(IDC_EDIT_PORT)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_CONNECT)->EnableWindow(enabled);
+}
+
+void CEAPSimulatorDlg::SetGroup2Enabled(bool enabled)
+{
+ GetDlgItem(IDC_BUTTON_DISCONNECT)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_ARE_YOU_THERE)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_DATETIME_SYNC)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_TERMINAL_DISPLAY)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_ED_EVENT_REPORT)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_DEFINE_REPORT)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_LINE_REPORT)->EnableWindow(enabled);
+}
+
void CEAPSimulatorDlg::OnBnClickedButtonConnect()
{
CString strIp;
@@ -243,12 +276,55 @@
GetDlgItemText(IDC_EDIT_IP, strIp);
port = GetDlgItemInt(IDC_EDIT_PORT);
theApp.m_model.connectEq((LPTSTR)(LPCTSTR)strIp, port);
- GetDlgItem(IDC_EDIT_IP)->EnableWindow(FALSE);
- GetDlgItem(IDC_EDIT_PORT)->EnableWindow(FALSE);
- GetDlgItem(IDC_BUTTON_CONNECT)->EnableWindow(FALSE);
+ SetGroup1Enabled(FALSE);
}
void CEAPSimulatorDlg::OnBnClickedButtonDisconnect()
{
theApp.m_model.disconnect();
}
+
+void CEAPSimulatorDlg::OnBnClickedButtonAreYouThere()
+{
+ theApp.m_model.m_pHsmsActive->hsmsAreYouThere();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonDatetimeSync()
+{
+ theApp.m_model.m_pHsmsActive->hsmsDatetimeSync();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonTerminalDisplay()
+{
+ CTerminalDisplayDlg dlg;
+ dlg.DoModal();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonEdEventReport()
+{
+ CEDEventReportDlg dlg;
+ dlg.DoModal();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonEdAlarmReport()
+{
+ int enable = (int)::GetProp(GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->m_hWnd, _T("Enable"));
+ enable = enable == 0 ? 1 : 0;
+ theApp.m_model.m_pHsmsActive->hsmsEDAlarmReport(enable == 1, 0);
+
+ SetDlgItemText(IDC_BUTTON_ED_ALARM_REPORT,
+ enable == 1 ? _T("Disable Alarm Report") : _T("Enable Alarm Report"));
+ ::SetProp(GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->m_hWnd, _T("Enable"), (void*)enable);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonDefineReport()
+{
+ CDefineReportsDlg dlg;
+ dlg.DoModal();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonLineReport()
+{
+ CLinkReportDlg dlg;
+ dlg.DoModal();
+}
--
Gitblit v1.9.3