diff --git a/README.md b/README.md index b68c0c0..3cf52b4 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,11 @@ VERSION 1.0.10 2. 支持存放应用的静态网页 VERSION 1.0.11 1. 再次修正系数 + +VERSION 1.1.0 + 1.修复测试页面部分接口BUG + +VERSION 1.1.1 + 1.修正TestPageMgrService + ``` \ No newline at end of file diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp index 021274d..d4adfa7 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.0.10" +#define VERSION "1.1.1" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/service/test_page_mgr_service.cpp b/appsrc/service/test_page_mgr_service.cpp index 8a53eae..59390e1 100644 --- a/appsrc/service/test_page_mgr_service.cpp +++ b/appsrc/service/test_page_mgr_service.cpp @@ -68,6 +68,7 @@ void TestPageMgrService::initialize() { // 按键 {"addingLiquid", "加液"}, {"drainLiquid", "排液"}, + {"stop", "停止"}, }, [this](string buttonName, vector param) { // logger->info("on AddDischargePumpCtrl.{}", buttonName); @@ -75,6 +76,8 @@ void TestPageMgrService::initialize() { dcs->AddLiquidPump_addLiquid(); } else if (buttonName == "drainLiquid") { dcs->AddLiquidPump_drainLiquid(); + } else { + dcs->AddLiquidPump_stop(); } }); diff --git a/appsrc/service/testpage/test_page_processer.cpp b/appsrc/service/testpage/test_page_processer.cpp index 64ed4bb..1dbd2b3 100644 --- a/appsrc/service/testpage/test_page_processer.cpp +++ b/appsrc/service/testpage/test_page_processer.cpp @@ -57,7 +57,7 @@ void TestPageItemMgr::processOnButton(string groupName, string buttonName, json for (uint32_t i = 0; i < buttons->buttons.size(); i++) { if (buttons->buttons[i].name == buttonName) { - buttons->onButton(buttonName, params); + buttons->onButton(buttonName, paramstable); } } }