修复问题
parent
ee9eb6e212
commit
02685679ef
|
@ -28,7 +28,7 @@ namespace zsy
|
||||||
if (cli)
|
if (cli)
|
||||||
{
|
{
|
||||||
auto clientId = cli->getClientId();
|
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())
|
if (!event.data.has_value())
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,7 +25,7 @@ namespace zsy
|
||||||
|
|
||||||
struct Body
|
struct Body
|
||||||
{
|
{
|
||||||
int delay = 500;
|
int delay = 100;
|
||||||
int value;
|
int value;
|
||||||
int io;
|
int io;
|
||||||
};
|
};
|
||||||
|
|
|
@ -37,7 +37,6 @@ namespace zsy
|
||||||
|
|
||||||
uintmax_t lastSize();
|
uintmax_t lastSize();
|
||||||
public:
|
public:
|
||||||
// 构造函数:基础文件名、最大文件大小(字节)、最大保留天数
|
|
||||||
DailyAndSizeSink( const std::string &filename, size_t maxSize, int32_t maxDays);
|
DailyAndSizeSink( const std::string &filename, size_t maxSize, int32_t maxDays);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "barrier/generic_barrier.h"
|
#include "barrier/generic_barrier.h"
|
||||||
#include "platform_scale/generic_platform_scale.h"
|
#include "platform_scale/generic_platform_scale.h"
|
||||||
#include "sound_column/generic_sound_column.h"
|
#include "sound_column/generic_sound_column.h"
|
||||||
|
// #include "vidicon/generic_vidicon.h"
|
||||||
#include "vidicon/barrier_vidicon.h"
|
#include "vidicon/barrier_vidicon.h"
|
||||||
|
|
||||||
namespace zsy {
|
namespace zsy {
|
||||||
|
@ -38,6 +39,7 @@ namespace zsy {
|
||||||
{
|
{
|
||||||
for (auto &config: configs)
|
for (auto &config: configs)
|
||||||
{
|
{
|
||||||
|
// vidicons.emplace(config.sn, std::make_shared<GenericVidicon>(config));
|
||||||
vidicons.emplace(config.sn, std::make_shared<BarrierVidicon>(config));
|
vidicons.emplace(config.sn, std::make_shared<BarrierVidicon>(config));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace zsy
|
||||||
auto clientId = cli->getClientId();
|
auto clientId = cli->getClientId();
|
||||||
if (cli)
|
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())
|
if (!event.data.has_value())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue