From 12b5bd363f5b1d35b8fc670fadff17681cd15c18 Mon Sep 17 00:00:00 2001 From: gongguilin Date: Wed, 13 Nov 2024 17:24:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gongguilin --- .../source/collect/device_status_collect_manager.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/services/samgr/native/source/collect/device_status_collect_manager.cpp b/services/samgr/native/source/collect/device_status_collect_manager.cpp index 4cfee9ce..59bc1fb2 100644 --- a/services/samgr/native/source/collect/device_status_collect_manager.cpp +++ b/services/samgr/native/source/collect/device_status_collect_manager.cpp @@ -35,6 +35,8 @@ namespace OHOS { namespace { constexpr int32_t TO_MILLISECOND = 1000; +constexpr const char* LOOP_EVENT = "loopevent"; +constexpr const char* AWAKE_LOOP_EVENT = "awakeloopevent"; } void DeviceStatusCollectManager::Init(const std::list& saProfiles) { @@ -172,8 +174,16 @@ bool DeviceStatusCollectManager::IsSameEvent(const OnDemandEvent& ev1, const OnD ev1.persistence == ev2.persistence && (ev1.value == ev2.value || "" == ev2.value)); } -bool DeviceStatusCollectManager::IsSameEventName(const OnDemandEvent& ev1, const OnDemandEvent& ev2) +bool DeviceStatusCollectManager::IsSameEventName(const OnDemandEvent& event1, const OnDemandEvent& event2) { + OnDemandEvent ev1 = event1; + if (ev1.name == AWAKE_LOOP_EVENT) { + ev1.name = LOOP_EVENT; + } + OnDemandEvent ev2 = event2; + if (ev2.name == AWAKE_LOOP_EVENT) { + ev2.name = LOOP_EVENT; + } if (ev1.eventId != TIMED_EVENT) { if (ev1.eventId == ev2.eventId && ev1.name == ev2.name) { return true; -- Gitee