Merge branch 'clh' into liuyang

mrDarker

2025-10-22 e8a27bb203fe2aff70390a5eca002d7438da9b0f

 SourceCode/Bond/BondEq/BondEqDlg.cpp

@@ -16,9 +16,8 @@
#include "UserManagerDlg.h"
#include "SystemLogManagerDlg.h"

// test
#include "AxisSettingsDlg.h"
#include "IOMonitoringDlg.h"
// 测试
#include "RecipeListDlg.h"

#ifdef _DEBUG
#define new DEBUG_NEW
@@ -75,6 +74,7 @@
   m_pHomeDialog = nullptr;
   m_pActiveView = nullptr;
   m_pActiveComponentDlg = nullptr;
   m_pAlarmWnd = nullptr;
}

void CBondEqDlg::DoDataExchange(CDataExchange* pDX)
@@ -155,6 +155,16 @@
               }
            }
         }
         else if (code == RX_CODE_ALARM_ON) {
            AlarmOn();
            CAlarmMonitor* pComponent = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
            m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
         }
         else if (code == RX_CODE_ALARM_OFF) {
            AlarmOff();
            CAlarmMonitor* pComponent = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
            m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
         }
         pAny->release();
      }, [&]() -> void {
         // onComplete
@@ -225,12 +235,30 @@
      return FALSE;
   }

   // 初始化报警模块
   AlarmManager& alarmManager = AlarmManager::getInstance();
   alarmManager.setDatabase(db.get());
   try {
      if (!alarmManager.initializeAlarmTable()) {
         AfxMessageBox("初始化报警模块失败！");
         return FALSE;
      }
   }
   catch (const std::exception& ex) {
      CString errorMsg;
      errorMsg.Format(_T("初始化报警模块失败：%s"), CString(ex.what()));
      AfxMessageBox(errorMsg, MB_ICONERROR);
      return FALSE;
   }

   // 设置配方文件夹路径
   RecipeManager& recipeManager = RecipeManager::getInstance();
   std::string strRecipePath =  CToolUnits::getCurrentExePath() + _T("\\Recipe");
   std::string strRecipePath =  CToolUnits::getRecipePath();
   CToolUnits::createDir(strRecipePath.c_str());
   recipeManager.setRecipeFolder(strRecipePath);

   if (!recipeManager.loadRecipe("Default")) {
      AfxMessageBox("Default 配方加载失败！");
   }

   // 菜单
   CMenu menu;
@@ -247,6 +275,7 @@
   m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
   m_pTopToolbar->ShowWindow(SW_SHOW);
   m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
   m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(FALSE);
   HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
   ASSERT(hMenu);
   ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
@@ -275,6 +304,13 @@
   // 更新登录状态
   UpdateLoginStatus();
   logManager.log(SystemLogManager::LogType::Info, _T("BondEq启动..."));


   // 自动启动
   theApp.m_model.getBonder().start();
   m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
   m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
   logManager.log(SystemLogManager::LogType::Operation, _T("运行..."));


   return TRUE;  // 除非将焦点设置到控件，否则返回 TRUE
@@ -396,6 +432,11 @@
      ::DeleteObject(m_hbrBkgnd);
   }

   if (m_pAlarmWnd != nullptr) {
      m_pAlarmWnd->DestroyWindow();
      delete m_pAlarmWnd;
   }

   ASSERT(m_pObserver != NULL);
   m_pObserver->unsubscribe();
   m_pObserver = NULL;
@@ -508,23 +549,11 @@

void CBondEqDlg::OnMenuFileSettings()
{
   CAxisSettingsDlg axisDlg;
   axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
   axisDlg.SetRecipeName(_T("Default"));
   axisDlg.DoModal();

   // Cavity VacuumBake AfterBake AOI
   /*
   CIOMonitoringDlg dlg;
   dlg.SetIOManager("Cavity");
   dlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
   CRecipeListDlg dlg;
   dlg.DoModal();
   */

   /*
   CSettingsDlg dlg;
   dlg.DoModal();
   */
   //CSettingsDlg dlg;
   //dlg.DoModal();
}

void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
@@ -591,6 +620,7 @@
         return 0;
      }

      /*
      CString inputText = inputDialog.GetInputText();
      std::string strPass = UserManager::getInstance().getCurrentPass();
      if (inputText.Compare(strPass.c_str()) != 0) {
@@ -598,17 +628,23 @@
         logManager.log(SystemLogManager::LogType::Info, _T("验证时，密码错误！"));
         return 0;
      }
      */
   }

   if (id == IDC_BUTTON_RUN) {
      theApp.m_model.getBonder().start();
      m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
      m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
      logManager.log(SystemLogManager::LogType::Operation, _T("运行..."));
   }
   else if (id == IDC_BUTTON_STOP) {
      theApp.m_model.getBonder().stop();
      m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
      m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
      logManager.log(SystemLogManager::LogType::Operation, _T("ֹͣ..."));
   }
   else if (id == IDC_BUTTON_ALARM) {
      AlarmOn();
   }
   else if (id == IDC_BUTTON_SETTINGS) {
      CSettingsDlg dlg;
@@ -778,8 +814,9 @@
CComponentPLCDlg* CBondEqDlg::CreateComponentPLCDlg(CComponent* pComponent)
{
   CComponentPLCDlg* pDlg = new CComponentPLCDlg(m_pMainContainer);
   pDlg->Create(IDD_COMPONENT_PLC, m_pMainContainer);
   pDlg->SetContext(pComponent);
   pDlg->Create(IDD_COMPONENT_PLC, m_pMainContainer);


   CString strIcon0, strIcon1, strIcon2, strIcon3;
   strIcon0.Format(_T("%s\\Res\\small_close0.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
@@ -798,3 +835,24 @@
   return pDlg;
}

void CBondEqDlg::AlarmOn()
{
   if (m_pAlarmWnd == nullptr) {
      m_pAlarmWnd = new CAlarmPopupDlg();
      m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
      m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
      m_pAlarmWnd->CenterWindow();
   }
   m_pAlarmWnd->AlarmOn();
}

void CBondEqDlg::AlarmOff()
{
   if (m_pAlarmWnd == nullptr) {
      m_pAlarmWnd = new CAlarmPopupDlg();
      m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
      m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
      m_pAlarmWnd->CenterWindow();
   }
   m_pAlarmWnd->AlarmOff();
}