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/Servo/CEquipmentPage1.h |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.h b/SourceCode/Bond/Servo/CEquipmentPage1.h
index 34106f1..5db7005 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage1.h
+++ b/SourceCode/Bond/Servo/CEquipmentPage1.h
@@ -24,12 +24,18 @@
 	void setEquipment(SERVO::CEquipment* pEquipment);
 
 private:
+	int m_nCurrentDeviceID;
 	SERVO::CEquipment* m_pEquipment;
 	std::vector<SignalInfo> m_vSignalList;
 	CJobSlotGrid m_ctrlSignalPanel;
+	std::map<int, std::vector<SignalInfo>> m_mapSignalListByID;
 
-	void InitSignalList();
-	void LoadDeviceSignals();
+	void LoadSignalListFromCSV(const CString& strFilePath);
+	void InitSignalListForDevice(int nDeviceID);
+	void UpdateSignalState(int nRow, int nCol, bool bNewState);
+	void InitSignalSlotTextAndClickable();
+	void UpdateAllSignalStatesFromDevice();
+	void ResetSignalPanel();
 
 
 // 瀵硅瘽妗嗘暟鎹�
@@ -46,4 +52,5 @@
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	afx_msg void OnDestroy();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 };

--
Gitblit v1.9.3