From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 16:18:33 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPortStatusReport.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h
index 4aede52..526c94a 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.h
+++ b/SourceCode/Bond/Servo/CPortStatusReport.h
@@ -9,7 +9,7 @@
{
public:
CPortStatusReport();
- ~CPortStatusReport();
+ virtual ~CPortStatusReport();
public:
void copyEx(CPortStatusReport& other);
@@ -23,12 +23,17 @@
int serialize(char* pszBuffer, int nBufferSize);
int unserialize(const char* pszBuffer, int nBufferSize);
void getAttributeVector(CAttributeVector& attrubutes, int beginWeight);
-
+ virtual void serialize(CArchive& ar);
+
public:
bool canPickFromPort();
bool isJobExistenceSlot();
private:
+ void WriteString(CArchive& ar, std::string& string);
+ void ReadString(CArchive& ar, std::string& string);
+
+ private:
short m_nPortStatus;
short m_nCassetteSequenceNo;
std::string m_strCassetteID;
--
Gitblit v1.9.3