From 02fb493f0903013e5258c2ff5e2cb27de873378a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 十二月 2024 10:51:43 +0800
Subject: [PATCH] 1.警告性息弹窗; 2.警告性息列表;
---
SourceCode/Bond/BondEq/Model.cpp | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BondEq/Model.cpp b/SourceCode/Bond/BondEq/Model.cpp
index 8c088d2..8a6cbec 100644
--- a/SourceCode/Bond/BondEq/Model.cpp
+++ b/SourceCode/Bond/BondEq/Model.cpp
@@ -155,10 +155,16 @@
notifyObj(RX_CODE_PANEL_COMPLATE, pPanel);
pPanel->release();
}
- else if (code == BC_CODE_ALARM_EVENT) {
+ else if (code == BC_CODE_ALARM_ON) {
CAlarm* pAlarm = (CAlarm*)pIntent->getContext();
pAlarm->addRef();
- notifyObjAndPtr(RX_CODE_ALARM_EVENT, pAlarm, pSender);
+ notifyObjAndPtr(RX_CODE_ALARM_ON, pAlarm, pSender);
+ pAlarm->release();
+ }
+ else if (code == BC_CODE_ALARM_OFF) {
+ CAlarm* pAlarm = (CAlarm*)pIntent->getContext();
+ pAlarm->addRef();
+ notifyObjAndPtr(RX_CODE_ALARM_OFF, pAlarm, pSender);
pAlarm->release();
}
else if (code == BC_CODE_EQSTATE_EVENT) {
@@ -172,6 +178,11 @@
m_bonder.init();
+ CString strBonderDataFile;
+ strBonderDataFile.Format(_T("%s\\Bonder.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ m_bonder.read((LPTSTR)(LPCTSTR)strBonderDataFile);
+
+
return 0;
}
--
Gitblit v1.9.3