From f0e9c7745f0f01e93b00306c2ba64b0586e70b9d Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期二, 04 三月 2025 10:56:41 +0800
Subject: [PATCH] 1. 添加通过 alarm_event_id 解除报警（更新结束时间） 2. 通过多个属性查找并解除报警（更新结束时间）
---
SourceCode/Bond/Servo/ServoDlg.h | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 3b1cd3b..ab71ed2 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,7 +6,12 @@
#include "ServoGraph.h"
#include "BlButton.h"
#include "LogDlg.h"
+#include "TerminalDisplayDlg.h"
+enum DeviceStatus {
+ ONLINE, // 在线
+ OFFLINE, // 离线
+};
// CServoDlg 对话框
class CServoDlg : public CDialogEx
@@ -16,9 +21,25 @@
CServoDlg(CWnd* pParent = NULL); // 标准构造函数
+public:
+ void ShowTerminalText(const char* pszText, unsigned int duration = -1);
+
private:
+ void InitRxWindows();
void Resize();
void UpdateLogBtn();
+ void UpdateAlarmBtn();
+ void UpdateRobotPosition(float percentage);
+ void RotateRobot(float angleInDegrees);
+ void UpdateDeviceStatus(int id, DeviceStatus status);
+
+
+private:
+ IObserver* m_pObserver;
+ BOOL m_bShowLogWnd;
+ BOOL m_bShowAlarmWnd;
+ CLogDlg* m_pLogDlg;
+ CTerminalDisplayDlg* m_pTerminalDisplayDlg;
// 对话框数据
@@ -31,8 +52,7 @@
private:
- BOOL m_bShowLogWnd;
- CLogDlg* m_pLogDlg;
+ BOOL m_bIsRobotMoving;
// 实现
protected:
@@ -41,6 +61,7 @@
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
CBlButton m_btnLog;
+ CBlButton m_btnAlarm;
// 生成的消息映射函数
@@ -70,4 +91,7 @@
afx_msg void OnMenuFileExit();
afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
afx_msg void OnMenuHelpAbout();
+ afx_msg void OnTimer(UINT_PTR nIDEvent);
+ afx_msg BOOL OnEraseBkgnd(CDC* pDC);
+ afx_msg void OnBnClickedButtonAlarm();
};
--
Gitblit v1.9.3