From 724d946bd74d26aaeed41957c37beff984e48c91 Mon Sep 17 00:00:00 2001
From: meng-xinhai <mengxinhai2@h-partners.com>
Date: Thu, 13 Mar 2025 18:31:55 +0800
Subject: [PATCH] =?UTF-8?q?map=E5=AE=B9=E5=99=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: meng-xinhai <mengxinhai2@h-partners.com>
Change-Id: Ifa81462f9fd9746b5ecd4cb6858815013a4c27c9
---
 services/include/sensor_data_processer.h | 4 +---
 services/include/sensor_manager.h        | 1 +
 services/include/sensor_service.h        | 1 +
 services/src/sensor_service.cpp          | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/include/sensor_data_processer.h b/services/include/sensor_data_processer.h
index a4428b5a..25731815 100755
--- a/services/include/sensor_data_processer.h
+++ b/services/include/sensor_data_processer.h
@@ -22,9 +22,6 @@
 
 namespace OHOS {
 namespace Sensors {
-namespace {
-    std::unordered_map<int32_t, Sensor> sensorMap_;
-}
 class SensorDataProcesser : public RefBase {
 public:
     explicit SensorDataProcesser(const std::unordered_map<int32_t, Sensor> &sensorMap);
@@ -52,6 +49,7 @@ private:
     std::mutex dataCountMutex_;
     std::unordered_map<int32_t, std::vector<sptr<FifoCacheData>>> dataCountMap_;
     std::mutex sensorMutex_;
+    std::unordered_map<int32_t, Sensor> sensorMap_;
 };
 } // namespace Sensors
 } // namespace OHOS
diff --git a/services/include/sensor_manager.h b/services/include/sensor_manager.h
index dfe51ac9..ab8370e9 100644
--- a/services/include/sensor_manager.h
+++ b/services/include/sensor_manager.h
@@ -53,6 +53,7 @@ private:
     sptr<ReportDataCallback> reportDataCallback_ = nullptr;
 #endif // HDF_DRIVERS_INTERFACE_SENSOR
     ClientInfo &clientInfo_ = ClientInfo::GetInstance();
+    std::unordered_map<int32_t, Sensor> sensorMap_;
     std::mutex sensorMapMutex_;
 };
 } // namespace Sensors
diff --git a/services/include/sensor_service.h b/services/include/sensor_service.h
index 5eb17728..22b8cede 100644
--- a/services/include/sensor_service.h
+++ b/services/include/sensor_service.h
@@ -93,6 +93,7 @@ private:
     std::mutex sensorsMutex_;
     std::mutex sensorMapMutex_;
     std::vector<Sensor> sensors_;
+    std::unordered_map<int32_t, Sensor> sensorMap_;
 #ifdef HDF_DRIVERS_INTERFACE_SENSOR
     bool InitInterface();
     bool InitDataCallback();
diff --git a/services/src/sensor_service.cpp b/services/src/sensor_service.cpp
index 84f939d2..3ede64e3 100644
--- a/services/src/sensor_service.cpp
+++ b/services/src/sensor_service.cpp
@@ -29,7 +29,6 @@
 #include "permission_util.h"
 
 #include "print_sensor_data.h"
-#include "sensor_data_processer.h"
 #include "sensor_dump.h"
 #include "system_ability_definition.h"
 
-- 
Gitee