From 02685679ef1f191abe87f22260879c02b6d7c31e Mon Sep 17 00:00:00 2001 From: lzq Date: Fri, 11 Jul 2025 11:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/barrier/generic_barrier.cpp | 2 +- src/barrier/generic_barrier.h | 2 +- src/common/daily_and_size_sink.h | 1 - src/device_holder.cpp | 2 ++ src/sound_column/generic_sound_column.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/barrier/generic_barrier.cpp b/src/barrier/generic_barrier.cpp index 7042bb2..b754fb3 100644 --- a/src/barrier/generic_barrier.cpp +++ b/src/barrier/generic_barrier.cpp @@ -28,7 +28,7 @@ namespace zsy if (cli) { auto clientId = cli->getClientId(); - Application::eventManager->subscribe(clientId + "/hznn/1/barrier", [](const EventManager::Event &event) + Application::eventManager->subscribe(clientId + "/" + clientId + "/1/barrier", [](const EventManager::Event &event) { if (!event.data.has_value()) { diff --git a/src/barrier/generic_barrier.h b/src/barrier/generic_barrier.h index fac1ebc..8802af8 100644 --- a/src/barrier/generic_barrier.h +++ b/src/barrier/generic_barrier.h @@ -25,7 +25,7 @@ namespace zsy struct Body { - int delay = 500; + int delay = 100; int value; int io; }; diff --git a/src/common/daily_and_size_sink.h b/src/common/daily_and_size_sink.h index b530756..41df9f5 100644 --- a/src/common/daily_and_size_sink.h +++ b/src/common/daily_and_size_sink.h @@ -37,7 +37,6 @@ namespace zsy uintmax_t lastSize(); public: - // 构造函数:基础文件名、最大文件大小(字节)、最大保留天数 DailyAndSizeSink( const std::string &filename, size_t maxSize, int32_t maxDays); protected: diff --git a/src/device_holder.cpp b/src/device_holder.cpp index b3282bf..8a1ee09 100644 --- a/src/device_holder.cpp +++ b/src/device_holder.cpp @@ -3,6 +3,7 @@ #include "barrier/generic_barrier.h" #include "platform_scale/generic_platform_scale.h" #include "sound_column/generic_sound_column.h" +// #include "vidicon/generic_vidicon.h" #include "vidicon/barrier_vidicon.h" namespace zsy { @@ -38,6 +39,7 @@ namespace zsy { { for (auto &config: configs) { + // vidicons.emplace(config.sn, std::make_shared(config)); vidicons.emplace(config.sn, std::make_shared(config)); } } diff --git a/src/sound_column/generic_sound_column.cpp b/src/sound_column/generic_sound_column.cpp index bdcad63..39e3338 100644 --- a/src/sound_column/generic_sound_column.cpp +++ b/src/sound_column/generic_sound_column.cpp @@ -22,7 +22,7 @@ namespace zsy auto clientId = cli->getClientId(); if (cli) { - Application::eventManager->subscribe(clientId + "/hznn/1/voice", [](const EventManager::Event &event) + Application::eventManager->subscribe(clientId + "/" + clientId + "/1/voice", [](const EventManager::Event &event) { if (!event.data.has_value()) {