diff --git a/application/main/src/MainThread.cpp b/application/main/src/MainThread.cpp index b567ea0..659b752 100644 --- a/application/main/src/MainThread.cpp +++ b/application/main/src/MainThread.cpp @@ -33,6 +33,9 @@ std::shared_ptr &MainThread::GetInstance(std::shared_ptr } StatusCode MainThread::Init(void) { + CreateLogModule(); + ILogInit(LOG_EASYLOGGING); + CustomizationInit(); mMainThreadRuning = true; CreateAllModules(); IHalInit(); @@ -41,11 +44,12 @@ StatusCode MainThread::Init(void) StatusCode MainThread::UnInit(void) { DestoryAllModules(); + ILogUnInit(); return CreateStatusCode(STATUS_CODE_OK); } StatusCode MainThread::CreateAllModules(void) { - CreateLogModule(); + // CreateLogModule(); CreateHalModule(); return CreateStatusCode(STATUS_CODE_OK); } diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index a1c9ef0..0b0e626 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -52,7 +52,6 @@ add_custom_target( ) add_custom_command( TARGET ${IMPL_TARGET} - TARGET ${ABSTRACT_TARGET} PRE_BUILD COMMAND make Hal_code_check COMMAND make Hal_code_format diff --git a/hal/src/HalMakePtr.cpp b/hal/src/HalMakePtr.cpp index 71ac6dc..54a5c59 100644 --- a/hal/src/HalMakePtr.cpp +++ b/hal/src/HalMakePtr.cpp @@ -20,11 +20,12 @@ StatusCode CreateHalModule(void) { IHal *hal = NULL; StatusCode code = HalMakePtr::GetInstance()->CreateHalPtr(&hal); - if (IsCodeOK(code)) { + if (IsCodeOK(code) && NULL != hal) { LogInfo("Create Hal instance ok.\n"); ResetHalImpl((IHal *)hal); } else { + LogError("Create Hal failed.\n"); return CreateStatusCode(STATUS_CODE_NOT_OK); } auto instance = std::make_shared(); @@ -48,10 +49,14 @@ std::shared_ptr &HalMakePtr::GetInstance(std::shared_ptr } return instance; } -StatusCode HalMakePtr::CreateHalPtr(IHal **hal) { return NewHal((Hal **)hal); } +StatusCode HalMakePtr::CreateHalPtr(IHal **hal) +{ + LogWarning("Hal is default hal.\n"); + return NewHal((Hal **)hal); +} StatusCode HalMakePtr::CreateHalSharePtr(std::shared_ptr &impl) { - LogInfo("HalMakePtr make ptr.\n"); + LogWarning("IHalCpp is default.\n"); impl = std::make_shared(); return CreateStatusCode(STATUS_CODE_OK); } \ No newline at end of file