p_transmit_disinfection_v3
/
transmit_dm_linux_backend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

recode

storage-in-realtime
zhaohe 12 months ago
parent
cd8071388e
commit
88d6fe10f3
17 changed files with 178 additions and 114 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      appsrc/baseservice/front_msg_processer/front_msg_processer.cpp
  2. 51
      appsrc/baseservice/front_msg_processer/front_msg_processer.hpp
  3. 8
      appsrc/service/app/add_liquid_service.cpp
  4. 8
      appsrc/service/app/air_leak_detect_test.cpp
  5. 14
      appsrc/service/app/disinfection_ctrl_service_ext.cpp
  6. 8
      appsrc/service/app/drain_liquid_service.cpp
  7. 8
      appsrc/service/app/pipeline_pressure_control.cpp
  8. 14
      appsrc/service/app_core.cpp
  9. 6
      appsrc/service/audit_mgr_service.cpp
  10. 2
      appsrc/service/device_info_mgr_service.cpp
  11. 12
      appsrc/service/disinfection_logs_service.cpp
  12. 2
      appsrc/service/front_end_realtime_display_content_mgr.cpp
  13. 72
      appsrc/service/hardware/device_io_ctrl_service.cpp
  14. 6
      appsrc/service/os_mgr_service.cpp
  15. 16
      appsrc/service/setting_mgr_service.cpp
  16. 12
      appsrc/service/test_page_mgr_service.cpp
  17. 16
      appsrc/service/user_mgr_service.cpp

37
appsrc/baseservice/front_msg_processer/front_msg_processer.cpp
View File

