From ac578c063abb35681e5de1508dfcd972fb72a1b7 Mon Sep 17 00:00:00 2001
From: Fancy code <258828110.@qq.com>
Date: Mon, 17 Jun 2024 19:06:59 +0800
Subject: [PATCH] Improve:MissionManager include cleaner.

---
 application/MissionManager/src/AppMonitor.cpp            | 3 +++
 application/MissionManager/src/DataProcessing.cpp        | 7 +++++++
 application/MissionManager/src/IMissionManager.cpp       | 2 ++
 application/MissionManager/src/IdleState.cpp             | 5 ++---
 application/MissionManager/src/LedsHandle.cpp            | 2 ++
 application/MissionManager/src/McuMonitor.cpp            | 1 +
 application/MissionManager/src/MediaHandleState.cpp      | 7 ++++++-
 application/MissionManager/src/MediaTask.cpp             | 3 +++
 application/MissionManager/src/MediaTaskHandle.cpp       | 6 ++++++
 application/MissionManager/src/MissionManager.cpp        | 1 +
 application/MissionManager/src/MissionManagerMakePtr.cpp | 5 +++++
 application/MissionManager/src/MissionState.cpp          | 6 +++++-
 application/MissionManager/src/MissionStateMachine.cpp   | 5 +++++
 application/MissionManager/src/OnMissionState.cpp        | 3 ++-
 .../MissionManager/src/PirTrggeredMissionState.cpp       | 5 +++--
 application/MissionManager/src/SdCardHandleState.cpp     | 8 ++++++++
 application/MissionManager/src/SetLedState.cpp           | 5 +++++
 application/MissionManager/src/StorageHandleState.cpp    | 7 ++++++-
 application/MissionManager/src/TestMissionState.cpp      | 7 +++++++
 application/MissionManager/src/TopState.cpp              | 9 +++++++++
 application/MissionManager/src/UpgradeState.cpp          | 4 +++-
 middleware/MediaManager/src/IMediaManager.cpp            | 4 ++++
 middleware/MediaManager/src/MediaHandle.cpp              | 9 +++++++++
 middleware/MediaManager/src/MediaManagerImpl.cpp         | 6 ++++++
 middleware/MediaManager/src/MediaManagerMakePtr.cpp      | 3 +++
 middleware/MediaManager/src/SaveStream.cpp               | 3 +++
 26 files changed, 116 insertions(+), 10 deletions(-)

diff --git a/application/MissionManager/src/AppMonitor.cpp b/application/MissionManager/src/AppMonitor.cpp
index 331a244..873a0d5 100644
--- a/application/MissionManager/src/AppMonitor.cpp
+++ b/application/MissionManager/src/AppMonitor.cpp
@@ -13,7 +13,10 @@
  * limitations under the License.
  */
 #include "AppMonitor.h"
+#include "IAppManager.h"
 #include "ILog.h"
