Browse Source

测试页面中添加H2O2虚拟数据上报功能

master
zhaohe 4 weeks ago
parent
commit
35b8ece754
  1. 2
      appsrc/appconfig/basic/zappversion.hpp
  2. 47
      appsrc/service/debug_page_test_service.cpp
  3. 1
      appsrc/service/debug_page_test_service.hpp

2
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"

47
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<int>), param0);
REG_EXTFN(test_vector_string, void(vector<string>), param0);
REG_EXTFN(test_vector_double, void(vector<double>), param0);
REG_EXTFN(test_vecto_json, void(vector<json>), param0);
REG_EXTFN(test_vecto_bool, void(vector<bool>), 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<int>), param0);
// REG_EXTFN(test_vector_string, void(vector<string>), param0);
// REG_EXTFN(test_vector_double, void(vector<double>), param0);
// REG_EXTFN(test_vecto_json, void(vector<json>), param0);
// REG_EXTFN(test_vecto_bool, void(vector<bool>), param0);
// REG_EXTFN(test_vecto_enum, void(vector<SettingId>), param0);
}
void DebugPageTestService::test_json(shared_ptr<MsgProcessContext> cxt, json param0) {}
@ -56,6 +57,27 @@ typedef struct {
#endif
void DebugPageTestService::startGenFakeHighH2O2Data(shared_ptr<MsgProcessContext> 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<MsgProcessContext> cxt, json data) {
if (m_genFakeH2O2DataThread) {
m_genFakeH2O2DataThread->join();
@ -136,5 +158,4 @@ void DebugPageTestService::triggerPromptEvent(shared_ptr<MsgProcessContext> cxt,
AppEventBus::ins()->pushPromoptEvent(message);
}
void DebugPageTestService::triggerAppCheckPointFailEvent(shared_ptr<MsgProcessContext> cxt) { //
}

1
appsrc/service/debug_page_test_service.hpp

@ -29,6 +29,7 @@ class DebugPageTestService : public enable_shared_from_this<DebugPageTestService
void enterTestMode(shared_ptr<MsgProcessContext> cxt);
void exitTestMode(shared_ptr<MsgProcessContext> cxt);
void startGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt, json data);
void startGenFakeHighH2O2Data(shared_ptr<MsgProcessContext> cxt);
void stopGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt);
void getGenFakeH2O2DataDemoJson(shared_ptr<MsgProcessContext> cxt);

Loading…
Cancel
Save