~chenluhua/Bond2.git

$LAPTOP-SNT8I5JK\Boounion$

1.Slot的部分数据不需要存储，否则影响代码修改Slot布局等信息； 2.Bonder Porcess完成后，合成两片一起搬送的逻辑问题；

LAPTOP-SNT8I5JK\Boounion

2025-06-05 690bbf01bc579aff0ca31b2f326c7a6b5d83604d

1.Slot的部分数据不需要存储，否则影响代码修改Slot布局等信息；
2.Bonder Porcess完成后，合成两片一起搬送的逻辑问题；

已修改10个文件

已删除1个文件

	.gitignore	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/CArm.cpp	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/CArmTray.cpp	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/CBonder.cpp	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/CEquipment.cpp	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/CMaster.cpp	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/CSlot.cpp	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/Model.cpp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/Servo/ServoDlg.cpp	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/x64/Debug/EqsGraph.ini	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/x64/Debug/Master.dat	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .gitignore

@@ -52,3 +52,4 @@
SourceCode/Bond/x64/Debug/Backups/
Document/共享文件夹/
Document/共享文件夹.rar
SourceCode/Bond/x64/Debug/Master.dat

 SourceCode/Bond/Servo/CArm.cpp

@@ -106,6 +106,10 @@
        pGlass = pPreviousGlass;
        pGlass->addRef();
        m_slot[0].setContext(nullptr);
        CGlass* pBuddy = pGlass->getBuddy();
        if (pBuddy != nullptr) {
            m_slot[1].setContext(nullptr);
        }
        Unlock();

        if (m_listener.onDataChanged != nullptr) {

 SourceCode/Bond/Servo/CArmTray.cpp

@@ -41,6 +41,10 @@
        m_slot[0].setPosition(m_nID);
        m_slot[0].setNo(1);
        m_slot[0].setName("Slot 1");
        m_slot[1].enable();
        m_slot[1].setPosition(m_nID);
        m_slot[1].setNo(2);
        m_slot[1].setName("Slot 2");
    }

    void CArmTray::onTimer(UINT nTimerid)

 SourceCode/Bond/Servo/CBonder.cpp

@@ -390,6 +390,11 @@
        Lock();
        CGlass* pGlass1 = getGlassFromSlot(1);
        CGlass* pGlass2 = getGlassFromSlot(2);
        if (pGlass1 == nullptr || pGlass2 == nullptr) {
            LOGE("<CBonder-%s>onProcessData,错误!不满足两片玻璃且分别为G1与G2的条件，请检查数据是否正确!", m_strName.c_str());
            Unlock();
            return -1;
        }
        if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
            LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被绑定，请检查数据是否正确!", m_strName.c_str());
            Unlock();

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -777,16 +777,19 @@


        // 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
        /*
        CGlass* pBuddy = pGlass->getBuddy();
        if (pBuddy != nullptr) {
            Lock();
            pBuddy->addPath(m_nID);
            pBuddy->addRef();                    // 加入list,addRef
            m_glassList.push_back(pBuddy);
            if (putSlot % 2 == 0) {
                m_slot[putSlot - 2].setContext(pBuddy);
            }
            else {
                m_slot[putSlot].setContext(pBuddy);
            }
            Unlock();
        }
        */


        if (m_listener.onDataChanged != nullptr) {
            m_listener.onDataChanged(this, EDCC_STORED_JOB);

 SourceCode/Bond/Servo/CMaster.cpp

@@ -373,7 +373,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -384,7 +384,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -396,7 +396,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -407,7 +407,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -421,7 +421,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -432,7 +432,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -452,7 +452,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -463,7 +463,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -477,7 +477,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -488,7 +488,7 @@
                    std::string strDescription = m_pActiveRobotTask->getDescription();
                    unlock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
                    }
                    LOGI("创建新任务<%s>...", strDescription.c_str());
                    continue;
@@ -669,7 +669,7 @@

                    lock();
                    if (m_listener.onRobotTaskEvent != nullptr) {
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 1);
                        m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_FINISH);
                    }
                    delete m_pActiveRobotTask;
                    m_pActiveRobotTask = nullptr;

 SourceCode/Bond/Servo/CSlot.cpp

