From e48a55eb3cc807fa5a45cf398b6f523e96aa5312 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 15 七月 2025 15:10:31 +0800
Subject: [PATCH] 1.Variable列表显示到界面； 2.从文件中加载CReport列表；
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 167 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 134 insertions(+), 33 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index edcb481..19b97dc 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
#include "HsmsPassive.h"
#include "Log.h"
#include "Model.h"
@@ -117,7 +117,7 @@
{
for (auto it = m_mapReportIdToCEID.begin(); it != m_mapReportIdToCEID.end(); ) {
if (it->second == CEID) {
- m_mapReportIdToCEID.erase(it++); // 更新迭代器
+ m_mapReportIdToCEID.erase(it++); // 鏇存柊杩唬鍣�
}
else {
++it;
@@ -137,7 +137,7 @@
{
for (auto it = m_mapValueIdToPRTID.begin(); it != m_mapValueIdToPRTID.end(); ) {
if (it->second == RPTID) {
- m_mapValueIdToPRTID.erase(it++); // 更新迭代器
+ m_mapValueIdToPRTID.erase(it++); // 鏇存柊杩唬鍣�
}
else {
++it;
@@ -157,11 +157,11 @@
void CHsmsPassive::OnTimer(UINT nTimerid)
{
- // 所有已发送的Action自加1
+ // 鎵�鏈夊凡鍙戦�佺殑Action鑷姞1
Lock();
for (auto iter = m_listActionSent.begin(); iter != m_listActionSent.end();) {
if ((*iter)->incrementAndCheckTimeout()) {
- TRACE("CHsmsPassive::超时\n");
+ TRACE("CHsmsPassive::瓒呮椂\n");
delete (*iter);
m_listActionSent.erase(iter++);
}
@@ -179,7 +179,7 @@
CHsmsAction* pAction = nullptr;
for (auto iter = m_listActionSent.begin(); iter != m_listActionSent.end(); iter++) {
if ((*iter)->getSendMessage()->getHeader()->systemBytes == pMessage->getHeader()->systemBytes) {
- LOGI("CHsmsPassive::找到");
+ LOGI("CHsmsPassive::鎵惧埌");
pAction = (*iter);
m_listActionSent.erase(iter);
break;
@@ -188,7 +188,7 @@
Unlock();
if (pAction != nullptr) {
- LOGI("onRecvMsg::相应处理");
+ LOGI("onRecvMsg::鐩稿簲澶勭悊");
delete pAction;
}
@@ -196,14 +196,14 @@
return 0;
}
-int CHsmsPassive::loadVarialbleList(const char* pszFilepath)
+int CHsmsPassive::loadVarialbles(const char* pszFilepath)
{
CStdioFile file;
if (!file.Open(pszFilepath, CFile::modeRead)) {
return -1;
}
- std::regex pattern("^\\d+,.*"); // 匹配以数字+逗号开头的字符串
+ std::regex pattern("^\\d+,.*"); // 鍖归厤浠ユ暟瀛�+閫楀彿寮�澶寸殑瀛楃涓�
std::vector<SERVO::CVariable*> variables;
int index, last;
CString strLine;
@@ -228,6 +228,7 @@
if (index < 0) continue;
strFormat = strLine.Mid(last, index - last);
strRemark = strLine.Right(strLine.GetLength() - index - 1);
+ strRemark.Replace(_T("\\r\\n"), _T("\r\n"));
SERVO::CVariable* pVarialble = new SERVO::CVariable(
(LPTSTR)(LPCTSTR)strId, (LPTSTR)(LPCTSTR)strName, (LPTSTR)(LPCTSTR)strFormat, (LPTSTR)(LPCTSTR)strRemark);
@@ -246,12 +247,112 @@
return 0;
}
+std::vector<SERVO::CVariable*>& CHsmsPassive::getVariables()
+{
+ return m_variabels;
+}
+
+SERVO::CVariable* CHsmsPassive::getVariable(int variableId)
+{
+ for (auto item : m_variabels) {
+ if (item->getVarialbleId() == variableId) {
+ return item;
+ }
+ }
+
+ return nullptr;
+}
+
void CHsmsPassive::clearAllVariabel()
{
for (auto item : m_variabels) {
delete item;
}
m_variabels.clear();
+}
+
+int CHsmsPassive::loadReports(const char* pszFilepath)
+{
+ CStdioFile file;
+ if (!file.Open(pszFilepath, CFile::modeRead)) {
+ return -1;
+ }
+
+ std::regex pattern("^\\d+,\\(\\d+(,\\d+)*\\).*"); // 鍖归厤浠ユ暟瀛�+閫楀彿寮�澶寸殑瀛楃涓�
+ std::vector<SERVO::CReport*> reports;
+ int index;
+ CString strLine, strVariable;
+ CString strId, strName, strFormat, strRemark;
+ while (file.ReadString(strLine)) {
+ if (!std::regex_match((LPTSTR)(LPCTSTR)strLine, pattern)) {
+ continue;
+ }
+
+ index = strLine.Find(",", 0);
+ if (index < 0) continue;
+ strId = strLine.Left(index);
+ strVariable = strLine.Right(strLine.GetLength() - index - 1);
+ strVariable.Delete(0);
+ strVariable.Delete(strVariable.GetLength() - 1);
+ auto vids = parseVidList(strVariable);
+
+
+ SERVO::CReport* pReport = new SERVO::CReport(atoi((LPTSTR)(LPCTSTR)strId));
+ for (auto vid : vids) {
+ SERVO::CVariable* pVariable = getVariable(vid);
+ if (pVariable != nullptr) {
+ pReport->addVariable(pVariable);
+ }
+ }
+
+ reports.push_back(pReport);
+ }
+
+ if (!reports.empty()) {
+ clearAllReport();
+ for (auto item : reports) {
+ m_reports.push_back(item);
+ }
+ }
+
+
+ file.Close();
+ return 0;
+}
+
+std::vector<SERVO::CReport*>& CHsmsPassive::getReports()
+{
+ return m_reports;
+}
+
+void CHsmsPassive::clearAllReport()
+{
+ for (auto item : m_reports) {
+ delete item;
+ }
+ m_reports.clear();
+}
+
+std::vector<int> CHsmsPassive::parseVidList(CString& strNums)
+{
+ // 1. 鍏堝幓鎺夊彲鑳藉嚭鐜扮殑绌虹櫧绗︼紙绌烘牸銆佸埗琛ㄧ绛夛級
+ strNums.Trim();
+
+ // 2锔�.
+ std::vector<int> result;
+ int i = 0;
+ CString strVid;
+ while (1) {
+ if (!AfxExtractSubString(strVid, (LPCTSTR)strNums, i, ',')) {
+ break;
+ }
+ if (!strVid.IsEmpty()) // 闃插尽鎬ф鏌�
+ result.push_back(std::stoi((LPTSTR)(LPCTSTR)strVid));
+ i++;
+
+ }
+
+ return result;
}
int CHsmsPassive::init(CModel* pModel, const char* pszName, unsigned int port)
@@ -264,8 +365,8 @@
auto onStatusChanged = [&](void* pFrom, STATE state) -> void {
m_pModel->notifyInt(RX_CODE_PASSIVE_STATUS_CHANGED, (int)state);
- // 连上之后发S1F1
- // 修改为不主动发送，而是响应
+ // 杩炰笂涔嬪悗鍙慡1F1
+ // 淇敼涓轰笉涓诲姩鍙戦�侊紝鑰屾槸鍝嶅簲
/*
if (STATE::SELECTED == state) {
m_bAreYouThereRequest = FALSE;
@@ -304,7 +405,7 @@
HEADER* pHeader = pMessage->getHeader();
int nStream = (pHeader->stream & 0x7F);
- LOGI("<HSMS>收到消息 S%dF%d", nStream, pHeader->function);
+ LOGI("<HSMS>鏀跺埌娑堟伅 S%dF%d", nStream, pHeader->function);
if (nStream == 1 && pHeader->function == 1) {
// S1F1
replyAreYouThere(pMessage);
@@ -358,7 +459,7 @@
listener.funError = onError;
m_pPassive->setListener(listener);
- // 启动工作线程
+ // 鍚姩宸ヤ綔绾跨▼
m_bCimWorking = TRUE;
m_hCimWorkThreadHandle = (HANDLE)_beginthreadex(NULL, 0, ::CimWorkThreadFunction, this,
0, &m_nCimWorkThrdaddr);
@@ -371,7 +472,7 @@
int CHsmsPassive::term()
{
- // 结束线程
+ // 缁撴潫绾跨▼
m_bCimWorking = FALSE;
SetEvent(m_hCimWorkEvent);
if (m_hCimWorkThreadHandle != NULL) {
@@ -394,12 +495,12 @@
{
while (m_bCimWorking) {
- // 待退出信号或时间到
+ // 寰呴��鍑轰俊鍙锋垨鏃堕棿鍒�
int nRet = WaitForSingleObject(m_hCimWorkEvent, INFINITE);
ResetEvent(m_hCimWorkEvent);
if (!m_bCimWorking) break;
- // 取出请求列表并进行处理
+ // 鍙栧嚭璇锋眰鍒楄〃骞惰繘琛屽鐞�
std::list<CHsmsAction*> list;
Lock();
list.splice(list.end(), m_listAction);
@@ -418,14 +519,14 @@
LOGI("<HSMS> [SEND] SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
if (pAction->isNeedWaitReply()) {
- // 如果需要等待回复
+ // 濡傛灉闇�瑕佺瓑寰呭洖澶�
int nRet = WaitForSingleObject(pAction->getEvent(), pAction->getTimeout() * 1000);
if (nRet == WAIT_TIMEOUT) {
TRACE("Timeout...\n");
CContext* pContext = pAction->getContext();
if (pContext != NULL) {
//pContext->setRetCode(CRC_TIMEOUT);
- //pContext->setRetMsg("超时");
+ //pContext->setRetMsg("瓒呮椂");
//pContext->setEvent();
}
}
@@ -451,7 +552,7 @@
return 0;
}
-// 通用的reply ack函数
+// 閫氱敤鐨剅eply ack鍑芥暟
void CHsmsPassive::replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName)
{
IMessage* pMessage = NULL;
@@ -514,13 +615,13 @@
}
- // 交由上层应用来获取机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヨ幏鍙栨満鍣ㄥ父閲忓��
if (m_listener.onEQOffLine != nullptr) {
m_listener.onEQOffLine(this);
}
- // 回复
+ // 鍥炲
replyAck(1, 16, pRecv->getHeader()->systemBytes, BYTE(0), "OFLACK");
return 0;
}
@@ -533,13 +634,13 @@
}
- // 交由上层应用来获取机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヨ幏鍙栨満鍣ㄥ父閲忓��
if (m_listener.onEQOnLine != nullptr) {
m_listener.onEQOnLine(this);
}
- // 回复
+ // 鍥炲
replyAck(1, 18, pRecv->getHeader()->systemBytes, BYTE(0), "ONLACK");
return 0;
}
@@ -574,7 +675,7 @@
}
- // 要获取的常量表表
+ // 瑕佽幏鍙栫殑甯搁噺琛ㄨ〃
BOOL bCheckData = FALSE;
std::vector<EQConstant> eqcs;
{
@@ -591,13 +692,13 @@
}
- // 交由上层应用来获取机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヨ幏鍙栨満鍣ㄥ父閲忓��
if (m_listener.onEQConstantRequest != nullptr) {
m_listener.onEQConstantRequest(this, eqcs);
}
- // 回复
+ // 鍥炲
IMessage* pMessage = NULL;
HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
@@ -621,7 +722,7 @@
}
- // 要设置的常量表表
+ // 瑕佽缃殑甯搁噺琛ㄨ〃
BOOL bCheckData = FALSE;
std::vector<EQConstant> eqcs;
{
@@ -644,14 +745,14 @@
}
- // 交由上层应用来保存和设置机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヤ繚瀛樺拰璁剧疆鏈哄櫒甯搁噺鍊�
std::vector<unsigned int> ecvs;
if (m_listener.onEQConstantSend != nullptr) {
m_listener.onEQConstantSend(this, eqcs);
}
- // 回复
+ // 鍥炲
replyAck(2, 16, pRecv->getHeader()->systemBytes, BYTE(0), "EACK");
return 0;
}
@@ -666,7 +767,7 @@
if (pBody == nullptr || pBody->getType() != SITYPE::A) ER_PARAM_ERROR;
const char* pszMessage;
if (pBody->getString(pszMessage)) {
- // 更新时间
+ // 鏇存柊鏃堕棿
SYSTEMTIME time;
char szBuffer[20];
memcpy(szBuffer, pszMessage, 16);
@@ -733,7 +834,7 @@
MYREPLY:
- // 检验结果是否正确
+ // 妫�楠岀粨鏋滄槸鍚︽纭�
for (auto item : m_mapValueIdToPRTID) {
LOGE("=== vid:%d, prtid:%d", item.first, item.second);
}
@@ -777,7 +878,7 @@
}
- // 检验结果是否正确
+ // 妫�楠岀粨鏋滄槸鍚︽纭�
for (auto item : m_mapReportIdToCEID) {
LOGE("=== prtid:%d, ceid:%d", item.first, item.second);
}
@@ -864,7 +965,7 @@
}
- // 回调到应用层
+ // 鍥炶皟鍒板簲鐢ㄥ眰
if (bCheckData) {
if (m_listener.onCommand != nullptr) {
m_listener.onCommand(this, pszCmdName, params);
--
Gitblit v1.9.3