1.将CPanel修改为CGlass

LAPTOP-SNT8I5JK\Boounion

2025-03-24 6cd9f24e01c7ecbb7ad47137677590d1d4ae2f04

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -201,7 +201,7 @@
            std::to_string((int)item->getType()).c_str(), ""));
      }

      for (auto item : m_panelList) {
      for (auto item : m_glassList) {
         attrubutes.addAttribute(new CAttribute("Panel",
            item->getID().c_str(), ""));
      }
@@ -492,12 +492,12 @@

      // 物料
      if (code == FLOW_MOVE_MATERIAL) {
         CPanel* pPanel = (CPanel*)pIntent->getContext();
         ASSERT(pPanel);
         if (!glassWillArrive(pPanel)) {
         CGlass* pGlass = (CGlass*)pIntent->getContext();
         ASSERT(pGlass);
         if (!glassWillArrive(pGlass)) {
            return FLOW_REJECT;
         }
         return glassArrived(pPanel);
         return glassArrived(pGlass);
      }


@@ -524,7 +524,7 @@

      // 模拟取出第一张Panel,传送到下一环节
      Lock();
      CPanel* pContext = m_panelList.front();
      CGlass* pContext = m_glassList.front();
      pContext->addRef();

      CIntent intent(FLOW_MOVE_MATERIAL, "", pContext);
@@ -533,7 +533,7 @@
         LOGE("<CEquipment>对方拒绝接收Intent.");
      }
      else if (nRet == FLOW_ACCEPT) {
         m_panelList.pop_front();
         m_glassList.pop_front();
         pContext->release();      // 添加到列队时addRef, 取出时release
      }

@@ -543,27 +543,27 @@
      return 0;
   }

   BOOL CEquipment::glassWillArrive(CPanel* pPanel)
   BOOL CEquipment::glassWillArrive(CGlass* pGlass)
   {
      return TRUE;
   }

   int CEquipment::glassArrived(CPanel* pPanel)
   int CEquipment::glassArrived(CGlass* pGlass)
   {
      Lock();
      pPanel->addRef();
      m_panelList.push_back(pPanel);
      pGlass->addRef();
      m_glassList.push_back(pGlass);
      Unlock();
      return FLOW_ACCEPT;
   }

   void CEquipment::addPanelToList(CPanel* pPanel)
   void CEquipment::addGlassToList(CGlass* pGlass)
   {
      ASSERT(pPanel);
      ASSERT(pGlass);

      Lock();
      pPanel->addRef();
      m_panelList.push_back(pPanel);
      pGlass->addRef();
      m_glassList.push_back(pGlass);
      Unlock();
   }
}