+#include "IStorageManager.h"
+#include "StatusCode.h"
 #include <vector>
 AppMonitor::AppMonitor() : mMicStatus(SwitchStatus::END)
 {
diff --git a/application/MissionManager/src/DataProcessing.cpp b/application/MissionManager/src/DataProcessing.cpp
index 138d345..768e0c1 100644
--- a/application/MissionManager/src/DataProcessing.cpp
+++ b/application/MissionManager/src/DataProcessing.cpp
@@ -14,6 +14,13 @@
  */
 #include "DataProcessing.h"
 #include "ILog.h"
+#include "IMissionManager.h"
+#include "IStateMachine.h"
+#include "KeyControl.h"
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
 const bool NOT_EXECUTED = false;
 const bool EXECUTED = true;
 key_event_data::key_event_data(const std::string &keyName, const KeyEvent &keyEvent, const unsigned int &holdTime)
diff --git a/application/MissionManager/src/IMissionManager.cpp b/application/MissionManager/src/IMissionManager.cpp
index 51af08f..e2c5fb2 100644
--- a/application/MissionManager/src/IMissionManager.cpp
+++ b/application/MissionManager/src/IMissionManager.cpp
@@ -14,6 +14,8 @@
  */
 #include "IMissionManager.h"
 #include "ILog.h"
+#include "StatusCode.h"
+#include <memory>
 std::shared_ptr<IMissionManager> &IMissionManager::GetInstance(std::shared_ptr<IMissionManager> *impl)
 {
     static auto instance = std::make_shared<IMissionManager>();
diff --git a/application/MissionManager/src/IdleState.cpp b/application/MissionManager/src/IdleState.cpp
index f0a2d6e..e4269bb 100644
--- a/application/MissionManager/src/IdleState.cpp
+++ b/application/MissionManager/src/IdleState.cpp
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 #include "IdleState.h"
-#include "IFilesManager.h"
+#include "DataProcessing.h"
 #include "ILog.h"
-#include "IMediaManager.h"
-#include "MissionStateMachine.h"
+#include "IStateMachine.h"
 IdleState::IdleState() : State("IdleState")
 {
     // mEventHandle[InternalStateEvent::MEDIA_REPORT_EVENT] = std::bind(&IdleState::MediaReportHandle, this, _1);
diff --git a/application/MissionManager/src/LedsHandle.cpp b/application/MissionManager/src/LedsHandle.cpp
index 57fab91..3f9eb0f 100644
--- a/application/MissionManager/src/LedsHandle.cpp
+++ b/application/MissionManager/src/LedsHandle.cpp
@@ -14,6 +14,8 @@
  */
 #include "LedsHandle.h"
 #include "ILog.h"
+#include "LedControl.h"
+#include "SetLedState.h"
 void LedsHandle::ControlDeviceStatusLed(const DeviceStatus &status, const long int &keepAliveTime,
                                         const unsigned int &blinkPeriod)
 {
diff --git a/application/MissionManager/src/McuMonitor.cpp b/application/MissionManager/src/McuMonitor.cpp
index 49d7ec1..bb8df32 100644
--- a/application/MissionManager/src/McuMonitor.cpp
+++ b/application/MissionManager/src/McuMonitor.cpp
@@ -15,6 +15,7 @@
 #include "McuMonitor.h"
 #include "ILog.h"
 #include "IMcuManager.h"
+#include <memory>
 void McuMonitor::Init(std::shared_ptr<VMcuMonitor> &monitor)
 {
     IMcuManager::GetInstance()->SetMcuMonitor(monitor);
diff --git a/application/MissionManager/src/MediaHandleState.cpp b/application/MissionManager/src/MediaHandleState.cpp
index f6b29f6..307bb34 100644
--- a/application/MissionManager/src/MediaHandleState.cpp
+++ b/application/MissionManager/src/MediaHandleState.cpp
@@ -13,10 +13,15 @@
  * limitations under the License.
  */
 #include "MediaHandleState.h"
-#include "IFilesManager.h"
+#include "DataProcessing.h"
 #include "ILog.h"
 #include "IMediaManager.h"
+#include "IStateMachine.h"
+#include "MediaTaskHandle.h"
 #include "MissionStateMachine.h"
+#include <functional>
+#include <memory>
+#include <vector>
 MediaHandleState::MediaHandleState() : State("MediaHandleState")
 {
     mEventHandle[InternalStateEvent::RESET_KEY_MEDIA_TASK] =
diff --git a/application/MissionManager/src/MediaTask.cpp b/application/MissionManager/src/MediaTask.cpp
index 20d0c6c..24071fa 100644
--- a/application/MissionManager/src/MediaTask.cpp
+++ b/application/MissionManager/src/MediaTask.cpp
@@ -13,6 +13,9 @@
  * limitations under the License.
  */
 #include "MediaTask.h"
+#include "DataProcessing.h"
+#include "IMediaManager.h"
+#include <memory>
 MediaTask::MediaTask(const MediaTaskType &type, const InternalStateEvent &bindEvent,
                      const std::weak_ptr<VMediaTaskIniator> &iniator)
     : mType(type), mBindEvent(bindEvent), mIniator(iniator)
diff --git a/application/MissionManager/src/MediaTaskHandle.cpp b/application/MissionManager/src/MediaTaskHandle.cpp
index 3766100..1658490 100644
--- a/application/MissionManager/src/MediaTaskHandle.cpp
+++ b/application/MissionManager/src/MediaTaskHandle.cpp
@@ -13,8 +13,14 @@
  * limitations under the License.
  */
 #include "MediaTaskHandle.h"
+#include "DataProcessing.h"
 #include "ILog.h"
+#include "IMediaManager.h"
+#include "IMissionManager.h"
+#include "MediaTask.h"
 #include "MissionStateMachine.h"
+#include "StatusCode.h"
+#include <memory>
 MediaTaskHandle::MediaTaskHandle()
 {
     mMediaHandle.reset();
diff --git a/application/MissionManager/src/MissionManager.cpp b/application/MissionManager/src/MissionManager.cpp
index f4a786a..67b8178 100644
--- a/application/MissionManager/src/MissionManager.cpp
+++ b/application/MissionManager/src/MissionManager.cpp
@@ -15,6 +15,7 @@
 #include "MissionManager.h"
 #include "IAppManager.h"
 #include "MissionStateMachine.h"
+#include "StatusCode.h"
 const StatusCode MissionManager::Init(void)
 {
     MissionStateMachine::GetInstance()->Init();
diff --git a/application/MissionManager/src/MissionManagerMakePtr.cpp b/application/MissionManager/src/MissionManagerMakePtr.cpp
index f478ecd..13a53e0 100644
--- a/application/MissionManager/src/MissionManagerMakePtr.cpp
+++ b/application/MissionManager/src/MissionManagerMakePtr.cpp
@@ -14,16 +14,21 @@
  */
 #include "MissionManagerMakePtr.h"
 #include "ILog.h"
+#include "IMcuManager.h"
+#include "IMissionManager.h"
+#include "IStateMachine.h"
 #include "IdleState.h"
 #include "MediaHandleState.h"
 #include "MissionManager.h"
 #include "OnMissionState.h"
 #include "PirTriggeredMissionState.h"
 #include "SdCardHandleState.h"
+#include "StatusCode.h"
 #include "StorageHandleState.h"
 #include "TestMissionState.h"
 #include "TopState.h"
 #include "UpgradeState.h"
+#include <memory>
 bool CreateMissionManagerModule(void)
 {
     auto instance = std::make_shared<IMissionManager>();
diff --git a/application/MissionManager/src/MissionState.cpp b/application/MissionManager/src/MissionState.cpp
index 04b3608..cfe1e23 100644
--- a/application/MissionManager/src/MissionState.cpp
+++ b/application/MissionManager/src/MissionState.cpp
@@ -13,9 +13,13 @@
  * limitations under the License.
  */
 #include "MissionState.h"
-#include "IAppManager.h"
+#include "DataProcessing.h"
 #include "ILog.h"
+#include "IStateMachine.h"
+#include "LedsHandle.h"
 #include "MissionStateMachine.h"
+#include <functional>
+#include <string>
 MissionState::MissionState(const std::string &name) : State(name)
 {
     mEventHandle[InternalStateEvent::MEDIA_REPORT_EVENT] = std::bind(&MissionState::MediaReportHandle, this, _1);
diff --git a/application/MissionManager/src/MissionStateMachine.cpp b/application/MissionManager/src/MissionStateMachine.cpp
index d62fc28..cc3aa68 100644
--- a/application/MissionManager/src/MissionStateMachine.cpp
+++ b/application/MissionManager/src/MissionStateMachine.cpp
@@ -15,8 +15,13 @@
 #include "MissionStateMachine.h"
 #include "DataProcessing.h"
 #include "ILog.h"
+#include "IMcuManager.h"
+#include "IMissionManager.h"
+#include "IStateMachine.h"
 #include "McuAskBase.h"
 #include "MissionManagerMakePtr.h"
+#include "StatusCode.h"
+#include <memory>
 // #include "TopState.h"
 std::shared_ptr<MissionStateMachine> &MissionStateMachine::GetInstance(std::shared_ptr<MissionStateMachine> *impl)
 {
diff --git a/application/MissionManager/src/OnMissionState.cpp b/application/MissionManager/src/OnMissionState.cpp
index f84c44e..7e497b9 100644
--- a/application/MissionManager/src/OnMissionState.cpp
+++ b/application/MissionManager/src/OnMissionState.cpp
@@ -14,7 +14,8 @@
  */
 #include "OnMissionState.h"
 #include "ILog.h"
-#include "IStorageManager.h"
+#include "IStateMachine.h"
+#include "MissionState.h"
 #include "MissionStateMachine.h"
 OnMissionState::OnMissionState() : MissionState("OnMissionState")
 {
diff --git a/application/MissionManager/src/PirTrggeredMissionState.cpp b/application/MissionManager/src/PirTrggeredMissionState.cpp
index 7f2c287..7ab21f9 100644
--- a/application/MissionManager/src/PirTrggeredMissionState.cpp
+++ b/application/MissionManager/src/PirTrggeredMissionState.cpp
@@ -12,10 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "PirTriggeredMissionState.h"
 #include "ILog.h"
-#include "IStorageManager.h"
+#include "IStateMachine.h"
+#include "MissionState.h"
 #include "MissionStateMachine.h"
+#include "PirTriggeredMissionState.h"
 PirTriggeredMissionState::PirTriggeredMissionState() : MissionState("PirTriggeredMissionState")
 {
     // mEventHandle[InternalStateEvent::ANY_STATE_SD_STATUS_PERORIED] =
diff --git a/application/MissionManager/src/SdCardHandleState.cpp b/application/MissionManager/src/SdCardHandleState.cpp
index fef26ff..a86a24e 100644
--- a/application/MissionManager/src/SdCardHandleState.cpp
+++ b/application/MissionManager/src/SdCardHandleState.cpp
@@ -13,10 +13,18 @@
  * limitations under the License.
  */
 #include "SdCardHandleState.h"
+#include "DataProcessing.h"
 #include "IFilesManager.h"
 #include "ILog.h"
 #include "IMediaManager.h"
+#include "IMissionManager.h"
+#include "IStateMachine.h"
+#include "IStorageManager.h"
 #include "MissionStateMachine.h"
+#include "StatusCode.h"
+#include <functional>
+#include <memory>
+using std::placeholders::_1;
 SdCardHandleState::SdCardHandleState() : State("SdCardHandleState"), mSdCardStatus(StorageEvent::END)
 {
     mEventHandle[InternalStateEvent::MEDIA_REPORT_EVENT] = std::bind(&SdCardHandleState::MediaReportHandle, this, _1);
diff --git a/application/MissionManager/src/SetLedState.cpp b/application/MissionManager/src/SetLedState.cpp
index d0f9b81..365896e 100644
--- a/application/MissionManager/src/SetLedState.cpp
+++ b/application/MissionManager/src/SetLedState.cpp
@@ -13,6 +13,11 @@
  * limitations under the License.
  */
 #include "SetLedState.h"
+#include "IDeviceManager.h"
+#include "LedControl.h"
+#include "StatusCode.h"
+#include <memory>
+#include <string>
 SetLedState::SetLedState(const LedState &state, const unsigned int &keepAliveTime, const unsigned int &blinkPeriod)
     : mState(state), mKeepAliveTime(keepAliveTime), mBlinkPeriod(blinkPeriod)
 {
diff --git a/application/MissionManager/src/StorageHandleState.cpp b/application/MissionManager/src/StorageHandleState.cpp
index 86b80a9..ba67bd0 100644
--- a/application/MissionManager/src/StorageHandleState.cpp
+++ b/application/MissionManager/src/StorageHandleState.cpp
@@ -13,9 +13,14 @@
  * limitations under the License.
  */
 #include "StorageHandleState.h"
+#include "DataProcessing.h"
 #include "ILog.h"
-#include "IMediaManager.h"
+#include "IMissionManager.h"
+#include "IStateMachine.h"
+#include "IStorageManager.h"
 #include "MissionStateMachine.h"
+#include <functional>
+#include <memory>
 StorageHandleState::StorageHandleState() : State("StorageHandleState")
 {
     mEventHandle[InternalStateEvent::STORAGE_HANDLE_STATE_INIT] =
diff --git a/application/MissionManager/src/TestMissionState.cpp b/application/MissionManager/src/TestMissionState.cpp
index 7af850d..ec17f71 100644
--- a/application/MissionManager/src/TestMissionState.cpp
+++ b/application/MissionManager/src/TestMissionState.cpp
@@ -13,10 +13,17 @@
  * limitations under the License.
  */
 #include "TestMissionState.h"
+#include "DataProcessing.h"
 #include "IAppManager.h"
 #include "ILog.h"
+#include "IMissionManager.h"
+#include "IStateMachine.h"
 #include "IStorageManager.h"
+#include "LedsHandle.h"
+#include "MissionState.h"
 #include "MissionStateMachine.h"
+#include <functional>
+#include <memory>
 TestMissionState::TestMissionState() : MissionState("TestMissionState")
 {
     mEventHandle[InternalStateEvent::ANY_STATE_SD_STATUS_PERORIED] =
diff --git a/application/MissionManager/src/TopState.cpp b/application/MissionManager/src/TopState.cpp
index 83a6fa5..f88dbec 100644
--- a/application/MissionManager/src/TopState.cpp
+++ b/application/MissionManager/src/TopState.cpp
@@ -13,10 +13,19 @@
  * limitations under the License.
  */
 #include "TopState.h"
+#include "DataProcessing.h"
+#include "IDeviceManager.h"
 #include "ILog.h"
+#include "IMcuManager.h"
 #include "IMediaManager.h"
+#include "IMissionManager.h"
+#include "IStateMachine.h"
 #include "KeyControl.h"
+#include "McuMonitor.h"
 #include "MissionStateMachine.h"
+#include "StatusCode.h"
+#include <functional>
+#include <memory>
 TopState::TopState() : State("TopState")
 {
     mEventHandle[InternalStateEvent::STORAGE_HANDLE_STATE_INIT] =
diff --git a/application/MissionManager/src/UpgradeState.cpp b/application/MissionManager/src/UpgradeState.cpp
index e9c7004..5644a18 100644
--- a/application/MissionManager/src/UpgradeState.cpp
+++ b/application/MissionManager/src/UpgradeState.cpp
@@ -13,10 +13,12 @@
  * limitations under the License.
  */
 #include "UpgradeState.h"
+#include "DataProcessing.h"
 #include "IHuntingUpgrade.h"
 #include "ILog.h"
-#include "IMediaManager.h"
+#include "IStateMachine.h"
 #include "MissionStateMachine.h"
+#include <functional>
 UpgradeState::UpgradeState() : State("UpgradeState")
 {
     mEventHandle[InternalStateEvent::CHECK_UPGRADE_FILE] = std::bind(&UpgradeState::CheckUpgradeFileHandle, this, _1);
diff --git a/middleware/MediaManager/src/IMediaManager.cpp b/middleware/MediaManager/src/IMediaManager.cpp
index 9ee046e..68ee030 100644
--- a/middleware/MediaManager/src/IMediaManager.cpp
+++ b/middleware/MediaManager/src/IMediaManager.cpp
@@ -14,6 +14,10 @@
  */
 #include "IMediaManager.h"
 #include "ILog.h"
+#include "StatusCode.h"
+#include <memory>
+#include <string>
+#include <vector>
 media_report_event::media_report_event(const std::string &fileName, const MediaChannel &mediaChannedl)
     : mFileName(fileName), mMediaChannedl(mediaChannedl)
 {
diff --git a/middleware/MediaManager/src/MediaHandle.cpp b/middleware/MediaManager/src/MediaHandle.cpp
index 21d3508..3435f19 100644
--- a/middleware/MediaManager/src/MediaHandle.cpp
+++ b/middleware/MediaManager/src/MediaHandle.cpp
@@ -13,8 +13,17 @@
  * limitations under the License.
  */
 #include "MediaHandle.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "IMediaManager.h"
 #include "SaveStream.h"
+#include "StatusCode.h"
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <vector>
 MediaHandle::MediaHandle(const MediaChannel &mediaChannel, const std::shared_ptr<VCameraHal> &cameraHal)
     : mMediaChannel(mediaChannel), mCameraHal(cameraHal), mTaskRuning(false)
 {
diff --git a/middleware/MediaManager/src/MediaManagerImpl.cpp b/middleware/MediaManager/src/MediaManagerImpl.cpp
index ce03be8..d58751a 100644
--- a/middleware/MediaManager/src/MediaManagerImpl.cpp
+++ b/middleware/MediaManager/src/MediaManagerImpl.cpp
@@ -13,8 +13,14 @@
  * limitations under the License.
  */
 #include "MediaManagerImpl.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "IMediaManager.h"
 #include "MediaHandle.h"
+#include "StatusCode.h"
+#include <map>
+#include <memory>
+#include <string>
 StatusCode MediaManagerImpl::Init(void)
 {
     IHalCpp::GetInstance()->GetCameraHal(mAllCameras);
diff --git a/middleware/MediaManager/src/MediaManagerMakePtr.cpp b/middleware/MediaManager/src/MediaManagerMakePtr.cpp
index aa1d19b..30df0cb 100644
--- a/middleware/MediaManager/src/MediaManagerMakePtr.cpp
+++ b/middleware/MediaManager/src/MediaManagerMakePtr.cpp
@@ -14,7 +14,10 @@
  */
 #include "MediaManagerMakePtr.h"
 #include "ILog.h"
+#include "IMediaManager.h"
 #include "MediaManagerImpl.h"
+#include "StatusCode.h"
+#include <memory>
 bool CreateMediaManagerModule(void)
 {
     auto instance = std::make_shared<IMediaManager>();
diff --git a/middleware/MediaManager/src/SaveStream.cpp b/middleware/MediaManager/src/SaveStream.cpp
index 987cf2e..81b07f7 100644
--- a/middleware/MediaManager/src/SaveStream.cpp
+++ b/middleware/MediaManager/src/SaveStream.cpp
@@ -14,6 +14,9 @@
  */
 #include "SaveStream.h"
 #include "ILog.h"
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 SaveStream::SaveStream() : mFileAudio(nullptr), mFileVideo(nullptr)
 {
 }