From a80db15282732c448fe2d1f3f963ef816e641c50 Mon Sep 17 00:00:00 2001
From: Zhao-PengFei35 <zhaopengfei35@huawei.com>
Date: Tue, 22 Aug 2023 22:17:03 +0800
Subject: [PATCH] fix bug of maintenance

Signed-off-by: Zhao-PengFei35 <zhaopengfei35@huawei.com>
---
 plugins/ext/src/base_state.cpp          | 2 +-
 services/common/include/time_provider.h | 2 +-
 services/common/src/time_provider.cpp   | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/ext/src/base_state.cpp b/plugins/ext/src/base_state.cpp
index d76c486..2b414e2 100644
--- a/plugins/ext/src/base_state.cpp
+++ b/plugins/ext/src/base_state.cpp
@@ -209,7 +209,7 @@ int64_t StateWithMaint::CalculateMaintTimeOut(const std::shared_ptr<IStateManage
     }
     int64_t timeDiff {0};
     if (TimeProvider::GetCondition(maintIntervalTimeOut) == ConditionType::NIGHT_STANDBY &&
-        TimeProvider::TimeDiffToDayNightSwitch(timeDiff)) {
+        TimeProvider::TimeDiffToDayNightSwitch(timeDiff, maintIntervalTimeOut)) {
         maintIntervalTimeOut *= TimeConstant::MSEC_PER_SEC;
         maintIntervalTimeOut += timeDiff;
         return maintIntervalTimeOut;
diff --git a/services/common/include/time_provider.h b/services/common/include/time_provider.h
index d31b031..8e2d149 100644
--- a/services/common/include/time_provider.h
+++ b/services/common/include/time_provider.h
@@ -50,7 +50,7 @@ public:
     static bool ConvertTimeStampToLocalTime(int64_t curTimeStamp, struct tm& curLocalTime);
     static uint32_t GetCondition(int64_t afterNextSeconds = 0);
     static int64_t GetNapTimeOut();
-    static bool TimeDiffToDayNightSwitch(int64_t& timeDiff);
+    static bool TimeDiffToDayNightSwitch(int64_t& timeDiff, int64_t curSecTimeStamp = -1);
     static int32_t GetRandomDelay(int32_t low, int32_t high);
     static bool DiffToFixedClock(int64_t curTimeStamp, int32_t tmHour, int32_t tmMin, int64_t& timeDiff);
 };
diff --git a/services/common/src/time_provider.cpp b/services/common/src/time_provider.cpp
index 00a705f..bf90631 100644
--- a/services/common/src/time_provider.cpp
+++ b/services/common/src/time_provider.cpp
@@ -65,9 +65,11 @@ uint32_t TimeProvider::GetCondition(int64_t afterNextSeconds)
     return ConditionType::NIGHT_STANDBY;
 }
 
-bool TimeProvider::TimeDiffToDayNightSwitch(int64_t& timeDiff)
+bool TimeProvider::TimeDiffToDayNightSwitch(int64_t& timeDiff, int64_t curSecTimeStamp)
 {
-    int64_t curSecTimeStamp = MiscServices::TimeServiceClient::GetInstance()->GetWallTimeMs() / MSEC_PER_SEC;
+    if (curSecTimeStamp == -1) {
+        curSecTimeStamp = MiscServices::TimeServiceClient::GetInstance()->GetWallTimeMs() / MSEC_PER_SEC;
+    }
     bool res {false};
     STANDBYSERVICE_LOGD("condition is %{public}u", GetCondition());
     if (GetCondition() == ConditionType::NIGHT_STANDBY) {
-- 
Gitee