From fd1333fbf52e00ff8f0b0d51ec0d707a66cc9141 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 16 六月 2025 11:20:16 +0800
Subject: [PATCH] 1.Robot状态和位置的监控,其中两个arm状态(是否有料),也作为调度的依据。

---
 SourceCode/Bond/Servo/CPageGraph1.cpp |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageGraph1.cpp b/SourceCode/Bond/Servo/CPageGraph1.cpp
index 9a45e1c..b9c2555 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph1.cpp
@@ -83,6 +83,12 @@
 						BOOL bAlive = pEquipment->isAlive();
 						if (EQ_ID_EFEM == nID) {
 							DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
+							UpdateDeviceStatus(INDICATE_FLIPER, status);
+							UpdateDeviceStatus(INDICATE_ALIGNER, status);
+							UpdateDeviceStatus(INDICATE_LPORT1, status);
+							UpdateDeviceStatus(INDICATE_LPORT2, status);
+							UpdateDeviceStatus(INDICATE_LPORT3, status);
+							UpdateDeviceStatus(INDICATE_LPORT4, status);
 							UpdateDeviceStatus(INDICATE_ROBOT_ARM1, status);
 							UpdateDeviceStatus(INDICATE_ROBOT_ARM2, status);
 						}
@@ -114,6 +120,7 @@
 BOOL CPageGraph1::OnInitDialog()
 {
 	CDialogEx::OnInitDialog();
+	InitRxWindows();
 	SetTimer(1, 3000, nullptr);
 
 
@@ -269,6 +276,11 @@
 	if (m_hbrBkgnd != nullptr) {
 		::DeleteObject(m_hbrBkgnd);
 	}
+
+	if (m_pObserver != nullptr) {
+		m_pObserver->unsubscribe();
+		m_pObserver = NULL;
+	}
 }
 
 void CPageGraph1::OnSize(UINT nType, int cx, int cy)
@@ -417,7 +429,6 @@
 	CString s; s.Format(_T("OnGraphItemClicked %d"), pGraphNmhdr->dwData);
 	SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)m_pGraph->GetIndicateBoxData(pGraphNmhdr->dwData);
 	if (pEquipment != nullptr) {
-		//AfxMessageBox(pEquipment->getName().c_str());
 		theApp.m_model.notifyPtr(RX_CODE_SELECT_EQUIPMENT, pEquipment);
 	}
 
@@ -428,7 +439,6 @@
 {
 	if (1 == nIDEvent) {
 		KillTimer(1);
-		InitRxWindows();
 
 		// 鏇存柊鐘舵��
 		{

--
Gitblit v1.9.3