From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）

---
 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