From 2fb87c832d5ff07008308da1bab9b846b60ba7d3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 09 六月 2025 15:22:00 +0800
Subject: [PATCH] 1. 把搬运记录的界面添加到主界面的Tab页
---
SourceCode/Bond/Servo/Model.cpp | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 5dab65a..e39f62d 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -5,6 +5,8 @@
#include "ToolUnits.h"
#include "CEqAlarmStep.h"
#include "AlarmManager.h"
+#include "CGlassPool.h"
+#include "TransferManager.h"
CModel::CModel()
@@ -19,7 +21,18 @@
IObservable* CModel::getObservable()
{
+ if (m_pObservable == nullptr) {
+ m_pObservable = RX_AllocaObservable([&](IObservableEmitter* e) -> void {
+ m_pObservableEmitter = e; // 保存发射器
+ });
+ }
+
return m_pObservable;
+}
+
+SERVO::CMaster& CModel::getMaster()
+{
+ return m_master;
}
void CModel::setWorkDir(const char* pszWorkDir)
@@ -40,6 +53,9 @@
CString strSoftRev = _T("1.0.2");
+ // CGlassPool
+ m_glassPool.initPool();
+
// Log
CString strLogDir;
@@ -53,11 +69,6 @@
CLog::GetLog()->SetLogsDir(strLogDir);
CLog::GetLog()->SetEquipmentId((LPTSTR)(LPCTSTR)strUnitId);
LOGI("\r\n\r\n~~~ Prog Start! ~~~");
-
-
- m_pObservable = RX_AllocaObservable([&](IObservableEmitter* e) -> void {
- m_pObservableEmitter = e; // 保存发射器
- });
SECSListener listener;
@@ -93,6 +104,10 @@
SERVO::MasterListener masterListener;
+ masterListener.onMasterStateChanged = [&](void* pMaster, SERVO::MASTERSTATE state) -> void {
+ LOGI("<CModel>Master state changed(%d)", (int)state);
+ notify(RX_CODE_MASTER_STATE_CHANGED);
+ };
masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
LOGI("<CModel>Equipment onAlive:%s(%s).\n", pEquipment->getName().c_str(),
bAlive ? _T("ON") : _T("OFF"));
@@ -152,6 +167,90 @@
masterListener.onEqVcrEventReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, SERVO::CVcrEventReport* pReport) {
LOGE("<CModel>onEqVcrEventReport.");
};
+ masterListener.onEqDataChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int code) {
+ LOGE("<CModel>onEqDataChanged.");
+ notifyPtr(RX_CODE_EQ_DATA_CHANGED, pEquipment);
+ };
+ masterListener.onRobotTaskEvent = [&](void* pMaster, SERVO::CRobotTask* pTask, int code) {
+ if (pTask == nullptr) {
+ LOGE("<CModel>onRobotTaskEvent: 空任务指针，忽略事件 code=%d", code);
+ return;
+ }
+
+ // 任务描述与 ID 用于日志
+ const std::string& strDesc = pTask->getDescription();
+ const std::string& strClassID = pTask->getId();
+
+ // 日志输出与状态处理
+ switch (code) {
+ case ROBOT_EVENT_CREATE:
+ LOGI("<CModel>onRobotTaskEvent: 新任务创建(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ break;
+ case ROBOT_EVENT_FINISH:
+ LOGI("<CModel>onRobotTaskEvent: 任务完成(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ pTask->completed();
+ break;
+ case ROBOT_EVENT_ERROR:
+ LOGE("<CModel>onRobotTaskEvent: 任务错误(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ pTask->error();
+ break;
+ case ROBOT_EVENT_ABORT:
+ LOGE("<CModel>onRobotTaskEvent: 任务停止(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ pTask->abort();
+ break;
+ default:
+ LOGE("<CModel>onRobotTaskEvent: 未知事件 code=%d, 任务=%s", code, strDesc.c_str());
+ break;
+ }
+
+ // 安全格式化时间
+ auto format_time = [](time_t t) -> std::string {
+ if (t < 0 || t == _I64_MIN || t == _I64_MAX) {
+ return "";
+ }
+
+ // 使用 localtime_s 确保线程安全
+ tm tmBuf{};
+ errno_t err = localtime_s(&tmBuf, &t);
+ if (err != 0 || tmBuf.tm_mon < 0 || tmBuf.tm_mon > 11) {
+ return "";
+ }
+
+ // 格式化时间字符串
+ char buf[64] = {};
+ strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tmBuf);
+ return std::string(buf);
+ };
+
+ // 构造 TransferData 数据结构
+ TransferData data;
+ data.strClassID = strClassID;
+ data.strCreateTime = format_time(pTask->getCreateTime());
+ data.strPickTime = format_time(pTask->getFetchoutTime());
+ data.strPlaceTime = format_time(pTask->getStoredTime());
+ data.strEndTime = format_time(pTask->getFinishTime());
+ data.strDescription = pTask->getSimpleDescription();
+
+ // 状态映射
+ static const char* STATUS_STR[] = {
+ "Unknown", "Ready", "Running", "Error", "Abort", "Completed"
+ };
+ auto state = pTask->getState();
+ int index = static_cast<int>(state);
+ if (index > 0 && index < static_cast<int>(std::size(STATUS_STR))) {
+ data.strStatus = STATUS_STR[index];
+ }
+ else {
+ data.strStatus = STATUS_STR[0];
+ }
+
+ // 写入数据库
+ int nRecordId = 0;
+ TransferManager::getInstance().addTransferRecord(data, nRecordId);
+
+ notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
+ LOGI("<CModel>onRobotTaskEvent: 任务记录已保存，RecordID=%d", nRecordId);
+ };
m_master.setListener(masterListener);
@@ -177,6 +276,7 @@
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
m_master.term();
+ m_glassPool.term();
return 0;
}
--
Gitblit v1.9.3