From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期日, 04 一月 2026 10:45:07 +0800 Subject: [PATCH] 1.修复报文字段差异风险: S1F3:项目用 getSubItemU4(0) 取 SVID;日志里有 U2 的情况,可能导致解析失败后回退成 SV=0。 S6F11:项目发送 DATAID(U4) + CEID(U4);日志样例里第一个字段是 U2,可能存在类型/字段定义不一致。 --- SourceCode/Bond/BondEq/Common.h | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/BondEq/Common.h b/SourceCode/Bond/BondEq/Common.h index d52651b..edd4118 100644 --- a/SourceCode/Bond/BondEq/Common.h +++ b/SourceCode/Bond/BondEq/Common.h @@ -37,6 +37,21 @@ #define RX_CODE_EFEM_STATUS_CHANGED 1015 #define RX_CODE_EQ_STATE_CHANGED 1016 #define RX_CODE_SELECT_COMPONENT 1017 +#define RX_CODE_BONDER_BEEP 1018 +#define RX_CODE_BONDER_VELOCITY_RATIO 1019 +#define RX_CODE_BONDER_TACT_TIME 1020 +#define RX_CODE_BONDER_DAY_SHIFT_CAPACTITY 1021 +#define RX_CODE_BONDER_NIGHT_SHIFT_CAPACTITY 1022 + +// 临时添加 m_bBlBtnsStates[7] +#define RX_CODE_BONDER_STATES_BTN0 1023 +#define RX_CODE_BONDER_STATES_BTN1 1024 +#define RX_CODE_BONDER_STATES_BTN2 1025 +#define RX_CODE_BONDER_STATES_BTN3 1026 +#define RX_CODE_BONDER_STATES_BTN4 1027 +#define RX_CODE_BONDER_STATES_BTN5 1028 +#define RX_CODE_BONDER_STATES_BTN6 1029 + /* 广播代码 */ #define BC_CODE_DATA1_MATERIAL_RECEIVED 5000 @@ -145,6 +160,27 @@ #define BTN_POINT_BKGND_PRESS RGB(0, 232, 0) +/* 解除警告 按钮 */ +#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) + + /* 按钮id */ #define VIEW_TOOL_BTN_CLOSE 0x1016 -- Gitblit v1.9.3