From 93cb0f857347db55eddab2633cfab5698fd7bc13 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Tue, 16 Jul 2024 18:53:46 +0800 Subject: [PATCH] Fixed:formatting bug and cross compile. --- application/MissionManager/src/FormattingState.cpp | 2 +- hal/src/SdCardHal.cpp | 6 ++++-- utils/MediaBase/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/MissionManager/src/FormattingState.cpp b/application/MissionManager/src/FormattingState.cpp index 7d0dc74..ef8eaa5 100644 --- a/application/MissionManager/src/FormattingState.cpp +++ b/application/MissionManager/src/FormattingState.cpp @@ -65,6 +65,6 @@ void FormattingState::FormattingThread(void) IFilesManager::GetInstance()->UnInit(); IStorageManager::GetInstance()->FormatSDCardNow(); // IFilesManager::GetInstance()->Init(); - MissionStateMachine::GetInstance()->SwitchState(SystemState::STORAGE_HANDLE_STATE); + MissionStateMachine::GetInstance()->SwitchState(SystemState::IDLE_STATE); LogInfo("Formatting SD card done.\n"); } \ No newline at end of file diff --git a/hal/src/SdCardHal.cpp b/hal/src/SdCardHal.cpp index 0ee6b58..f6050a3 100644 --- a/hal/src/SdCardHal.cpp +++ b/hal/src/SdCardHal.cpp @@ -147,8 +147,8 @@ void SdCardHal::DevDetectingThread(void) } else { // LogInfo("sdCardHal: %s is inserted.\n", SD_CARD_DEVICE); - if (SdCardHalStatus::INSERTED != mStatus && SdCardHalStatus::MOUNTED != mStatus && - SdCardHalStatus::UNMOUNTED != mStatus) { + if (SdCardHalStatus::INSERTED != mStatus && SdCardHalStatus::MOUNTED != mStatus /* && + SdCardHalStatus::UNMOUNTED != mStatus*/) { mStatus = SdCardHalStatus::INSERTED; ReportDetecedChangedResult(mStatus); } @@ -220,6 +220,8 @@ void SdCardHal::UnmountSdCard(void) LogError("Format sd card failed [%s].\n", SD_CARD_DEVICE); return; } + mStatus = SdCardHalStatus::UNMOUNTED; + ReportDetecedChangedResult(mStatus); } void SdCardHal::MountSdCard(void) { diff --git a/utils/MediaBase/CMakeLists.txt b/utils/MediaBase/CMakeLists.txt index 39e4d35..0a8bde7 100644 --- a/utils/MediaBase/CMakeLists.txt +++ b/utils/MediaBase/CMakeLists.txt @@ -20,7 +20,7 @@ aux_source_directory(./src SRC_FILES) set(TARGET_NAME MediaBase) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) -target_link_libraries(${TARGET_NAME} avformat avcodec avutil swresample avdevice avfilter swscale postproc fdk-aac StatusCode Log) +target_link_libraries(${TARGET_NAME} LinuxApi avformat avcodec avutil swresample avdevice avfilter swscale postproc fdk-aac StatusCode Log) if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) target_link_libraries(${TARGET_NAME} z) endif()