From f5043e8efee10eb489c1b6c75071ff0d476c0c72 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Mon, 29 Apr 2024 16:04:22 +0800 Subject: [PATCH] Backup. --- application/MissionManager/src/TopState.cpp | 2 +- .../HunttingCamera/src_mock/MediaManager_Mock_Test.cpp | 2 +- test/hal/tool/src/CameraHalMock.cpp | 6 +++++- test/hal/tool/src/CameraHalMock.h | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/application/MissionManager/src/TopState.cpp b/application/MissionManager/src/TopState.cpp index 7154576..bccf6ed 100644 --- a/application/MissionManager/src/TopState.cpp +++ b/application/MissionManager/src/TopState.cpp @@ -37,7 +37,7 @@ bool TopState::ExecuteStateMsg(VStateMachineData *msg) } StatusCode TopState::ReportEvent(const MediaReportEvent &event) { - LogInfo("==================================================================ReportEvent:\n"); + LogInfo(" ReportEvent:\n"); std::shared_ptr message = std::make_shared>( static_cast(InternalStateEvent::MEDIA_REPORT_EVENT), event); MissionStateMachine::GetInstance()->SendStateMessage(message); diff --git a/test/application/HunttingCamera/src_mock/MediaManager_Mock_Test.cpp b/test/application/HunttingCamera/src_mock/MediaManager_Mock_Test.cpp index 19cc15f..36be2b3 100644 --- a/test/application/HunttingCamera/src_mock/MediaManager_Mock_Test.cpp +++ b/test/application/HunttingCamera/src_mock/MediaManager_Mock_Test.cpp @@ -29,12 +29,12 @@ namespace MediaManager_Mock_Test TEST_F(HunttingCameraTest, INTEGRATION_HunttingCamera_EXAMPLE_MediaReprot) { SetAllCamerasResult(mAllCamerasMock); + MockReportCameraEvent("/tmp/test.MP4", CameraType::MAIN_CAMERA); std::this_thread::sleep_for(std::chrono::milliseconds(100)); // McuManagerTestTool::MockMcuDeviceOpenFailed(mLinuxTest); MainThread::GetInstance()->Init(); TestManager::ResetTimeOut(1000 * 3); std::this_thread::sleep_for(std::chrono::milliseconds(100)); - MockReportCameraEvent("/tmp/test.MP4", "test path", CameraEvent::PICTIRUE, CameraType::MAIN_CAMERA); // MockAppPlayback(); MainThread::GetInstance()->Runing(); } diff --git a/test/hal/tool/src/CameraHalMock.cpp b/test/hal/tool/src/CameraHalMock.cpp index 5d495b9..7cdf2b2 100644 --- a/test/hal/tool/src/CameraHalMock.cpp +++ b/test/hal/tool/src/CameraHalMock.cpp @@ -23,6 +23,9 @@ void CameraHalTest::SetCameraMonitor(std::shared_ptr &monitor LogInfo("CameraHalTest::SetCameraMonitor.\n"); mMonitor = monitor; SetCameraMonitorTrace(monitor); + if (nullptr != mFastBootEvent) { + monitor->ReportEvent(*(mFastBootEvent.get())); + } } void CameraHalTest::SetCameraMonitorTrace(std::shared_ptr &monitor) { @@ -35,7 +38,8 @@ void CameraHalMock::MockReportCameraEvent(const CameraReportEvent &event) { auto monitor = mMonitor.lock(); if (mMonitor.expired()) { - LogError("monitor is nullptr.\n"); + LogWarning("monitor is nullptr.\n"); + mFastBootEvent = std::make_shared(event.mFileName, event.mCameraType); return; } monitor->ReportEvent(event); diff --git a/test/hal/tool/src/CameraHalMock.h b/test/hal/tool/src/CameraHalMock.h index f2807c3..10b0de6 100644 --- a/test/hal/tool/src/CameraHalMock.h +++ b/test/hal/tool/src/CameraHalMock.h @@ -29,6 +29,7 @@ private: protected: const CameraType mCameraType; std::weak_ptr mMonitor; + std::shared_ptr mFastBootEvent; }; class CameraHalMock : public CameraHalTest {