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/PageRecipe.h |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h
index 6833e3b..eac7fb3 100644
--- a/SourceCode/Bond/Servo/PageRecipe.h
+++ b/SourceCode/Bond/Servo/PageRecipe.h
@@ -2,6 +2,8 @@
 #include "afxdialogex.h"
 #include "RecipeManager.h"
 #include "ListCtrlEx.h"
+#include "MsgDlg.h"
+
 
 // CPageRecipe 瀵硅瘽妗�
 
@@ -13,12 +15,16 @@
 	CPageRecipe(CWnd* pParent = nullptr);   // 鏍囧噯鏋勯�犲嚱鏁�
 	virtual ~CPageRecipe();
 
+public:
+	static UINT SyncThreadFunction(LPVOID lpvData);
+	UINT SyncThreadFunctionInner(CMsgDlg* pMsgDlg);
+
 private:
 	void InitListCtrlHeaderForMaster();
 	void InitListCtrlHeaderForDevice();
 	void UpdateRecipeByPPID(const CString& strPPID);
 	void FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe);
-	void FillRecipeListToListCtrl(SERVO::CRecipeList* pList);
+	void FillRecipeListToListCtrl(SERVO::CEquipment* pEq);
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -37,10 +43,13 @@
 	afx_msg void OnBnClickedButtonDelete();
 	afx_msg void OnBnClickedButtonDeleteAll();
 	afx_msg void OnBnClickedButtonRefresh();
-	afx_msg void OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnClickListPPID(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnDblclkListPPID(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnCbnSelchangeComboEquipment();
 	DECLARE_MESSAGE_MAP()
 
 private:
+	std::string SanitizeName(const std::string& name);
+
 	CListCtrlEx m_listPPID;
-};
+};
\ No newline at end of file

--
Gitblit v1.9.3