From d7c88780e1df54f34563d60bd7fa01011d2eef03 Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期一, 26 一月 2026 23:17:17 +0800 Subject: [PATCH] 1.CSVData.cpp 里 unserialize 用了 8*2、125*2,但 serialize 只写 8 + 125 字节。 m_svRawData.insert 的 end 指针是 pszBuffer + 125*2,没有用 index 计算,可能把无效区域一起拷进去。 一旦 size 实际是 133(不是 266),就会直接越界,堆会被破坏,m_svDatas.clear() 在销毁元素时崩。 --- SourceCode/Bond/Servo/Common.h | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h index 4969d57..41b56e7 100644 --- a/SourceCode/Bond/Servo/Common.h +++ b/SourceCode/Bond/Servo/Common.h @@ -20,7 +20,11 @@ #define RX_CODE_EQ_ROBOT_TASK 1012 #define RX_CODE_LOADPORT_STATUS_CHANGED 1014 #define RX_CODE_CONTROL_STATE_CHANGED 1015 +#define RX_CODE_CONTROLJOB_CHANGED 1016 +/* 软件侧 ALID */ +#define ALID_SOFTWARE_PAUSE_EVENT 9000 +#define ALID_SOFTWARE_TEST_ALARM 9099 /* Channel Name */ #define MC_CHANNEL1_NAME "McChannel1" @@ -556,4 +560,25 @@ /* PPID名字最大长度 */ -#define PPID_NAME_MAX 80 \ No newline at end of file +#define PPID_NAME_MAX 80 + + +/* 解除警告 按钮 */ +#define BTN_ALARM_OFF_FRAME_NORMAL RGB(88, 88, 88) +#define BTN_ALARM_OFF_FRAME_HOVER RGB(88, 88, 88) +#define BTN_ALARM_OFF_FRAME_PRESS RGB(88, 88, 88) +#define BTN_ALARM_OFF_BKGND_NORMAL RGB(255, 127, 39) +#define BTN_ALARM_OFF_BKGND_HOVER RGB(255, 157, 59) +#define BTN_ALARM_OFF_BKGND_PRESS RGB(255, 100, 29) + +/* 静音按钮 */ +#define BTN_SOUND_OFF_FRAME_NORMAL RGB(88, 88, 88) +#define BTN_SOUND_OFF_FRAME_HOVER RGB(88, 88, 88) +#define BTN_SOUND_OFF_FRAME_PRESS RGB(88, 88, 88) +#define BTN_SOUND_OFF_BKGND_NORMAL RGB(255, 127, 39) +#define BTN_SOUND_OFF_BKGND_HOVER RGB(255, 157, 59) +#define BTN_SOUND_OFF_BKGND_PRESS RGB(255, 100, 29) +#define BTN_SOUND_ON_BKGND_NORMAL RGB(100, 200, 100) +#define BTN_SOUND_ON_BKGND_HOVER RGB(150, 250, 150) +#define BTN_SOUND_ON_BKGND_PRESS RGB(50, 150, 50) + -- Gitblit v1.9.3