@@ -122,23 +122,12 @@
    void CSlot::serialize(CArchive& ar)
    {
        if (ar.IsStoring()) {
            ar << m_nPosition;
            ar << m_nNo;
            ar << (int)m_materialsType;
            WriteString(ar, m_strName);
            ar << (__int64)m_pContext;
            ar << m_bEnable;
            ar << m_bLock;
        }
        else {
            int i32;
            __int64 i64;
            ar >> m_nPosition;
            ar >> m_nNo;
            ar >> i32; m_materialsType = (MaterialsType)i32;
            ReadString(ar, m_strName);
            ar >> i64; m_pTempContext = (CContext*)i64;
            ar >> m_bEnable;
            ar >> m_bLock;
        }
    }

 SourceCode/Bond/Servo/Model.cpp

@@ -248,7 +248,7 @@
        int nRecordId = 0;
        TransferManager::getInstance().addTransferRecord(data, nRecordId);

        notifyPtr(RX_CODE_EQ_ROBOT_TASK, pTask);
        notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
        LOGI("<CModel>onRobotTaskEvent: 任务记录已保存，RecordID=%d", nRecordId);
    };
    m_master.setListener(masterListener);

 SourceCode/Bond/Servo/ServoDlg.cpp

@@ -188,14 +188,15 @@
                }
            }
            else if (RX_CODE_EQ_ROBOT_TASK == code) {
                int exCode;
                if (pAny->getIntValue("exCode", exCode)) {
                    if (exCode == ROBOT_EVENT_CREATE) {
                SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
                if (m_pRobotTaskDlg != nullptr) {
                        ASSERT(pTask);
                        if (m_pRobotTaskDlg) {
                    m_pRobotTaskDlg->SetRobotTask(pTask);
                }
                if (pTask == nullptr) {
                    m_pMyStatusbar->setCurTaskBtnText("无");
                }
                else {

                    SERVO::CEquipment* pEq1, * pEq2;
                    pEq1 = theApp.m_model.getMaster().getEquipment(pTask->getSrcPosition());
                    pEq2 = theApp.m_model.getMaster().getEquipment(pTask->getTarPosition());
@@ -205,6 +206,10 @@
                        m_pMyStatusbar->setCurTaskBtnText((LPTSTR)(LPCTSTR)strText);
                    }
                }
                    else if (exCode == ROBOT_EVENT_FINISH) {
                        m_pMyStatusbar->setCurTaskBtnText("无");
                    }
                }
            }

            pAny->release();

 SourceCode/Bond/x64/Debug/EqsGraph.ini

@@ -39,7 +39,7 @@
Top=63
[Arm Tray2]
Left=467
Top=166
Top=167
[Fliper(G2)]
Left=238
Top=251

 SourceCode/Bond/x64/Debug/Master.dat

Binary files differ

			@@ -52,3 +52,4 @@
			SourceCode/Bond/x64/Debug/Backups/
			Document/共享文件夹/
			Document/共享文件夹.rar
			SourceCode/Bond/x64/Debug/Master.dat

			@@ -106,6 +106,10 @@
			pGlass = pPreviousGlass;
			pGlass->addRef();
			m_slot[0].setContext(nullptr);
			CGlass* pBuddy = pGlass->getBuddy();
			if (pBuddy != nullptr) {
			m_slot[1].setContext(nullptr);
			}
			Unlock();

			if (m_listener.onDataChanged != nullptr) {

			@@ -41,6 +41,10 @@
			m_slot[0].setPosition(m_nID);
			m_slot[0].setNo(1);
			m_slot[0].setName("Slot 1");
			m_slot[1].enable();
			m_slot[1].setPosition(m_nID);
			m_slot[1].setNo(2);
			m_slot[1].setName("Slot 2");
			}

			void CArmTray::onTimer(UINT nTimerid)

			@@ -390,6 +390,11 @@
			Lock();
			CGlass* pGlass1 = getGlassFromSlot(1);
			CGlass* pGlass2 = getGlassFromSlot(2);
			if (pGlass1 == nullptr \|\| pGlass2 == nullptr) {
			LOGE("<CBonder-%s>onProcessData,错误!不满足两片玻璃且分别为G1与G2的条件，请检查数据是否正确!", m_strName.c_str());
			Unlock();
			return -1;
			}
			if (pGlass1->getBuddy() != nullptr \|\| pGlass2->getBuddy() != nullptr) {
			LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被绑定，请检查数据是否正确!", m_strName.c_str());
			Unlock();

			@@ -777,16 +777,19 @@


			// 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
			/*
			CGlass* pBuddy = pGlass->getBuddy();
			if (pBuddy != nullptr) {
			Lock();
			pBuddy->addPath(m_nID);
			pBuddy->addRef(); // 加入list,addRef
			m_glassList.push_back(pBuddy);
			if (putSlot % 2 == 0) {
			m_slot[putSlot - 2].setContext(pBuddy);
			}
			else {
			m_slot[putSlot].setContext(pBuddy);
			}
			Unlock();
			}
			*/


			if (m_listener.onDataChanged != nullptr) {
			m_listener.onDataChanged(this, EDCC_STORED_JOB);

			@@ -373,7 +373,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -384,7 +384,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -396,7 +396,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -407,7 +407,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -421,7 +421,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -432,7 +432,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -452,7 +452,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -463,7 +463,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -477,7 +477,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -488,7 +488,7 @@
			std::string strDescription = m_pActiveRobotTask->getDescription();
			unlock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
			}
			LOGI("创建新任务<%s>...", strDescription.c_str());
			continue;
			@@ -669,7 +669,7 @@

			lock();
			if (m_listener.onRobotTaskEvent != nullptr) {
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 1);
			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_FINISH);
			}
			delete m_pActiveRobotTask;
			m_pActiveRobotTask = nullptr;

			@@ -122,23 +122,12 @@
			void CSlot::serialize(CArchive& ar)
			{
			if (ar.IsStoring()) {
			ar << m_nPosition;
			ar << m_nNo;
			ar << (int)m_materialsType;
			WriteString(ar, m_strName);
			ar << (__int64)m_pContext;
			ar << m_bEnable;
			ar << m_bLock;
			}
			else {
			int i32;
			__int64 i64;
			ar >> m_nPosition;
			ar >> m_nNo;
			ar >> i32; m_materialsType = (MaterialsType)i32;
			ReadString(ar, m_strName);
			ar >> i64; m_pTempContext = (CContext*)i64;
			ar >> m_bEnable;
			ar >> m_bLock;
			}
			}

			@@ -248,7 +248,7 @@
			int nRecordId = 0;
			TransferManager::getInstance().addTransferRecord(data, nRecordId);

			notifyPtr(RX_CODE_EQ_ROBOT_TASK, pTask);
			notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
			LOGI("<CModel>onRobotTaskEvent: 任务记录已保存，RecordID=%d", nRecordId);
			};
			m_master.setListener(masterListener);

			@@ -188,14 +188,15 @@
			}
			}
			else if (RX_CODE_EQ_ROBOT_TASK == code) {
			int exCode;
			if (pAny->getIntValue("exCode", exCode)) {
			if (exCode == ROBOT_EVENT_CREATE) {
			SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
			if (m_pRobotTaskDlg != nullptr) {
			ASSERT(pTask);
			if (m_pRobotTaskDlg) {
			m_pRobotTaskDlg->SetRobotTask(pTask);
			}
			if (pTask == nullptr) {
			m_pMyStatusbar->setCurTaskBtnText("无");
			}
			else {

			SERVO::CEquipment* pEq1, * pEq2;
			pEq1 = theApp.m_model.getMaster().getEquipment(pTask->getSrcPosition());
			pEq2 = theApp.m_model.getMaster().getEquipment(pTask->getTarPosition());
			@@ -205,6 +206,10 @@
			m_pMyStatusbar->setCurTaskBtnText((LPTSTR)(LPCTSTR)strText);
			}
			}
			else if (exCode == ROBOT_EVENT_FINISH) {
			m_pMyStatusbar->setCurTaskBtnText("无");
			}
			}
			}

			pAny->release();

			@@ -39,7 +39,7 @@
			Top=63
			[Arm Tray2]
			Left=467
			Top=166
			Top=167
			[Fliper(G2)]
			Left=238
			Top=251