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/BoounionPLC/Model.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/Model.h b/SourceCode/Bond/BoounionPLC/Model.h
index 5ea3814..55401e4 100644
--- a/SourceCode/Bond/BoounionPLC/Model.h
+++ b/SourceCode/Bond/BoounionPLC/Model.h
@@ -16,9 +16,13 @@
 	int init();
 	int term();
 	void onTimer(UINT nTimerid);
-	std::map<std::string, CPLC*>& gtPlcMap();
+	std::map<std::string, CPLC*>& getPlcMap();
 	int addPlc(const char* pszName, const char* pszIp, const unsigned int port);
 	int removePlc(const char* pszName);
+
+	// 设置/获取当前PLC
+	void setCurrentPlc(CPLC* pPlc);
+	CPLC* getCurrentPlc();
 
 public:
 	int notify(int code);
@@ -37,12 +41,12 @@
 public:
 	CConfiguration m_configuration;
 
-
 private:
 	IObservable* m_pObservable;
 	IObservableEmitter* m_pObservableEmitter;
 	CString m_strWorkDir;
 	std::map<std::string, CPLC*> m_mapPlc;
+	CPLC* m_pActivePlc;
 
 private:
 	int m_nTimerID;

--
Gitblit v1.9.3