From 8b30a702f2e70073e57ed354519b5df5ea78749c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 05 六月 2025 08:45:39 +0800
Subject: [PATCH] 1. 添加任务停止按钮

---
 SourceCode/Bond/Servo/PageAlarm.cpp |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/SourceCode/Bond/Servo/PageAlarm.cpp b/SourceCode/Bond/Servo/PageAlarm.cpp
index a1d4919..f86f5a2 100644
--- a/SourceCode/Bond/Servo/PageAlarm.cpp
+++ b/SourceCode/Bond/Servo/PageAlarm.cpp
@@ -39,6 +39,13 @@
 
 CPageAlarm::~CPageAlarm()
 {
+	if (m_hbrBkgnd != nullptr) {
+		::DeleteObject(m_hbrBkgnd);
+	}
+	if (m_pObserver != nullptr) {
+		m_pObserver->unsubscribe();
+		m_pObserver = nullptr;
+	}
 }
 
 void CPageAlarm::InitRxWindow()
@@ -187,7 +194,6 @@
 	ON_WM_DESTROY()
 	ON_WM_CLOSE()
 	ON_WM_SIZE()
-	ON_WM_TIMER()
 	ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CPageAlarm::OnCbnSelchangeComboDatetime)
 	ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CPageAlarm::OnBnClickedButtonSearch)
 	ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CPageAlarm::OnBnClickedButtonExport)
@@ -313,14 +319,6 @@
 	CDialogEx::OnSize(nType, cx, cy);
 	if (GetDlgItem(IDC_LIST_ALARM) == nullptr) return;
 	Resize();
-}
-
-void CPageAlarm::OnTimer(UINT_PTR nIDEvent)
-{
-	if (1 == nIDEvent) {
-		KillTimer(1);
-		InitRxWindow();
-	}
 }
 
 void CPageAlarm::OnCbnSelchangeComboDatetime()

--
Gitblit v1.9.3