1.Glass List页面修改为Slot并以Slot的形式展现数据，不论有无Glass

LAPTOP-SNT8I5JK\Boounion

2025-06-06 980048d93f7ee401639d441d65f4f885749fd898

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -335,22 +335,23 @@
         }
         
         // 梳理各玻璃之间的绑定关系
         /*
         Lock();
         std::list<CGlass*> list = m_glassList;
         for (auto item : list) {
            std::string& strBuddyId = item->getBuddyId();
            if (!strBuddyId.empty()) {
               for (auto item2 : m_glassList) {
                  if (strBuddyId.compare(item2->getID()) == 0) {
                     item->setBuddy(item2);
                     TRACE("绑定关系: %s <- %s\n", item->getID().c_str(), item2->getID().c_str());
         for (int i = 0; i < SLOT_MAX; i++) {
            CGlass* pGlass = (CGlass*)m_slot[i].getContext();
            if (pGlass != nullptr) {
               std::string& strBuddyId = pGlass->getBuddyId();
               if (!strBuddyId.empty()) {
                  for (int j = 0; j < SLOT_MAX; j++) {
                     CGlass* pBudy = (CGlass*)m_slot[j].getContext();
                     if (pBudy != nullptr && strBuddyId.compare(pBudy->getID()) == 0) {
                        pGlass->setBuddy(pBudy);
                        TRACE("绑定关系: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
                     }
                  }
               }
            }
         }
         Unlock();
         */
      }
   }

@@ -1148,10 +1149,11 @@
         if (m_slot[i].isLock()) continue;
         CGlass* pGlass = (CGlass*)m_slot[i].getContext();
         if (pGlass == nullptr) continue;
         if(!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE]
            || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE]
            || !m_bLinkSignal[0][SIGNAL_INTERLOCK]
            || !m_bLinkSignal[0][SIGNAL_SEND_ABLE] ) continue;
         int lsPath = m_slot[i].getLinkSignalPath();
         if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
            || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
            || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
            || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue;

         MaterialsType glassType = pGlass->getType();
         if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
@@ -1163,6 +1165,39 @@
      return nullptr;
   }

   CSlot* CEquipment::getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates)
   {
      for (auto item : candidates) {
         for (int i = 0; i < SLOT_MAX; i++) {
            if (item == i + 1) {
               if (!m_slot[i].isEnable()) continue;
               if (m_slot[i].isLock()) continue;
               CGlass* pGlass = (CGlass*)m_slot[i].getContext();
               if (pGlass == nullptr) continue;
               int lsPath = m_slot[i].getLinkSignalPath();
               if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
                  || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
                  || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
                  || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue;

               MaterialsType glassType = pGlass->getType();
               if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
               if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;

               return &m_slot[i];
            }
         }
      }

      return nullptr;
   }

   CSlot* CEquipment::getSlot(int index)
   {
      if (index >= SLOT_MAX) return nullptr;
      return &m_slot[index];
   }

   CGlass* CEquipment::getGlassFromSlot(int slotNo)
   {
      CSlot* pSlot = nullptr;