From 88d6fe10f3e26624bd4b9513b9ecf9f042481604 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 20 Aug 2024 14:36:01 +0800 Subject: [PATCH] recode --- .../front_msg_processer/front_msg_processer.cpp | 37 ++++++++++- .../front_msg_processer/front_msg_processer.hpp | 51 ++++++++++++--- appsrc/service/app/add_liquid_service.cpp | 8 +-- appsrc/service/app/air_leak_detect_test.cpp | 8 +-- .../service/app/disinfection_ctrl_service_ext.cpp | 14 ++--- appsrc/service/app/drain_liquid_service.cpp | 8 +-- appsrc/service/app/pipeline_pressure_control.cpp | 8 +-- appsrc/service/app_core.cpp | 14 ++--- appsrc/service/audit_mgr_service.cpp | 6 +- appsrc/service/device_info_mgr_service.cpp | 2 +- appsrc/service/disinfection_logs_service.cpp | 12 ++-- .../front_end_realtime_display_content_mgr.cpp | 2 +- appsrc/service/hardware/device_io_ctrl_service.cpp | 72 +++++++++++----------- appsrc/service/os_mgr_service.cpp | 6 +- appsrc/service/setting_mgr_service.cpp | 16 ++--- appsrc/service/test_page_mgr_service.cpp | 12 ++-- appsrc/service/user_mgr_service.cpp | 16 ++--- 17 files changed, 178 insertions(+), 114 deletions(-) diff --git a/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp b/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp index f258da7..c9996ff 100644 --- a/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp +++ b/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp @@ -15,7 +15,36 @@ using namespace iflytop; // } 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 cxt) { string className = cxt->cmd["className"]; @@ -28,9 +57,13 @@ void FrontMsgProcesser::processMsg(shared_ptr cxt) { logger->info("call: {}->({})", fn, param); + if (fn == "FNScheduler.geFnList") { + cxt->content = geFnList(); + return; + } + if (m_msgProcesserMap.find(key) != m_msgProcesserMap.end()) { try { - cxt->_regfnhasret = m_msgProcesserMap[key]->retInfo != "void"; m_msgProcesserMap[key]->fn(cxt); if (cxt->ackcode != 0) { diff --git a/appsrc/baseservice/front_msg_processer/front_msg_processer.hpp b/appsrc/baseservice/front_msg_processer/front_msg_processer.hpp index 54b41bf..befb44b 100644 --- a/appsrc/baseservice/front_msg_processer/front_msg_processer.hpp +++ b/appsrc/baseservice/front_msg_processer/front_msg_processer.hpp @@ -40,8 +40,6 @@ class MsgProcessContext { int ackcode = 0; json content; string ackcodeExtMessage; - - bool _regfnhasret = false; }; typedef std::function cxt)> MsgProcesserFn_t; @@ -59,7 +57,7 @@ class MsgProcesser { MsgProcesserFn_t fn; vector paramsTypeInfo; vector params; - string retInfo; + string retTypeInfo; }; class FrontMsgProcesser { @@ -67,7 +65,8 @@ class FrontMsgProcesser { public: private: - map > m_msgProcesserMap; + map> m_msgProcesserMap; + list> m_msgProcesserList; map typeInfoMap; FrontMsgProcesser() {}; @@ -80,7 +79,7 @@ class FrontMsgProcesser { void initialize(); void processMsg(shared_ptr cxt); - json getCmdList(); + json geFnList(); public: template @@ -138,9 +137,10 @@ class FrontMsgProcesser { processer->fnName = fnName; processer->paramsTypeInfo = paramsTypeInfo; processer->params = params; - processer->retInfo = ret; + processer->retTypeInfo = ret; processer->fn = fn; 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__)); \ }); -#define REG_FN_VOID(fn, type) \ - FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, {}, [this](shared_ptr cxt) { \ - cxt->content = fn(); \ - }); +#define REG_FN_VOID(fn, type) FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, {}, [this](shared_ptr cxt) { cxt->content = fn(); }); #define REG_EXTFN(fn, type, ...) \ FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, {MARCO_LIST(REGFNV_EACH_EXPTR2, _1, _2, _3, _4, _5, __VA_ARGS__)}, [this](shared_ptr 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__)); \ }); #define REG_EXTFN_VOID(fn, type) FrontMsgProcesser::ins().regProcesser(thisClass.className, #fn, {}, [this](shared_ptr 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 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 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 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 cxt) { fn(cxt); }); \ + } +#endif \ No newline at end of file diff --git a/appsrc/service/app/add_liquid_service.cpp b/appsrc/service/app/add_liquid_service.cpp index 25d0a90..8959da3 100644 --- a/appsrc/service/app/add_liquid_service.cpp +++ b/appsrc/service/app/add_liquid_service.cpp @@ -9,10 +9,10 @@ using namespace iflytop; void AddLiquidService::initialize() { logger->info("AddLiquidService initialize"); - REG_EXTFN_VOID(start, function); - REG_EXTFN_VOID(stop, function); - REG_EXTFN_VOID(getState, function); - REG_EXTFN_VOID(getServiceConfig, function); + 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) { diff --git a/appsrc/service/app/air_leak_detect_test.cpp b/appsrc/service/app/air_leak_detect_test.cpp index 7955367..6084885 100644 --- a/appsrc/service/app/air_leak_detect_test.cpp +++ b/appsrc/service/app/air_leak_detect_test.cpp @@ -10,10 +10,10 @@ void AirLeakDetectTest::initialize() { GET_TO_SERVICE(m_gConfig) GET_TO_SERVICE(m_dics) - REG_EXTFN_VOID(start, function); - REG_EXTFN_VOID(stop, function); - REG_EXTFN_VOID(getState, function); - REG_EXTFN_VOID(getServiceConfig, function); + REG_EXTFN_VOID(start, void()); + REG_EXTFN_VOID(stop, void()); + REG_EXTFN_VOID(getState, void()); + REG_EXTFN_VOID(getServiceConfig, void()); } diff --git a/appsrc/service/app/disinfection_ctrl_service_ext.cpp b/appsrc/service/app/disinfection_ctrl_service_ext.cpp index 63b2185..409ed61 100644 --- a/appsrc/service/app/disinfection_ctrl_service_ext.cpp +++ b/appsrc/service/app/disinfection_ctrl_service_ext.cpp @@ -42,13 +42,13 @@ void DisinfectionCtrlServiceExt::initialize() { GET_TO_SERVICE(gConfig); GET_TO_SERVICE(dcs); - REG_EXTFN_VOID(start, function); - REG_EXTFN_VOID(startWithFormula, function); - REG_EXTFN_VOID(stop, function); - REG_EXTFN_VOID(getState, function); - REG_EXTFN_VOID(getRealtimeConfig, function); - REG_EXTFN_VOID(setRealtimeConfig, function); - REG_EXTFN_VOID(getServiceConfig, function); + 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 cxt) { diff --git a/appsrc/service/app/drain_liquid_service.cpp b/appsrc/service/app/drain_liquid_service.cpp index f8ddd67..1f7ec9d 100644 --- a/appsrc/service/app/drain_liquid_service.cpp +++ b/appsrc/service/app/drain_liquid_service.cpp @@ -4,10 +4,10 @@ using namespace iflytop; void DrainLiquidService::initialize() { logger->info("DrainLiquidService initialize"); - REG_EXTFN_VOID(start, function); - REG_EXTFN_VOID(stop, function); - REG_EXTFN_VOID(getState, function); - REG_EXTFN_VOID(getServiceConfig, function); + REG_EXTFN_VOID(start, void()); + REG_EXTFN_VOID(stop, void()); + REG_EXTFN_VOID(getState, void()); + REG_EXTFN_VOID(getServiceConfig, void()); } void DrainLiquidService::start() { diff --git a/appsrc/service/app/pipeline_pressure_control.cpp b/appsrc/service/app/pipeline_pressure_control.cpp index ffe0c95..577a8b6 100644 --- a/appsrc/service/app/pipeline_pressure_control.cpp +++ b/appsrc/service/app/pipeline_pressure_control.cpp @@ -19,10 +19,10 @@ void PipelinePressureControl::initialize() { GET_TO_SERVICE(m_dics); GET_TO_SERVICE(m_gConfig); - REG_EXTFN_VOID(setType, function); - REG_EXTFN_VOID(setIntensity, function); - REG_EXTFN_VOID(getState, function); - REG_EXTFN_VOID(getConfig, function); + REG_EXTFN_VOID(setType, void()); + REG_EXTFN_VOID(setIntensity, void()); + REG_EXTFN_VOID(getState, void()); + REG_EXTFN_VOID(getConfig, void()); diff --git a/appsrc/service/app_core.cpp b/appsrc/service/app_core.cpp index 050ad7f..e6e7540 100644 --- a/appsrc/service/app_core.cpp +++ b/appsrc/service/app_core.cpp @@ -131,13 +131,13 @@ void AppCore::initialize() { } }); - REG_EXTFN_VOID(getState, function); - REG_EXTFN(promptConfirm, function, promptId); - REG_EXTFN_VOID(promptGetAll, function); - REG_EXTFN_VOID(promptGetNext, function); - REG_EXTFN(setInTestMode, function, isInTestMode); - REG_EXTFN_VOID(startGenFakeH2O2Data, function); - REG_EXTFN_VOID(stopGenFakeH2O2Data, function); + 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; } diff --git a/appsrc/service/audit_mgr_service.cpp b/appsrc/service/audit_mgr_service.cpp index 10ee64e..f09d50b 100644 --- a/appsrc/service/audit_mgr_service.cpp +++ b/appsrc/service/audit_mgr_service.cpp @@ -23,9 +23,9 @@ void AuditMgrService::initialize() { GET_TO_SERVICE(m_db); GET_TO_SERVICE(m_udiskMgr); - REG_EXTFN_VOID(exportData, function); - REG_EXTFN_VOID(getRecords, function); - REG_EXTFN_VOID(pushTestData, function); + REG_EXTFN_VOID(exportData, void()); + REG_EXTFN_VOID(getRecords, void()); + REG_EXTFN_VOID(pushTestData, void()); } int AuditMgrService::callExportData() { string diskpath; diff --git a/appsrc/service/device_info_mgr_service.cpp b/appsrc/service/device_info_mgr_service.cpp index 432a3a2..ea30c22 100644 --- a/appsrc/service/device_info_mgr_service.cpp +++ b/appsrc/service/device_info_mgr_service.cpp @@ -10,7 +10,7 @@ void DeviceInfoMgrService::initialize() { GET_TO_SERVICE(m_ds); GET_TO_SERVICE(m_gConfig); - REG_EXTFN_VOID(getDeviceInfo, function); + REG_EXTFN_VOID(getDeviceInfo, void()); } void DeviceInfoMgrService::getDeviceInfo(shared_ptr cxt) { // diff --git a/appsrc/service/disinfection_logs_service.cpp b/appsrc/service/disinfection_logs_service.cpp index 4319591..cbf286a 100644 --- a/appsrc/service/disinfection_logs_service.cpp +++ b/appsrc/service/disinfection_logs_service.cpp @@ -156,12 +156,12 @@ void DisinfectionLogsService::initialize() { GET_TO_SERVICE(m_gConfig); GET_TO_SERVICE(m_udiskMgrService); - REG_EXTFN_VOID(getRecordList, function); - REG_EXTFN_VOID(getRecord, function); - REG_EXTFN_VOID(deleteReport, function); - REG_EXTFN_VOID(exportRecord, function); - REG_EXTFN_VOID(printRecord, function); - REG_EXTFN_VOID(selftest, function); + 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::state, "设备状态"); diff --git a/appsrc/service/front_end_realtime_display_content_mgr.cpp b/appsrc/service/front_end_realtime_display_content_mgr.cpp index cebf60b..e8d01b2 100644 --- a/appsrc/service/front_end_realtime_display_content_mgr.cpp +++ b/appsrc/service/front_end_realtime_display_content_mgr.cpp @@ -4,7 +4,7 @@ using namespace iflytop; void FrontEndRealtimeDisplayContentMgr::initialize() { // - REG_EXTFN_VOID(readH2O2SensorData, function); + REG_EXTFN_VOID(readH2O2SensorData, void()); } void FrontEndRealtimeDisplayContentMgr::readH2O2SensorData(shared_ptr cxt) { diff --git a/appsrc/service/hardware/device_io_ctrl_service.cpp b/appsrc/service/hardware/device_io_ctrl_service.cpp index 30debbd..886974f 100644 --- a/appsrc/service/hardware/device_io_ctrl_service.cpp +++ b/appsrc/service/hardware/device_io_ctrl_service.cpp @@ -73,42 +73,42 @@ void DeviceIoControlService::initialize() { DS->setAppExceptionFlag(e); } - REG_FN_VOID(AddLiquidPump_addLiquid, function); - REG_FN(AddLiquidPump_run, function, rpm); - REG_FN_VOID(AddLiquidPump_drainLiquid, function); - REG_FN_VOID(AddLiquidPump_stop, function); - REG_FN(SprayPump_start, function, gpm); - REG_FN(SprayPump_startInRPM, function, rpm); - REG_FN_VOID(SprayPump_stop, function); - REG_FN(Blower_ctrl, function, val); - REG_FN_VOID(Blower_close, function); - REG_FN_VOID(Blower_readEI, function); - REG_FN(AC_ctrl, function, val); - REG_FN_VOID(AC_close, function); - REG_FN_VOID(AC_readEI, function); - REG_FN(Heater_ctrl, function, val); - REG_FN_VOID(Heater_close, function); - REG_FN_VOID(Heater_readEI, function); - REG_FN_VOID(Heater_readTemperature, function); - REG_FN(WarningLight_setState, function, r, g, b, warning); - REG_FN(PosiPressureProp_setValve, function, val); - REG_FN_VOID(PosiPressureProp_readPos, function); - REG_FN_VOID(PosiPressureProp_isBusy, function); - REG_FN(NegaPressureProp_setValve, function, val); - REG_FN_VOID(NegaPressureProp_readPos, function); - REG_FN_VOID(NegaPressureProp_isBusy, function); - REG_FN(AirLeakDetectTestModeCtrl_setMode, function, val); - REG_FN_VOID(AirLeakDetectTestModeCtrl_getMode, function); - REG_FN(ExtChSelector_selectCh, function, val); - REG_FN(ExtChSelector_trySelectCh, function, val); - REG_FN_VOID(ExtChSelector_isOnline, function); - REG_FN_VOID(WaterSensor_readEvaporationBin, function); - REG_FN_VOID(WaterSensor_readDeviceBottom, function); - REG_FN_VOID(ACPostPS_readPa, function); - REG_FN_VOID(AirLeakDetectPS_readPa, function); - REG_FN_VOID(LiquidWeightPS_readPa, function); - REG_FN_VOID(SprayPumpPostPS_readPa, function); - REG_FN_VOID(AddLiquidPumpPostPS_readPa, function); + 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) \ diff --git a/appsrc/service/os_mgr_service.cpp b/appsrc/service/os_mgr_service.cpp index 544a242..7357daa 100644 --- a/appsrc/service/os_mgr_service.cpp +++ b/appsrc/service/os_mgr_service.cpp @@ -9,9 +9,9 @@ void OsMgrService::initialize() { GET_TO_SERVICE(m_ds); GET_TO_SERVICE(m_gConfig); - REG_EXTFN_VOID(shutdown, function); - REG_EXTFN_VOID(updateDate, function); - REG_EXTFN_VOID(updateTime, function); + REG_EXTFN_VOID(shutdown, void()); + REG_EXTFN_VOID(updateDate, void()); + REG_EXTFN_VOID(updateTime, void()); } diff --git a/appsrc/service/setting_mgr_service.cpp b/appsrc/service/setting_mgr_service.cpp index 55303a0..0ed890a 100644 --- a/appsrc/service/setting_mgr_service.cpp +++ b/appsrc/service/setting_mgr_service.cpp @@ -12,14 +12,14 @@ void SettingMgrService::initialize() { GET_TO_SERVICE(m_db); GET_TO_SERVICE(m_ds); - REG_EXTFN_VOID(getAllSetting, function); - REG_EXTFN_VOID(setSettingVal, function); - REG_EXTFN_VOID(getAllFormula, function); - REG_EXTFN_VOID(addNewFormula, function); - REG_EXTFN_VOID(delFormula, function); - REG_EXTFN_VOID(updateFormula, function); - REG_EXTFN_VOID(updateFormulaIterm, function); - REG_EXTFN_VOID(factoryResetSettings, function); + 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()); } diff --git a/appsrc/service/test_page_mgr_service.cpp b/appsrc/service/test_page_mgr_service.cpp index e200ccf..bf9627e 100644 --- a/appsrc/service/test_page_mgr_service.cpp +++ b/appsrc/service/test_page_mgr_service.cpp @@ -14,12 +14,12 @@ void TestPageMgrService::initialize() { GET_TO_SERVICE(dcs); - REG_EXTFN_VOID(getTestPageCfgInfo, function); - REG_EXTFN_VOID(onButton, function); - REG_EXTFN_VOID(readState, function); - REG_EXTFN_VOID(triggerOnePrompt, function); - REG_EXTFN_VOID(startReportState, function); - REG_EXTFN_VOID(stopReportState, function); + 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()); diff --git a/appsrc/service/user_mgr_service.cpp b/appsrc/service/user_mgr_service.cpp index 60c597c..0d11057 100644 --- a/appsrc/service/user_mgr_service.cpp +++ b/appsrc/service/user_mgr_service.cpp @@ -8,14 +8,14 @@ void UserMgrService::initialize() { GET_TO_SERVICE(m_db); GET_TO_SERVICE(m_deviceStateService); - REG_EXTFN_VOID(login, function); - REG_EXTFN_VOID(unlogin, function); - REG_EXTFN_VOID(chpasswd, function); - REG_EXTFN_VOID(addUser, function); - REG_EXTFN_VOID(delUser, function); - REG_EXTFN_VOID(updateUserUid, function); - REG_EXTFN_VOID(getAllUser, function); - REG_EXTFN_VOID(getLoginUser, function); + 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 cxt) {