@ -15,7 +15,36 @@ using namespace iflytop;
// } // }
void FrontMsgProcesser::initialize() {} void FrontMsgProcesser::initialize() {}
json FrontMsgProcesser::getCmdList() { return 0; }
json FrontMsgProcesser::geFnList() {
json rely;
json fnlist;
// fnlist
json fn;
for (auto& var : m_msgProcesserList) {
fn["className"] = var->className;
fn["fnName"] = var->fnName;
fn["params"] = var->params;
fn["retTypeInfo"] = var->retTypeInfo;
fn["paramsTypeInfo"] = var->paramsTypeInfo;
fnlist.push_back(fn);
}
rely["fnlist"] = fnlist;
// typeInfoList
json typeInfoList;
for (auto& var : typeInfoMap) {
json typeInfo;
typeInfo["typeName"] = var.second.typeName;
typeInfo["isEnum"] = !var.second.enumValues.empty();
typeInfo["enumValues"] = var.second.enumValues;
typeInfoList.push_back(typeInfo);
}
rely["typeInfoList"] = typeInfoList;
rely["fnlist"] = fnlist;
return rely;
}
void FrontMsgProcesser::processMsg(shared_ptr<MsgProcessContext> cxt) { void FrontMsgProcesser::processMsg(shared_ptr<MsgProcessContext> cxt) {
string className = cxt->cmd["className"]; string className = cxt->cmd["className"];
@ -28,9 +57,13 @@ void FrontMsgProcesser::processMsg(shared_ptr<MsgProcessContext> cxt) {
logger->info("call: {}->({})", fn, param); logger->info("call: {}->({})", fn, param);
if (fn == "FNScheduler.geFnList") {
cxt->content = geFnList();
return;
}
if (m_msgProcesserMap.find(key) != m_msgProcesserMap.end()) { if (m_msgProcesserMap.find(key) != m_msgProcesserMap.end()) {
try { try {
cxt->_regfnhasret = m_msgProcesserMap[key]->retInfo != "void";
m_msgProcesserMap[key]->fn(cxt); m_msgProcesserMap[key]->fn(cxt);
if (cxt->ackcode != 0) { if (cxt->ackcode != 0) {

51
appsrc/baseservice/front_msg_processer/front_msg_processer.hpp
View File

@ -40,8 +40,6 @@ class MsgProcessContext {
int ackcode = 0; int ackcode = 0;
json content; json content;
string ackcodeExtMessage; string ackcodeExtMessage;
bool _regfnhasret = false;
}; };
typedef std::function<void(shared_ptr<MsgProcessContext> cxt)> MsgProcesserFn_t; typedef std::function<void(shared_ptr<MsgProcessContext> cxt)> MsgProcesserFn_t;
@ -59,7 +57,7 @@ class MsgProcesser {
MsgProcesserFn_t fn; MsgProcesserFn_t fn;
vector<string> paramsTypeInfo; vector<string> paramsTypeInfo;
vector<string> params; vector<string> params;
string retInfo;
string retTypeInfo;
}; };
class FrontMsgProcesser { class FrontMsgProcesser {
@ -67,7 +65,8 @@ class FrontMsgProcesser {
public: public:
private: private:
map<string, shared_ptr<MsgProcesser> > m_msgProcesserMap;
map<string, shared_ptr<MsgProcesser>> m_msgProcesserMap;
list<shared_ptr<MsgProcesser>> m_msgProcesserList;
map<type_index, TypeInfo> typeInfoMap; map<type_index, TypeInfo> typeInfoMap;
FrontMsgProcesser() {}; FrontMsgProcesser() {};
@ -80,7 +79,7 @@ class FrontMsgProcesser {
void initialize(); void initialize();
void processMsg(shared_ptr<MsgProcessContext> cxt); void processMsg(shared_ptr<MsgProcessContext> cxt);
json getCmdList();
json geFnList();
public: public:
template <typename T> template <typename T>
@ -138,9 +137,10 @@ class FrontMsgProcesser {
processer->fnName = fnName; processer->fnName = fnName;
processer->paramsTypeInfo = paramsTypeInfo; processer->paramsTypeInfo = paramsTypeInfo;
processer->params = params; processer->params = params;
processer->retInfo = ret;
processer->retTypeInfo = ret;
processer->fn = fn; processer->fn = fn;
m_msgProcesserMap[key] = processer; m_msgProcesserMap[key] = processer;
m_msgProcesserList.push_back(processer);
} }
}; };
@ -175,10 +175,7 @@ static inline T jsonGet(json j) {
cxt->content = fn(MARCO_LIST(REGFNV_EACH_EXPTR1, _1, _2, _3, _4, _5, __VA_ARGS__)); \ cxt->content = fn(MARCO_LIST(REGFNV_EACH_EXPTR1, _1, _2, _3, _4, _5, __VA_ARGS__)); \
}); });
#define REG_FN_VOID(fn, type) \
FrontMsgProcesser::ins().regProcesser<type>(thisClass.className, #fn, {}, [this](shared_ptr<MsgProcessContext> cxt) { \
cxt->content = fn(); \
});
#define REG_FN_VOID(fn, type) FrontMsgProcesser::ins().regProcesser<type>(thisClass.className, #fn, {}, [this](shared_ptr<MsgProcessContext> cxt) { cxt->content = fn(); });
#define REG_EXTFN(fn, type, ...) \ #define REG_EXTFN(fn, type, ...) \
FrontMsgProcesser::ins().regProcesser<type>(thisClass.className, #fn, {MARCO_LIST(REGFNV_EACH_EXPTR2, _1, _2, _3, _4, _5, __VA_ARGS__)}, [this](shared_ptr<MsgProcessContext> cxt) { \ FrontMsgProcesser::ins().regProcesser<type>(thisClass.className, #fn, {MARCO_LIST(REGFNV_EACH_EXPTR2, _1, _2, _3, _4, _5, __VA_ARGS__)}, [this](shared_ptr<MsgProcessContext> cxt) { \
@ -186,3 +183,37 @@ static inline T jsonGet(json j) {
fn(cxt, MARCO_LIST(REGFNV_EACH_EXPTR1, _1, _2, _3, _4, _5, __VA_ARGS__)); \ fn(cxt, MARCO_LIST(REGFNV_EACH_EXPTR1, _1, _2, _3, _4, _5, __VA_ARGS__)); \
}); });
#define REG_EXTFN_VOID(fn, type) FrontMsgProcesser::ins().regProcesser<type>(thisClass.className, #fn, {}, [this](shared_ptr<MsgProcessContext> cxt) { fn(cxt); }); #define REG_EXTFN_VOID(fn, type) FrontMsgProcesser::ins().regProcesser<type>(thisClass.className, #fn, {}, [this](shared_ptr<MsgProcessContext> cxt) { fn(cxt); });
#if 0
#define REG_FN(fn, type, ...) \
{ \
type __fn_type; \
FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, /**/ \
{MARCO_LIST(REGFNV_EACH_EXPTR2, _1, _2, _3, _4, _5, __VA_ARGS__)}, /**/ \
__fn_type, /**/ \
[this](shared_ptr<MsgProcessContext> cxt) { \
json& params = cxt->params; \
cxt->content = fn(MARCO_LIST(REGFNV_EACH_EXPTR1, _1, _2, _3, _4, _5, __VA_ARGS__)); \
}); \
}
#define REG_FN_VOID(fn, type) \
{ \
type __fn_type; \
FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, {}, __fn_type, [this](shared_ptr<MsgProcessContext> cxt) { cxt->content = fn(); }); \
}
#define REG_EXTFN(fn, type, ...) \
{ \
type __fn_type; \
FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, {MARCO_LIST(REGFNV_EACH_EXPTR2, _1, _2, _3, _4, _5, __VA_ARGS__)}, __fn_type, [this](shared_ptr<MsgProcessContext> cxt) { \
json& params = cxt->params; \
fn(cxt, MARCO_LIST(REGFNV_EACH_EXPTR1, _1, _2, _3, _4, _5, __VA_ARGS__)); \
}); \
}
#define REG_EXTFN_VOID(fn, type) \
{ \
type __fn_type; \
FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, {}, __fn_type, [this](shared_ptr<MsgProcessContext> cxt) { fn(cxt); }); \
}
#endif

