From 331f447bb0e5eccf0b3161ab287c1372b14b8480 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 08 八月 2025 11:53:58 +0800
Subject: [PATCH] 1.增加千传计数,保存计数,重启软件时恢复; 2.千传测试模式,打印相关日志,方便后期提取,用于统计; 3.千传模式时烘烤两腔体都要进入; 4.千传模式时,Fliper到Bonder修改为用手臂2取料; 5.修复千传模式不计运行时的问题; 6.千传模式,最后收料强制放入第一层; 6.修复Buf, 当任务未生成(在符合条件后仍有1秒间隙)而机器单元发送FetchOutJob时,数据检验失败的问题,增加Sleep, 缩小间隙;

---
 SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
index 2eed02d..e120046 100644
--- a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
@@ -55,7 +55,7 @@
 			// onNext
 			pAny->addRef();
 			int code = pAny->getCode();
-			if (RX_CODE_REMOTEEQ_STATE_CHANGED == code) {
+			if (RX_CODE_EQ_STATE_CHANGED == code) {
 				BEQ::IRemoteEquipment* pRemoteEq;
 				if (pAny->getPtrValue("ptr", (void*&)pRemoteEq)) {
 					HTREEITEM hItem = getTreeItem(pRemoteEq);
@@ -128,9 +128,10 @@
 		::DeleteObject(m_hbrBkgnd);
 	}
 
-	ASSERT(m_pObserver != NULL);
-	m_pObserver->unsubscribe();
-	m_pObserver = NULL;
+	if (m_pObserver != NULL) {
+		m_pObserver->unsubscribe();
+		m_pObserver = NULL;
+	}
 }
 
 
@@ -195,16 +196,6 @@
 	if (1 == nIDEvent) {
 		KillTimer(1);
 		InitRxWindows();
-
-		// 杩滅▼璁惧鍒楄〃
-		char szEqName[256];
-		BEQ::IRemoteEquipment* pRemoteEq = theApp.m_model.getBond1();
-		ASSERT(pRemoteEq);
-		pRemoteEq->getName(szEqName, 256);
-		
-		HTREEITEM hItemEq = m_treeRemoteEqs.InsertItem(szEqName);
-		m_treeRemoteEqs.SetItemIcon(hItemEq, pRemoteEq->isConnected() ? m_hIconRemoteEqLight : m_hIconRemoteEqDark);
-		m_treeRemoteEqs.SetItemData(hItemEq, (DWORD_PTR)pRemoteEq);
 	}
 
 	CDialogEx::OnTimer(nIDEvent);

--
Gitblit v1.9.3