From 847a34f02bfe00475735fb5bfbefea2db28c8ad6 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 24 一月 2026 17:15:48 +0800
Subject: [PATCH] 1.修复前烘-b, 后烘-b没有进入b分支导致数据没有推送到显示端的问题；
---
SourceCode/Bond/Servo/ToolUnits.cpp | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.cpp b/SourceCode/Bond/Servo/ToolUnits.cpp
index cc9a1bf..e3e1dca 100644
--- a/SourceCode/Bond/Servo/ToolUnits.cpp
+++ b/SourceCode/Bond/Servo/ToolUnits.cpp
@@ -4,7 +4,11 @@
#include <memory>
#include <sstream>
#include <algorithm>
-
+#include <ctime>
+#include <iomanip>
+#include <sstream>
+#include <vector>
+#include <cstdarg>
CToolUnits::CToolUnits()
{
@@ -557,3 +561,80 @@
std::snprintf(out, sizeof(out), "%s.%03d", date, ms);
return out;
}
+
+std::string CToolUnits::NowStrSec()
+{
+ using namespace std::chrono;
+ auto now = system_clock::now();
+ std::time_t t = system_clock::to_time_t(now);
+ std::tm tm{};
+#ifdef _WIN32
+ localtime_s(&tm, &t); // 本地时间（Windows 线程安全）
+#else
+ localtime_r(&t, &tm); // 本地时间（POSIX 线程安全）
+#endif
+ std::ostringstream oss;
+ oss << std::put_time(&tm, "%Y%m%d%H%M%S"); // 例：2025-09-15 08:23:07
+ return oss.str();
+}
+
+std::wstring CToolUnits::AnsiToWString(const std::string& str)
+{
+ if (str.empty()) return std::wstring();
+
+ int len = ::MultiByteToWideChar(CP_ACP, 0,
+ str.c_str(), -1,
+ nullptr, 0);
+ if (len <= 0) return std::wstring();
+
+ std::wstring ws;
+ ws.resize(len - 1);
+
+ ::MultiByteToWideChar(CP_ACP, 0,
+ str.c_str(), -1,
+ &ws[0], len);
+
+ return ws;
+}
+
+std::string CToolUnits::WStringToAnsi(const std::wstring& wstr)
+{
+ if (wstr.empty()) return std::string();
+
+ int len = ::WideCharToMultiByte(CP_ACP, 0,
+ wstr.c_str(), -1,
+ nullptr, 0,
+ nullptr, nullptr);
+ if (len <= 0) return std::string();
+
+ std::string str;
+ str.resize(len - 1);
+
+ ::WideCharToMultiByte(CP_ACP, 0,
+ wstr.c_str(), -1,
+ &str[0], len,
+ nullptr, nullptr);
+
+ return str;
+}
+std::string CToolUnits::formatString(const char* fmt, ...)
+{
+ if (fmt == nullptr) return std::string();
+
+ char buf[512] = {0};
+ va_list args;
+ va_start(args, fmt);
+ int n = _vsnprintf_s(buf, sizeof(buf), _TRUNCATE, fmt, args);
+ va_end(args);
+
+ if (n >= 0 && n < (int)sizeof(buf)) {
+ return std::string(buf);
+ }
+
+ // ?????????????????
+ std::vector<char> tmp((n > 0 ? n + 2 : 1024), 0);
+ va_start(args, fmt);
+ _vsnprintf_s(tmp.data(), tmp.size(), _TRUNCATE, fmt, args);
+ va_end(args);
+ return std::string(tmp.data());
+}
--
Gitblit v1.9.3