diff --git a/README.md b/README.md index 401cb80..7dd6b7e 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,9 @@ VERSION 1.2.3 VERSION 1.2.4 1. fix some bug + +VERSION 1.2.5 + 1. 更新版本 TODO: 1.添加用户增加用户查重检查 diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp index 6131227..df26e2c 100644 --- a/appsrc/appsetting/project_port/basic/zappversion.hpp +++ b/appsrc/appsetting/project_port/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "1.2.4" +#define VERSION "1.2.5" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/baseservice/db/setting_db_dao.cpp b/appsrc/baseservice/db/setting_db_dao.cpp index 97a46bf..01ee009 100644 --- a/appsrc/baseservice/db/setting_db_dao.cpp +++ b/appsrc/baseservice/db/setting_db_dao.cpp @@ -118,8 +118,8 @@ void SettingDBDao::initialize() { // setting.val_lower_limit = "0"; setting.val_upper_limit = "8"; } else { - setting.default_val = "15"; - setting.val = "15"; + setting.default_val = "10"; + setting.val = "10"; setting.val_lower_limit = "0"; setting.val_upper_limit = "40"; } diff --git a/appsrc/service/device_check_point_check_service.cpp b/appsrc/service/device_check_point_check_service.cpp index 4107c0b..e5db3f0 100644 --- a/appsrc/service/device_check_point_check_service.cpp +++ b/appsrc/service/device_check_point_check_service.cpp @@ -3,6 +3,7 @@ #include "service/app/add_liquid_service.hpp" #include "service/app/air_leak_detect_test.hpp" #include "service/app/disinfection_ctrl/disinfection_ctrl_service.hpp" +#include "service/app/drain_liquid_service.hpp" #include "service/hardware/device_io_ctrl_service.hpp" using namespace iflytop; @@ -60,7 +61,7 @@ void DeviceCheckPointCheckService::initialize() { // } else if (DS->getDeviceState() == DeviceState::AddingLiquid) { GET_SERVICE(AddLiquidService)->stop(); } else if (DS->getDeviceState() == DeviceState::DrainingLiquid) { - GET_SERVICE(AddLiquidService)->stop(); + GET_SERVICE(DrainLiquidService)->stop(); } else if (DS->getDeviceState() == DeviceState::AirLeakDetectTesting) { GET_SERVICE(AirLeakDetectTest)->stop(); } @@ -75,9 +76,9 @@ vector DeviceCheckPointCheckService::getAllCheckPoints() { return ch bool DeviceCheckPointCheckService::isPassed() { for (auto& checkPoint : checkPoints) { - if (checkPoint.passed) { - return true; + if (!checkPoint.passed) { + return false; } } - return false; + return true; } \ No newline at end of file