From 62a4a8db6c05c98f180ae7f6429a9a232fce6c0c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 七月 2025 17:19:16 +0800
Subject: [PATCH] 1. 重构机器人动画逻辑,采用分帧动画机制,避免在 OnTimer 中阻塞主线程; 2. 动画过程中允许动态中断,确保设备状态变化时可即时响应; 3. 动画结束时自动校正位置与角度,确保最终状态准确一致;

---
 SourceCode/Bond/Servo/CGlass.h |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 1235c8e..3127839 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -24,29 +24,33 @@
 		void setType(MaterialsType type);
 		void setID(const char* pszID);
 		std::string& getID();
-		CPath* getPathWithSiteID(unsigned int nSiteId);
+		void setOriginPort(int port, int slot);
+		void getOrginPort(int& port, int& slot);
+		CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit);
 		CPath* getPath();
-		CPath* getPathWithSiteId(unsigned int nSiteId);
-		void addPath(unsigned int nSiteId);
+		void addPath(unsigned int nEqId, unsigned int nUnit);
 		void serialize(CArchive& ar);
-		void setJobDataB(CJobDataB* pJobDataB);
-		CJobDataB* getJobDataB();
 		void setJobDataS(CJobDataS* pJobDataS);
+		void updateJobDataS(CJobDataS* pJobDataS);
 		CJobDataS* getJobDataS();
 		BOOL setBuddy(CGlass* pGlass);
+		BOOL forceSetBuddy(CGlass* pGlass);
 		CGlass* getBuddy();
 		std::string& getBuddyId();
-		void processEnd(unsigned int nSiteId);
-		BOOL isProcessed(unsigned int nSiteId);
+		int processEnd(unsigned int nEqId, unsigned int nUnit);
+		BOOL isProcessed(unsigned int nEqId, unsigned int nUnit);
+		int setInspResult(unsigned int nEqId, unsigned int nUnit, InspResult result);
+		InspResult getInspResult(unsigned int nEqId, unsigned int nUnit);
 
 	private:
 		MaterialsType m_type;
 		std::string m_strID;
 		CPath* m_pPath;
-		CJobDataB m_jobDataB;
 		CJobDataS m_jobDataS;
 		CGlass* m_pBuddy;
 		std::string m_strBuddyId;
+		int m_nOriginPort;
+		int m_nOriginSlot;
 	};
 }
 

--
Gitblit v1.9.3