From 2070871df480a664c9c4e38bc4e4e324682a64c6 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 16:12:28 +0800
Subject: [PATCH] 1. 解决 WebView2 控制器创建失败时闪退的问题 2. 解决连接图销毁时保存设备图形数据闪退的问题
---
SourceCode/Bond/Servo/AlarmDlg.cpp | 154 +++++++++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 55 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index 05ccd39..9db69a5 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -7,8 +7,9 @@
#include "AlarmDlg.h"
#include "AlarmManager.h"
#include "Common.h"
+#include <iomanip>
-#define PAGE_SIZE 10
+#define PAGE_SIZE 100
#define PAGE_BACKGROUND_COLOR RGB(252, 252, 255)
// CAlarmDlg 瀵硅瘽妗�
@@ -22,7 +23,9 @@
m_hbrBkgnd = nullptr;
m_pObserver = nullptr;
- m_strEqName = "";
+ m_nSeverityLevel = 0;
+ m_strDeviceName = "";
+ m_strUnitName = "";
m_strKeyword = "";
m_nCurPage = 0;
m_nTotalPages = 0;
@@ -50,31 +53,12 @@
pAny->addRef();
int code = pAny->getCode();
- if (RX_CODE_STEP_EVENT_READDATA == code) {
- LOGI("<CAlarmDlg> Accept RX_CODE_STEP_EVENT_READDATA successfully!");
- // 閫氱煡璁惧鐘舵��
- SERVO::CEqAlarmStep* pStep = nullptr;
- if (pAny->getPtrValue("ptr", (void*&)pStep)) {
- if (pStep != nullptr) {
- // 鑾峰彇 AlarmManager 鍗曚緥
- AlarmManager& alarmManager = AlarmManager::getInstance();
-
- // 浠� pStep 鑾峰彇闇�瑕佺殑鍙傛暟锛屽亣璁捐繖浜涘�兼槸浠� pStep 涓幏鍙栫殑
- std::string id = std::to_string(pStep->getAlarmId());
- std::string deviceName = std::to_string(pStep->getUnitId());
- std::string description = "pStep->getText()";
- std::string startTime = "2025-02-25 10:00";
- std::string endTime = "2025-02-25 12:00";
-
- // 鎻掑叆鍒楄〃鎺т欢
- CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
- if (pListCtrl != nullptr) {
- InsertAlarmData(pListCtrl, id.c_str(), deviceName.c_str(), description.c_str(), startTime.c_str(), endTime.c_str());
- }
- }
- }
+ if (RX_CODE_ALARM_SET == code) {
+ UpdatePageData();
}
-
+ else if (RX_CODE_ALARM_CLEAR == code) {
+ UpdatePageData();
+ }
pAny->release();
}, [&]() -> void {
@@ -96,7 +80,7 @@
GetClientRect(&rcClient);
pItem = GetDlgItem(IDC_LIST_ALARM);
- pItem->MoveWindow(12, 52, rcClient.Width() - 24, rcClient.Height() - 64);
+ pItem->MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
}
void CAlarmDlg::LoadAlarms()
@@ -109,7 +93,7 @@
void CAlarmDlg::UpdatePageData()
{
// 鏍规嵁杩囨护鏉′欢鍔犺浇鏁版嵁锛屾彁渚涙弿杩板拰鏃堕棿鑼冨洿鏌ヨ
- auto vecData = AlarmManager::getInstance().getFilteredAlarms("", m_strEqName, m_strKeyword, m_szTimeStart, m_szTimeEnd, m_nCurPage, PAGE_SIZE);
+ auto vecData = AlarmManager::getInstance().getFilteredAlarms("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd, m_nCurPage, PAGE_SIZE);
// 濉厖鏁版嵁鍒版帶浠�
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
@@ -131,41 +115,69 @@
GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}
-void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<std::vector<std::string>>& vecData)
+void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
{
+ if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ return;
+ }
+
// 娓呯┖褰撳墠CListCtrl涓殑鎵�鏈夐」
pListCtrl->DeleteAllItems();
// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
- for (const auto& item : vecData) {
- int nItem = pListCtrl->InsertItem(pListCtrl->GetItemCount(), _T("")); // 鎻掑叆鏂拌
- pListCtrl->SetItemText(nItem, 1, item[0].c_str()); // 璁剧疆绗竴鍒楃殑鏂囨湰锛圛D锛�
- pListCtrl->SetItemText(nItem, 2, item[1].c_str()); // 璁剧疆绗簩鍒楃殑鏂囨湰锛堣澶囧悕绉帮級
- pListCtrl->SetItemText(nItem, 3, item[2].c_str()); // 璁剧疆绗笁鍒楃殑鏂囨湰锛堟弿杩帮級
- pListCtrl->SetItemText(nItem, 4, item[3].c_str()); // 璁剧疆绗洓鍒楃殑鏂囨湰锛堝紑濮嬫椂闂达級
- pListCtrl->SetItemText(nItem, 5, item[4].c_str()); // 璁剧疆绗洓鍒楃殑鏂囨湰锛堣В闄ゆ椂闂达級
+ for (const auto& alarm : vecData) {
+ InsertAlarmData(pListCtrl, alarm);
}
+
+ // 鑾峰彇鍒楁暟
+ int nColCount = pListCtrl->GetHeaderCtrl()->GetItemCount();
+ pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
}
-void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const CString& alarmId, const CString& deviceName, const CString& description, const CString& startTime, const CString& endTime)
+static char* pszAlarmLevel[] = { "Warning", "Error" };
+void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
{
+ if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ return;
+ }
+
int nRowCount = pListCtrl->GetItemCount();
if (nRowCount >= PAGE_SIZE) {
pListCtrl->DeleteItem(nRowCount - 1);
}
int nNewItem = pListCtrl->InsertItem(0, _T(""));
- pListCtrl->SetItemText(nNewItem, 1, alarmId); // 璀﹀憡ID
- pListCtrl->SetItemText(nNewItem, 2, deviceName); // 璁惧鍚嶇О
- pListCtrl->SetItemText(nNewItem, 3, description); // 鎻忚堪
- pListCtrl->SetItemText(nNewItem, 4, startTime); // 鍙戠敓鏃堕棿
- pListCtrl->SetItemText(nNewItem, 5, endTime); // 瑙ｉ櫎鏃堕棿
+
+ // 璁剧疆姣忎竴鍒楃殑鏁版嵁
+ CString str;
+ str.Format(_T("%d"), alarmData.nId);
+ pListCtrl->SetItemText(nNewItem, 1, str); // 鎶ヨID
+ pListCtrl->SetItemText(nNewItem, 2, pszAlarmLevel[alarmData.nSeverityLevel % 2]); // 绛夌骇
+ pListCtrl->SetItemText(nNewItem, 3, alarmData.strDeviceName.c_str()); // 璁惧鍚嶇О
+ pListCtrl->SetItemText(nNewItem, 4, alarmData.strUnitName.c_str()); // 鍗曞厓鍚嶇О
+ pListCtrl->SetItemText(nNewItem, 5, alarmData.strStartTime.c_str()); // 寮�濮嬫椂闂�
+ pListCtrl->SetItemText(nNewItem, 6, alarmData.strEndTime.c_str()); // 缁撴潫鏃堕棿
+ pListCtrl->SetItemText(nNewItem, 7, alarmData.strDescription.c_str()); // 鎻忚堪
+}
+
+std::string CAlarmDlg::getCurrentTimeString()
+{
+ auto now = std::chrono::system_clock::now();
+ auto time_t_now = std::chrono::system_clock::to_time_t(now);
+
+ std::tm tm_now = {};
+ localtime_s(&tm_now, &time_t_now);
+
+ std::stringstream ss;
+ ss << std::put_time(&tm_now, "%Y-%m-%d %H:%M:%S");
+ return ss.str();
}
void CAlarmDlg::DoDataExchange(CDataExchange* pDX)
{
DDX_Control(pDX, IDC_DATETIMEPICKER_START, m_dateTimeStart);
DDX_Control(pDX, IDC_DATETIMEPICKER_END, m_dateTimeEnd);
+ DDX_Control(pDX, IDC_LIST_ALARM, m_listCtrl);
CDialogEx::DoDataExchange(pDX);
}
@@ -173,6 +185,7 @@
BEGIN_MESSAGE_MAP(CAlarmDlg, CDialogEx)
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
+ ON_WM_CLOSE()
ON_WM_SIZE()
ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CAlarmDlg::OnCbnSelchangeComboDatetime)
ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CAlarmDlg::OnBnClickedButtonSearch)
@@ -202,6 +215,17 @@
m_dateTimeStart.EnableWindow(FALSE);
m_dateTimeEnd.EnableWindow(FALSE);
+
+ // 璇诲嚭鍒楀
+ CString strIniFile, strItem;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ int width[8] = { 0, 80, 180, 80, 80, 100, 80, 180};
+ for (int i = 0; i < 8; i++) {
+ strItem.Format(_T("Col_%d_Width"), i);
+ width[i] = GetPrivateProfileInt("AlarmListCtrl", strItem, width[i], strIniFile);
+ }
+
+
// 鎶ヨ〃鎺т欢
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
DWORD dwStyle = pListCtrl->GetExtendedStyle();
@@ -211,15 +235,20 @@
HIMAGELIST imageList = ImageList_Create(24, 24, ILC_COLOR24, 1, 1);
ListView_SetImageList(pListCtrl->GetSafeHwnd(), imageList, LVSIL_SMALL);
- pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, 0);
- pListCtrl->InsertColumn(1, _T("璀﹀憡ID"), LVCFMT_LEFT, 50);
- pListCtrl->InsertColumn(2, _T("璁惧鍚嶇О"), LVCFMT_LEFT, 120);
- pListCtrl->InsertColumn(3, _T("鎻忚堪"), LVCFMT_LEFT, 280);
- pListCtrl->InsertColumn(4, _T("鍙戠敓鏃堕棿"), LVCFMT_LEFT, 180);
- pListCtrl->InsertColumn(5, _T("瑙ｉ櫎鏃堕棿"), LVCFMT_LEFT, 180);
+ pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, width[0]);
+ pListCtrl->InsertColumn(1, _T("璀﹀憡ID"), LVCFMT_LEFT, width[1]);
+ pListCtrl->InsertColumn(2, _T("鎶ヨ绛夌骇"), LVCFMT_LEFT, width[2]);
+ pListCtrl->InsertColumn(3, _T("璁惧鍚嶇О"), LVCFMT_LEFT, width[3]);
+ pListCtrl->InsertColumn(4, _T("鍗曞厓鍚嶇О"), LVCFMT_LEFT, width[4]);
+ pListCtrl->InsertColumn(5, _T("鍙戠敓鏃堕棿"), LVCFMT_LEFT, width[5]);
+ pListCtrl->InsertColumn(6, _T("瑙ｉ櫎鏃堕棿"), LVCFMT_LEFT, width[6]);
+ pListCtrl->InsertColumn(7, _T("鎻忚堪"), LVCFMT_LEFT, width[7]);
+ pListCtrl->SetColumnWidth(7, LVSCW_AUTOSIZE_USEHEADER);
+
+
// 璁＄畻鎬婚〉鏁�
- int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", m_strEqName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
+ int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
m_nCurPage = 1;
@@ -228,11 +257,6 @@
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
-}
-
-BOOL CAlarmDlg::DestroyWindow()
-{
- return CDialogEx::DestroyWindow();
}
HBRUSH CAlarmDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
@@ -254,6 +278,20 @@
{
CDialogEx::OnDestroy();
+
+ // 淇濆瓨鍒楀
+ CString strIniFile, strItem, strTemp;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ CHeaderCtrl* pHeader = m_listCtrl.GetHeaderCtrl();
+ for (int i = 0; i < pHeader->GetItemCount(); i++) {
+ RECT rect;
+ pHeader->GetItemRect(i, &rect);
+ strItem.Format(_T("Col_%d_Width"), i);
+ strTemp.Format(_T("%d"), rect.right - rect.left);
+ WritePrivateProfileString("AlarmListCtrl", strItem, strTemp, strIniFile);
+ }
+
+
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
@@ -262,6 +300,12 @@
m_pObserver->unsubscribe();
m_pObserver = NULL;
}
+}
+
+void CAlarmDlg::OnClose()
+{
+ ShowWindow(SW_HIDE);
+ GetParent()->PostMessage(ID_MSG_ALARMDLG_HIDE, 0, 0);
}
void CAlarmDlg::OnSize(UINT nType, int cx, int cy)
@@ -333,7 +377,7 @@
}
// 璁＄畻鎬婚〉鏁�
- int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", m_strEqName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
+ int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
m_nCurPage = 1;
--
Gitblit v1.9.3