From 7659ad8cd27173d951489e7bc5163d93a307a1f1 Mon Sep 17 00:00:00 2001
From: Fancy code <258828110.@qq.com>
Date: Mon, 17 Jun 2024 19:35:40 +0800
Subject: [PATCH] Improve:Hal include cleaner.

---
 hal/abstract/IHalCpp.cpp |  3 +++
 hal/src/CameraHal.cpp    |  3 ++-
 hal/src/Hal.c            |  2 ++
 hal/src/HalCpp.cpp       |  6 ++++++
 hal/src/HalMakePtr.cpp   | 11 +++++++++--
 hal/src/SdCardHal.cpp    | 10 ++++++----
 hal/src/WifiHal.cpp      |  6 +++---
 7 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/hal/abstract/IHalCpp.cpp b/hal/abstract/IHalCpp.cpp
index 8d4bbd36..7395da0a 100644
--- a/hal/abstract/IHalCpp.cpp
+++ b/hal/abstract/IHalCpp.cpp
@@ -14,7 +14,10 @@
  */
 #include "IHalCpp.h"
 #include "ILog.h"
+#include "StatusCode.h"
+#include <map>
 #include <memory>
+#include <string>
 camera_report_event::camera_report_event(const std::string &fileName, const CameraType &cameraType)
     : mFileName(fileName), mCameraType(cameraType)
 {
diff --git a/hal/src/CameraHal.cpp b/hal/src/CameraHal.cpp
index eba4e05e..5a5bc0f4 100644
--- a/hal/src/CameraHal.cpp
+++ b/hal/src/CameraHal.cpp
@@ -13,7 +13,8 @@
  * limitations under the License.
  */
 #include "CameraHal.h"
-#include "ILog.h"
+#include "IHalCpp.h"
+#include "StatusCode.h"
 CameraHal::CameraHal() : mTaskRuning(false), mAudioStreamCallback(nullptr), mVideoStreamCallback(nullptr)
 {
 }
diff --git a/hal/src/Hal.c b/hal/src/Hal.c
index 465db48e..36ed540a 100644
--- a/hal/src/Hal.c
+++ b/hal/src/Hal.c
@@ -13,7 +13,9 @@
  * limitations under the License.
  */
 #include "Hal.h"
+#include "IHal.h"
 #include "ILog.h"
+#include "StatusCode.h"
 #include <stddef.h>
 #include <stdlib.h>
 StatusCode HalInit(IHal *hal)
diff --git a/hal/src/HalCpp.cpp b/hal/src/HalCpp.cpp
index 7bf15348..bf7a7128 100644
--- a/hal/src/HalCpp.cpp
+++ b/hal/src/HalCpp.cpp
@@ -14,9 +14,15 @@
  */
 #include "HalCpp.h"
 #include "HalMakePtr.h"
+#include "IHalCpp.h"
 #include "ILog.h"
 #include "SdCardHal.h"
+#include "StatusCode.h"
 #include "WifiHal.h"
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
 StatusCode HalCpp::Init(void)
 {
     LogInfo("HalCpp::Init\n");
diff --git a/hal/src/HalMakePtr.cpp b/hal/src/HalMakePtr.cpp
index a46c3e3e..39636e9b 100644
--- a/hal/src/HalMakePtr.cpp
+++ b/hal/src/HalMakePtr.cpp
@@ -15,14 +15,21 @@
 #include "HalMakePtr.h"
 #include "Hal.h"
 #include "HalCpp.h"
+#include "IHal.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "KeyControl.h"
+#include "LedControl.h"
 #include "SdCardHal.h"
+#include "StatusCode.h"
 #include "WifiHal.h"
+#include <memory>
+#include <vector>
 StatusCode CreateHalModule(void)
 {
-    IHal *hal = NULL;
+    IHal *hal = nullptr;
     StatusCode code = HalMakePtr::GetInstance()->CreateHalPtr(&hal);
-    if (IsCodeOK(code) && NULL != hal) {
+    if (IsCodeOK(code) && nullptr != hal) {
         LogInfo("Create Hal instance ok.\n");
         ResetHalImpl((IHal *)hal);
     }
diff --git a/hal/src/SdCardHal.cpp b/hal/src/SdCardHal.cpp
index 9582de1a..5b1237f3 100644
--- a/hal/src/SdCardHal.cpp
+++ b/hal/src/SdCardHal.cpp
@@ -13,17 +13,19 @@
  * limitations under the License.
  */
 #include "SdCardHal.h"
+#include "IHalCpp.h"
 #include "ILog.h"
 #include "LinuxApi.h"
-#include <errno.h>
+#include "StatusCode.h"
+#include <chrono>
 #include <fcntl.h>
+#include <memory>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <sys/types.h>
+#include <sys/statfs.h>
 #include <sys/vfs.h>
+#include <thread>
 #include <unistd.h>
 const char *SD_CARD_DEVICE = SD_CARD_DEV;
 const char *SD_MOUNT_PATH = SD_CARD_MOUNT_PATH;
diff --git a/hal/src/WifiHal.cpp b/hal/src/WifiHal.cpp
index 9035dda7..e7e7cd04 100644
--- a/hal/src/WifiHal.cpp
+++ b/hal/src/WifiHal.cpp
@@ -15,6 +15,8 @@
 #include "WifiHal.h"
 #include "ILog.h"
 #include "LinuxApi.h"
+#include "StatusCode.h"
+#include <chrono>
 #include <dirent.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -94,7 +96,5 @@ bool WifiHal::CheckWlan0IfExist(void)
     if (wlan0_found) {
         return true;
     }
-    else {
-        return false;
-    }
+    return false;
 }
\ No newline at end of file