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/CPageGlassList.h |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageGlassList.h b/SourceCode/Bond/Servo/CPageGlassList.h
index 7d702c7..af56f30 100644
--- a/SourceCode/Bond/Servo/CPageGlassList.h
+++ b/SourceCode/Bond/Servo/CPageGlassList.h
@@ -1,5 +1,5 @@
 锘�#pragma once
-#include "ListCtrlEx.h"
+#include "CExpandableListCtrl.h"
 #include "GlassLogDb.h"
 
 
@@ -33,7 +33,11 @@
 	// 鎺т欢
 	CDateTimeCtrl m_dateTimeStart;
 	CDateTimeCtrl m_dateTimeEnd;
-	CListCtrlEx m_listCtrl;
+	CExpandableListCtrl m_listCtrl;
+
+private:
+	int  m_nColCount = 0;
+	bool m_rebuilding = false;
 
 private:
 	void InitRxWindow();
@@ -44,7 +48,13 @@
 	void LoadData();
 	void UpdatePageData();
 	void UpdatePageControls();
-
+	void InsertWipRow(SERVO::CGlass* pGlass);
+	static bool GlassMatchesFilters(const SERVO::CGlass& g,
+		const GlassLogDb::Filters& f,
+		bool useEndTime = false);
+	void UpdateWipData();
+	bool eraseGlassInVector(SERVO::CGlass* pGlass, std::vector<SERVO::CGlass*>& glasses);
+	void UpdateWipRow(unsigned int index, SERVO::CGlass* pGlass);
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -64,5 +74,6 @@
 	afx_msg void OnBnClickedButtonExport();
 	afx_msg void OnBnClickedButtonPrevPage();
 	afx_msg void OnBnClickedButtonNextPage();
+	afx_msg void OnShowFullText(NMHDR* pNMHDR, LRESULT* pResult);
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3