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/CJobDataA.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataA.h b/SourceCode/Bond/Servo/CJobDataA.h
index 86b761a..49c2071 100644
--- a/SourceCode/Bond/Servo/CJobDataA.h
+++ b/SourceCode/Bond/Servo/CJobDataA.h
@@ -8,9 +8,11 @@
{
public:
CJobDataA();
- ~CJobDataA();
+ virtual ~CJobDataA();
public:
+ void* getOwner();
+ void setOwner(void* pOwner);
short getPortNo();
std::string& getCarrierId();
std::string& getPruductId();
@@ -20,9 +22,10 @@
int getSlotSelectedFlag();
std::vector<std::string>& getGlassIds();
int serialize(char* pszBuffer, int nBufferSize);
- int unserialize(char* pszBuffer, int nBufferSize);
+ int unserialize(const char* pszBuffer, int nBufferSize);
private:
+ void* m_pOwner;
short m_nPortNo;
std::string m_strCarrierId;
std::string m_pruductId;
--
Gitblit v1.9.3