diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp index 3281a7d..a9e7562 100644 --- a/appsrc/appconfig/basic/zappversion.hpp +++ b/appsrc/appconfig/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "3.0.9" +#define VERSION "3.0.10" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/service/debug_page_test_service.cpp b/appsrc/service/debug_page_test_service.cpp index cd8c6c0..86b6e6d 100644 --- a/appsrc/service/debug_page_test_service.cpp +++ b/appsrc/service/debug_page_test_service.cpp @@ -6,24 +6,25 @@ void DebugPageTestService::initialize() { REG_EXTFN_VOID(enterTestMode, void(void)); REG_EXTFN_VOID(exitTestMode, void(void)); REG_EXTFN(startGenFakeH2O2Data, void(json), data); + REG_EXTFN_VOID(startGenFakeHighH2O2Data, void(void)); REG_EXTFN_VOID(stopGenFakeH2O2Data, void(void)); REG_EXTFN_VOID(getGenFakeH2O2DataDemoJson, void(void)); REG_EXTFN_VOID(triggerAppWarningPromoptEvent, void(void)); REG_EXTFN(triggerPromptEvent, void(string), message); - REG_EXTFN(test_int, int(json), param0); - REG_EXTFN(test_int, int(SettingId), param0); - REG_EXTFN(test_int, int(int), param0); - REG_EXTFN(test_string, void(string), param0); - REG_EXTFN(test_float, void(float), param0); - REG_EXTFN(test_double, void(double), param0); - REG_EXTFN(test_bool, void(bool), param0); - REG_EXTFN(test_vector_int, void(vector), param0); - REG_EXTFN(test_vector_string, void(vector), param0); - REG_EXTFN(test_vector_double, void(vector), param0); - REG_EXTFN(test_vecto_json, void(vector), param0); - REG_EXTFN(test_vecto_bool, void(vector), param0); + // REG_EXTFN(test_int, int(json), param0); + // REG_EXTFN(test_int, int(SettingId), param0); + // REG_EXTFN(test_int, int(int), param0); + // REG_EXTFN(test_string, void(string), param0); + // REG_EXTFN(test_float, void(float), param0); + // REG_EXTFN(test_double, void(double), param0); + // REG_EXTFN(test_bool, void(bool), param0); + // REG_EXTFN(test_vector_int, void(vector), param0); + // REG_EXTFN(test_vector_string, void(vector), param0); + // REG_EXTFN(test_vector_double, void(vector), param0); + // REG_EXTFN(test_vecto_json, void(vector), param0); + // REG_EXTFN(test_vecto_bool, void(vector), param0); // REG_EXTFN(test_vecto_enum, void(vector), param0); } void DebugPageTestService::test_json(shared_ptr cxt, json param0) {} @@ -56,6 +57,27 @@ typedef struct { #endif +void DebugPageTestService::startGenFakeHighH2O2Data(shared_ptr cxt) { + if (m_genFakeH2O2DataThread) { + m_genFakeH2O2DataThread->join(); + m_genFakeH2O2DataThread = nullptr; + } + + m_genFakeH2O2DataThread.reset(new Thread("genFakeH2O2DataThread", [this]() { + while (!ThisThread().getExitFlag()) { + ThisThread().sleepForMs(1000); + + report_h2o2_data_t reportData; + reportData.rh = 50 * 10; + reportData.h2o2 = 400; + reportData.temp = 25 * 10; // 温度是整数,乘以10 + reportData.rs = 50 * 10; // rs is in %RS, convert to float + + h2o2SensorStateSyncService->updateH2o2SensorData(H2O2SensorType::Internal, 1, &reportData); + } + })); +} + void DebugPageTestService::startGenFakeH2O2Data(shared_ptr cxt, json data) { if (m_genFakeH2O2DataThread) { m_genFakeH2O2DataThread->join(); @@ -136,5 +158,4 @@ void DebugPageTestService::triggerPromptEvent(shared_ptr cxt, AppEventBus::ins()->pushPromoptEvent(message); } void DebugPageTestService::triggerAppCheckPointFailEvent(shared_ptr cxt) { // - } diff --git a/appsrc/service/debug_page_test_service.hpp b/appsrc/service/debug_page_test_service.hpp index fa9954d..44a4c1e 100644 --- a/appsrc/service/debug_page_test_service.hpp +++ b/appsrc/service/debug_page_test_service.hpp @@ -29,6 +29,7 @@ class DebugPageTestService : public enable_shared_from_this cxt); void exitTestMode(shared_ptr cxt); void startGenFakeH2O2Data(shared_ptr cxt, json data); + void startGenFakeHighH2O2Data(shared_ptr cxt); void stopGenFakeH2O2Data(shared_ptr cxt); void getGenFakeH2O2DataDemoJson(shared_ptr cxt);