8
appsrc/service/app/add_liquid_service.cpp
View File

@ -9,10 +9,10 @@ using namespace iflytop;
void AddLiquidService::initialize() { void AddLiquidService::initialize() {
logger->info("AddLiquidService initialize"); logger->info("AddLiquidService initialize");
REG_EXTFN_VOID(start, function<void()>);
REG_EXTFN_VOID(stop, function<void()>);
REG_EXTFN_VOID(getState, function<void()>);
REG_EXTFN_VOID(getServiceConfig, function<void()>);
REG_EXTFN_VOID(start, void());
REG_EXTFN_VOID(stop, void());
REG_EXTFN_VOID(getState, void());
REG_EXTFN_VOID(getServiceConfig, void());
} }
void AddLiquidService::start(int stopatg) { void AddLiquidService::start(int stopatg) {

8
appsrc/service/app/air_leak_detect_test.cpp
View File

@ -10,10 +10,10 @@ void AirLeakDetectTest::initialize() {
GET_TO_SERVICE(m_gConfig) GET_TO_SERVICE(m_gConfig)
GET_TO_SERVICE(m_dics) GET_TO_SERVICE(m_dics)
REG_EXTFN_VOID(start, function<void()>);
REG_EXTFN_VOID(stop, function<void()>);
REG_EXTFN_VOID(getState, function<void()>);
REG_EXTFN_VOID(getServiceConfig, function<void()>);
REG_EXTFN_VOID(start, void());
REG_EXTFN_VOID(stop, void());
REG_EXTFN_VOID(getState, void());
REG_EXTFN_VOID(getServiceConfig, void());
} }

14
appsrc/service/app/disinfection_ctrl_service_ext.cpp
View File

@ -42,13 +42,13 @@ void DisinfectionCtrlServiceExt::initialize() {
GET_TO_SERVICE(gConfig); GET_TO_SERVICE(gConfig);
GET_TO_SERVICE(dcs); GET_TO_SERVICE(dcs);
REG_EXTFN_VOID(start, function<void()>);
REG_EXTFN_VOID(startWithFormula, function<void()>);
REG_EXTFN_VOID(stop, function<void()>);
REG_EXTFN_VOID(getState, function<void()>);
REG_EXTFN_VOID(getRealtimeConfig, function<void()>);
REG_EXTFN_VOID(setRealtimeConfig, function<void()>);
REG_EXTFN_VOID(getServiceConfig, function<void()>);
REG_EXTFN_VOID(start, void());
REG_EXTFN_VOID(startWithFormula, void());
REG_EXTFN_VOID(stop, void());
REG_EXTFN_VOID(getState, void());
REG_EXTFN_VOID(getRealtimeConfig, void());
REG_EXTFN_VOID(setRealtimeConfig, void());
REG_EXTFN_VOID(getServiceConfig, void());
} }
void DisinfectionCtrlServiceExt::start(shared_ptr<MsgProcessContext> cxt) { void DisinfectionCtrlServiceExt::start(shared_ptr<MsgProcessContext> cxt) {

8
appsrc/service/app/drain_liquid_service.cpp
View File

@ -4,10 +4,10 @@ using namespace iflytop;
void DrainLiquidService::initialize() { void DrainLiquidService::initialize() {
logger->info("DrainLiquidService initialize"); logger->info("DrainLiquidService initialize");
REG_EXTFN_VOID(start, function<void()>);
REG_EXTFN_VOID(stop, function<void()>);
REG_EXTFN_VOID(getState, function<void()>);
REG_EXTFN_VOID(getServiceConfig, function<void()>);
REG_EXTFN_VOID(start, void());
REG_EXTFN_VOID(stop, void());
REG_EXTFN_VOID(getState, void());
REG_EXTFN_VOID(getServiceConfig, void());
} }
void DrainLiquidService::start() { void DrainLiquidService::start() {

8
appsrc/service/app/pipeline_pressure_control.cpp
View File

@ -19,10 +19,10 @@ void PipelinePressureControl::initialize() {
GET_TO_SERVICE(m_dics); GET_TO_SERVICE(m_dics);
GET_TO_SERVICE(m_gConfig); GET_TO_SERVICE(m_gConfig);
REG_EXTFN_VOID(setType, function<void()>);
REG_EXTFN_VOID(setIntensity, function<void()>);
REG_EXTFN_VOID(getState, function<void()>);
REG_EXTFN_VOID(getConfig, function<void()>);
REG_EXTFN_VOID(setType, void());
REG_EXTFN_VOID(setIntensity, void());
REG_EXTFN_VOID(getState, void());
REG_EXTFN_VOID(getConfig, void());

14
appsrc/service/app_core.cpp
View File

@ -131,13 +131,13 @@ void AppCore::initialize() {
} }
}); });
REG_EXTFN_VOID(getState, function<void(void)>);
REG_EXTFN(promptConfirm, function<void(string)>, promptId);
REG_EXTFN_VOID(promptGetAll, function<void(void)>);
REG_EXTFN_VOID(promptGetNext, function<void(void)>);
REG_EXTFN(setInTestMode, function<void(void)>, isInTestMode);
REG_EXTFN_VOID(startGenFakeH2O2Data, function<void(void)>);
REG_EXTFN_VOID(stopGenFakeH2O2Data, function<void(void)>);
REG_EXTFN_VOID(getState, void(void));
REG_EXTFN(promptConfirm, void(string), promptId);
REG_EXTFN_VOID(promptGetAll, void(void));
REG_EXTFN_VOID(promptGetNext, void(void));
REG_EXTFN(setInTestMode, void(void), isInTestMode);
REG_EXTFN_VOID(startGenFakeH2O2Data, void(void));
REG_EXTFN_VOID(stopGenFakeH2O2Data, void(void));
}; };
int AppCore::demofn(int a, int b) { return 0; } int AppCore::demofn(int a, int b) { return 0; }

