Merge branch 'clh' into liuyang

mrDarker

2025-06-19 4e5df2e71445ca3c0cc412e24510234e671b6072

 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);
                  }
@@ -93,6 +99,18 @@
                  else if (EQ_ID_Bonder2 == nID) {
                     DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
                     UpdateDeviceStatus(INDICATE_BONDER2, status);
                  }
                  else if (EQ_ID_VACUUMBAKE == nID) {
                     DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
                     UpdateDeviceStatus(INDICATE_VACUUM_BAKE, status);
                  }
                  else if (EQ_ID_BAKE_COOLING == nID) {
                     DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
                     UpdateDeviceStatus(INDICATE_BAKE_COOLING, status);
                  }
                  else if (EQ_ID_MEASUREMENT == nID) {
                     DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
                     UpdateDeviceStatus(INDICATE_MEASUREMENT, status);
                  }
               }
            }
@@ -114,6 +132,7 @@
BOOL CPageGraph1::OnInitDialog()
{
   CDialogEx::OnInitDialog();
   InitRxWindows();
   SetTimer(1, 3000, nullptr);


@@ -269,6 +288,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 +441,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 +451,6 @@
{
   if (1 == nIDEvent) {
      KillTimer(1);
      InitRxWindows();

      // 更新状态
      {