From 238f41fd4edac2febc03d2e428bce7206f609e99 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 29 一月 2026 15:38:58 +0800
Subject: [PATCH] 1.完善CJ/PJ事件上报；
---
SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
index 47b1c44..a52341f 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
@@ -105,7 +105,10 @@
ON_BN_CLICKED(IDC_BUTTON_QUERY_CONTROL_STATE, &CEAPSimulatorDlg::OnBnClickedButtonQueryControlState)
ON_BN_CLICKED(IDC_BUTTON_QUERY_PROCESS_STATE, &CEAPSimulatorDlg::OnBnClickedButtonQueryProcessState)
ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_SVID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllSvid)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_DVID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllDvid)
ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_CEID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllCeid)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_ECID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllEcid)
+ ON_BN_CLICKED(IDC_BUTTON_SET_ECID, &CEAPSimulatorDlg::OnBnClickedButtonSetEcid)
ON_BN_CLICKED(IDC_BUTTON_QUERY_CURRENT_RECIPE, &CEAPSimulatorDlg::OnBnClickedButtonQueryCurrentRecipe)
ON_BN_CLICKED(IDC_BUTTON_PP_REQUEST, &CEAPSimulatorDlg::OnBnClickedButtonPpRequest)
END_MESSAGE_MAP()
@@ -277,6 +280,53 @@
if (hBtn != nullptr) {
::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
}
+ }
+ // S1F21 QueryAllDVID
+ {
+ CRect rc(14 + 140 + 5, 152, 14 + 140 + 5 + 140, 152 + 14);
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S1F21_QueryAllDVID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_ALL_DVID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // S2F13 QueryAllECID
+ {
+ CRect rc(14 + 2 * (140 + 5), 192, 14 + 2 * (140 + 5) + 140, 192 + 14);
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S2F13_QueryAllECID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_ALL_ECID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // ECID edit + send (S2F15)
+ {
+ CRect rcEcid(14, 192, 14 + 60, 192 + 14);
+ CRect rcEcv(14 + 60 + 4, 192, 14 + 60 + 4 + 60, 192 + 14);
+ MapDialogRect(&rcEcid);
+ MapDialogRect(&rcEcv);
+ HWND hEditEcid = ::CreateWindow(_T("EDIT"), _T(""), WS_CHILD | WS_VISIBLE | WS_BORDER,
+ rcEcid.left, rcEcid.top, rcEcid.Width(), rcEcid.Height(),
+ m_hWnd, (HMENU)IDC_EDIT_ECID, AfxGetInstanceHandle(), nullptr);
+ HWND hEditEcv = ::CreateWindow(_T("EDIT"), _T(""), WS_CHILD | WS_VISIBLE | WS_BORDER,
+ rcEcv.left, rcEcv.top, rcEcv.Width(), rcEcv.Height(),
+ m_hWnd, (HMENU)IDC_EDIT_ECV, AfxGetInstanceHandle(), nullptr);
+ if (hEditEcid) ::SendMessage(hEditEcid, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ if (hEditEcv) ::SendMessage(hEditEcv, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+
+ CRect rcBtn(14 + 60 + 4 + 60 + 4, 192, 14 + 60 + 4 + 60 + 4 + 90, 192 + 14);
+ MapDialogRect(&rcBtn);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S2F15_SetECID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rcBtn.left, rcBtn.top, rcBtn.Width(), rcBtn.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_SET_ECID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn) ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
}
// S1F3 CurrentRecipe (EQ specific) combo + button
{
@@ -652,11 +702,38 @@
theApp.m_model.m_pHsmsActive->hsmsQueryAllStatusVariables();
}
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllDvid()
+{
+ theApp.m_model.m_pHsmsActive->hsmsQueryAllDataVariables();
+}
+
void CEAPSimulatorDlg::OnBnClickedButtonQueryAllCeid()
{
theApp.m_model.m_pHsmsActive->hsmsQueryAllCollectionEvents();
}
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllEcid()
+{
+ // empty list => all ECID
+ std::vector<unsigned short> ecids;
+ ecids.push_back(2000);
+ theApp.m_model.m_pHsmsActive->hsmsEquipmentConstantRequest(ecids);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonSetEcid()
+{
+ // simple demo: read ECID and value from edit boxes (reuse PPID edit)
+ CString sEcid, sVal;
+ GetDlgItemText(IDC_EDIT_ECID, sEcid);
+ GetDlgItemText(IDC_EDIT_ECV, sVal);
+ unsigned short id = static_cast<unsigned short>(_ttoi(sEcid));
+ std::string val = CT2A(sVal);
+ std::vector<std::pair<unsigned short, std::string>> kvs;
+ if (id != 0) {
+ kvs.push_back({ id, val });
+ theApp.m_model.m_pHsmsActive->hsmsEquipmentConstantSend(kvs);
+ }
+}
void CEAPSimulatorDlg::OnBnClickedButtonQueryCurrentRecipe()
{
CString sel;
--
Gitblit v1.9.3