6
appsrc/service/audit_mgr_service.cpp
View File

@ -23,9 +23,9 @@ void AuditMgrService::initialize() {
GET_TO_SERVICE(m_db); GET_TO_SERVICE(m_db);
GET_TO_SERVICE(m_udiskMgr); GET_TO_SERVICE(m_udiskMgr);
REG_EXTFN_VOID(exportData, function<void()>);
REG_EXTFN_VOID(getRecords, function<void()>);
REG_EXTFN_VOID(pushTestData, function<void()>);
REG_EXTFN_VOID(exportData, void());
REG_EXTFN_VOID(getRecords, void());
REG_EXTFN_VOID(pushTestData, void());
} }
int AuditMgrService::callExportData() { int AuditMgrService::callExportData() {
string diskpath; string diskpath;

2
appsrc/service/device_info_mgr_service.cpp
View File

@ -10,7 +10,7 @@ void DeviceInfoMgrService::initialize() {
GET_TO_SERVICE(m_ds); GET_TO_SERVICE(m_ds);
GET_TO_SERVICE(m_gConfig); GET_TO_SERVICE(m_gConfig);
REG_EXTFN_VOID(getDeviceInfo, function<void()>);
REG_EXTFN_VOID(getDeviceInfo, void());
} }
void DeviceInfoMgrService::getDeviceInfo(shared_ptr<MsgProcessContext> cxt) { // void DeviceInfoMgrService::getDeviceInfo(shared_ptr<MsgProcessContext> cxt) { //

12
appsrc/service/disinfection_logs_service.cpp
View File

@ -156,12 +156,12 @@ void DisinfectionLogsService::initialize() {
GET_TO_SERVICE(m_gConfig); GET_TO_SERVICE(m_gConfig);
GET_TO_SERVICE(m_udiskMgrService); GET_TO_SERVICE(m_udiskMgrService);
REG_EXTFN_VOID(getRecordList, function<void()>);
REG_EXTFN_VOID(getRecord, function<void()>);
REG_EXTFN_VOID(deleteReport, function<void()>);
REG_EXTFN_VOID(exportRecord, function<void()>);
REG_EXTFN_VOID(printRecord, function<void()>);
REG_EXTFN_VOID(selftest, function<void()>);
REG_EXTFN_VOID(getRecordList, void());
REG_EXTFN_VOID(getRecord, void());
REG_EXTFN_VOID(deleteReport, void());
REG_EXTFN_VOID(exportRecord, void());
REG_EXTFN_VOID(printRecord, void());
REG_EXTFN_VOID(selftest, void());
m_csvHeaderDict.insert(CSVHeader::time, "时间"); m_csvHeaderDict.insert(CSVHeader::time, "时间");
m_csvHeaderDict.insert(CSVHeader::state, "设备状态"); m_csvHeaderDict.insert(CSVHeader::state, "设备状态");

2
appsrc/service/front_end_realtime_display_content_mgr.cpp
View File

@ -4,7 +4,7 @@
using namespace iflytop; using namespace iflytop;
void FrontEndRealtimeDisplayContentMgr::initialize() { // void FrontEndRealtimeDisplayContentMgr::initialize() { //
REG_EXTFN_VOID(readH2O2SensorData, function<void()>);
REG_EXTFN_VOID(readH2O2SensorData, void());
} }
void FrontEndRealtimeDisplayContentMgr::readH2O2SensorData(shared_ptr<MsgProcessContext> cxt) { void FrontEndRealtimeDisplayContentMgr::readH2O2SensorData(shared_ptr<MsgProcessContext> cxt) {

72
appsrc/service/hardware/device_io_ctrl_service.cpp
View File

@ -73,42 +73,42 @@ void DeviceIoControlService::initialize() {
DS->setAppExceptionFlag(e); DS->setAppExceptionFlag(e);
} }
REG_FN_VOID(AddLiquidPump_addLiquid, function<void()>);
REG_FN(AddLiquidPump_run, function<void(int)>, rpm);
REG_FN_VOID(AddLiquidPump_drainLiquid, function<void()>);
REG_FN_VOID(AddLiquidPump_stop, function<void()>);
REG_FN(SprayPump_start, function<void(int32_t)>, gpm);
REG_FN(SprayPump_startInRPM, function<void(int32_t)>, rpm);
REG_FN_VOID(SprayPump_stop, function<void()>);
REG_FN(Blower_ctrl, function<void(int32_t)>, val);
REG_FN_VOID(Blower_close, function<void()>);
REG_FN_VOID(Blower_readEI, function<void()>);
REG_FN(AC_ctrl, function<void(int32_t)>, val);
REG_FN_VOID(AC_close, function<void()>);
REG_FN_VOID(AC_readEI, function<void()>);
REG_FN(Heater_ctrl, function<void(int32_t)>, val);
REG_FN_VOID(Heater_close, function<void()>);
REG_FN_VOID(Heater_readEI, function<void()>);
REG_FN_VOID(Heater_readTemperature, function<void()>);
REG_FN(WarningLight_setState, function<void(int, int, int, int)>, r, g, b, warning);
REG_FN(PosiPressureProp_setValve, function<void(int)>, val);
REG_FN_VOID(PosiPressureProp_readPos, function<void()>);
REG_FN_VOID(PosiPressureProp_isBusy, function<void()>);
REG_FN(NegaPressureProp_setValve, function<void(int32_t)>, val);
REG_FN_VOID(NegaPressureProp_readPos, function<void()>);
REG_FN_VOID(NegaPressureProp_isBusy, function<void()>);
REG_FN(AirLeakDetectTestModeCtrl_setMode, function<void(int32_t)>, val);
REG_FN_VOID(AirLeakDetectTestModeCtrl_getMode, function<void()>);
REG_FN(ExtChSelector_selectCh, function<void(int32_t)>, val);
REG_FN(ExtChSelector_trySelectCh, function<void(int32_t)>, val);
REG_FN_VOID(ExtChSelector_isOnline, function<void()>);
REG_FN_VOID(WaterSensor_readEvaporationBin, function<void()>);
REG_FN_VOID(WaterSensor_readDeviceBottom, function<void()>);
REG_FN_VOID(ACPostPS_readPa, function<void()>);
REG_FN_VOID(AirLeakDetectPS_readPa, function<void()>);
REG_FN_VOID(LiquidWeightPS_readPa, function<void()>);
REG_FN_VOID(SprayPumpPostPS_readPa, function<void()>);
REG_FN_VOID(AddLiquidPumpPostPS_readPa, function<void()>);
REG_FN_VOID(AddLiquidPump_addLiquid, void());
REG_FN(AddLiquidPump_run, void(int), rpm);
REG_FN_VOID(AddLiquidPump_drainLiquid, void());
REG_FN_VOID(AddLiquidPump_stop, void());
REG_FN(SprayPump_start, void(int32_t), gpm);
REG_FN(SprayPump_startInRPM, void(int32_t), rpm);
REG_FN_VOID(SprayPump_stop, void());
REG_FN(Blower_ctrl, void(int32_t), val);
REG_FN_VOID(Blower_close, void());
REG_FN_VOID(Blower_readEI, void());
REG_FN(AC_ctrl, void(int32_t), val);
REG_FN_VOID(AC_close, void());
REG_FN_VOID(AC_readEI, void());
REG_FN(Heater_ctrl, void(int32_t), val);
REG_FN_VOID(Heater_close, void());
REG_FN_VOID(Heater_readEI, void());
REG_FN_VOID(Heater_readTemperature, void());
REG_FN(WarningLight_setState,void(int, int, int, int), r, g, b, warning);
REG_FN(PosiPressureProp_setValve, void(int), val);
REG_FN_VOID(PosiPressureProp_readPos, void());
REG_FN_VOID(PosiPressureProp_isBusy, void());
REG_FN(NegaPressureProp_setValve, void(int32_t), val);
REG_FN_VOID(NegaPressureProp_readPos, void());
REG_FN_VOID(NegaPressureProp_isBusy, void());
REG_FN(AirLeakDetectTestModeCtrl_setMode, void(int32_t), val);
REG_FN_VOID(AirLeakDetectTestModeCtrl_getMode, void());
REG_FN(ExtChSelector_selectCh, void(int32_t), val);
REG_FN(ExtChSelector_trySelectCh, void(int32_t), val);
REG_FN_VOID(ExtChSelector_isOnline, void());
REG_FN_VOID(WaterSensor_readEvaporationBin, void());
REG_FN_VOID(WaterSensor_readDeviceBottom, void());
REG_FN_VOID(ACPostPS_readPa, void());
REG_FN_VOID(AirLeakDetectPS_readPa, void());
REG_FN_VOID(LiquidWeightPS_readPa, void());
REG_FN_VOID(SprayPumpPostPS_readPa, void());
REG_FN_VOID(AddLiquidPumpPostPS_readPa, void());
} }
#define TRY_DO(func) \ #define TRY_DO(func) \

6
appsrc/service/os_mgr_service.cpp
View File

@ -9,9 +9,9 @@ void OsMgrService::initialize() {
GET_TO_SERVICE(m_ds); GET_TO_SERVICE(m_ds);
GET_TO_SERVICE(m_gConfig); GET_TO_SERVICE(m_gConfig);
REG_EXTFN_VOID(shutdown, function<void()>);
REG_EXTFN_VOID(updateDate, function<void()>);
REG_EXTFN_VOID(updateTime, function<void()>);
REG_EXTFN_VOID(shutdown, void());
REG_EXTFN_VOID(updateDate, void());
REG_EXTFN_VOID(updateTime, void());
} }

16
appsrc/service/setting_mgr_service.cpp
View File

@ -12,14 +12,14 @@ void SettingMgrService::initialize() {
GET_TO_SERVICE(m_db); GET_TO_SERVICE(m_db);
GET_TO_SERVICE(m_ds); GET_TO_SERVICE(m_ds);
REG_EXTFN_VOID(getAllSetting, function<void()>);
REG_EXTFN_VOID(setSettingVal, function<void()>);
REG_EXTFN_VOID(getAllFormula, function<void()>);
REG_EXTFN_VOID(addNewFormula, function<void()>);
REG_EXTFN_VOID(delFormula, function<void()>);
REG_EXTFN_VOID(updateFormula, function<void()>);
REG_EXTFN_VOID(updateFormulaIterm, function<void()>);
REG_EXTFN_VOID(factoryResetSettings, function<void()>);
REG_EXTFN_VOID(getAllSetting, void());
REG_EXTFN_VOID(setSettingVal, void());
REG_EXTFN_VOID(getAllFormula, void());
REG_EXTFN_VOID(addNewFormula, void());
REG_EXTFN_VOID(delFormula, void());
REG_EXTFN_VOID(updateFormula, void());
REG_EXTFN_VOID(updateFormulaIterm, void());
REG_EXTFN_VOID(factoryResetSettings, void());
} }

12
appsrc/service/test_page_mgr_service.cpp
View File

@ -14,12 +14,12 @@ void TestPageMgrService::initialize() {
GET_TO_SERVICE(dcs); GET_TO_SERVICE(dcs);
REG_EXTFN_VOID(getTestPageCfgInfo, function<void()>);
REG_EXTFN_VOID(onButton, function<void()>);
REG_EXTFN_VOID(readState, function<void()>);
REG_EXTFN_VOID(triggerOnePrompt, function<void()>);
REG_EXTFN_VOID(startReportState, function<void()>);
REG_EXTFN_VOID(stopReportState, function<void()>);
REG_EXTFN_VOID(getTestPageCfgInfo, void());
REG_EXTFN_VOID(onButton, void());
REG_EXTFN_VOID(readState, void());
REG_EXTFN_VOID(triggerOnePrompt, void());
REG_EXTFN_VOID(startReportState, void());
REG_EXTFN_VOID(stopReportState, void());

16
appsrc/service/user_mgr_service.cpp
View File

@ -8,14 +8,14 @@ void UserMgrService::initialize() {
GET_TO_SERVICE(m_db); GET_TO_SERVICE(m_db);
GET_TO_SERVICE(m_deviceStateService); GET_TO_SERVICE(m_deviceStateService);
REG_EXTFN_VOID(login, function<void()>);
REG_EXTFN_VOID(unlogin, function<void()>);
REG_EXTFN_VOID(chpasswd, function<void()>);
REG_EXTFN_VOID(addUser, function<void()>);
REG_EXTFN_VOID(delUser, function<void()>);
REG_EXTFN_VOID(updateUserUid, function<void()>);
REG_EXTFN_VOID(getAllUser, function<void()>);
REG_EXTFN_VOID(getLoginUser, function<void()>);
REG_EXTFN_VOID(login, void());
REG_EXTFN_VOID(unlogin, void());
REG_EXTFN_VOID(chpasswd, void());
REG_EXTFN_VOID(addUser, void());
REG_EXTFN_VOID(delUser, void());
REG_EXTFN_VOID(updateUserUid, void());
REG_EXTFN_VOID(getAllUser, void());
REG_EXTFN_VOID(getLoginUser, void());
}; };
void UserMgrService::login(shared_ptr<MsgProcessContext> cxt) { void UserMgrService::login(shared_ptr<MsgProcessContext> cxt) {

Write Preview
Loading…
Cancel
Save