From b793aeb99caa4e0813f936c035b8db2a0364b4d7 Mon Sep 17 00:00:00 2001 From: liqiang Date: Thu, 10 Feb 2022 15:21:06 +0800 Subject: [PATCH] IssueNo:IssueNo:https://gitee.com/openharmony/notification_ans_standard/issues/I4T3TK Description:adapt wantagent change Sig: SIG_ApplicationFramework Feature or Bugfix: Binary Source:No Signed-off-by: liqiang Change-Id: Iaabd2c5234d958dd7227c5e6745d1be96182666c --- bundle.json | 1 + interfaces/innerkits/include/itimer_info.h | 4 ++-- interfaces/kits/js/napi/system_time/BUILD.gn | 2 +- interfaces/kits/js/napi/system_timer/BUILD.gn | 2 +- .../kits/js/napi/system_timer/include/system_timer.h | 2 +- interfaces/kits/js/napi/system_timer/src/system_timer.cpp | 8 ++++---- services/BUILD.gn | 2 +- services/time_manager/src/timer_call_back.cpp | 7 +++---- services/time_manager/test/BUILD.gn | 2 +- .../time_manager/test/unittest/include/timer_info_test.h | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bundle.json b/bundle.json index 1fde5d4..e7eb0e6 100644 --- a/bundle.json +++ b/bundle.json @@ -25,6 +25,7 @@ "deps": { "components": [ "ability_base", + "ability_runtime", "appexecfwk_standard", "ans_standard", "ces_standard", diff --git a/interfaces/innerkits/include/itimer_info.h b/interfaces/innerkits/include/itimer_info.h index bfd5157..eda86c9 100644 --- a/interfaces/innerkits/include/itimer_info.h +++ b/interfaces/innerkits/include/itimer_info.h @@ -28,7 +28,7 @@ public: int type; bool repeat; uint64_t interval; - std::shared_ptr wantAgent; + std::shared_ptr wantAgent; /** * Indicates the timing policy the timer use, which can be REALTIME or UTC. @@ -70,7 +70,7 @@ public: * */ virtual void SetInterval(const uint64_t &interval) = 0; - virtual void SetWantAgent(std::shared_ptr wantAgent) = 0; + virtual void SetWantAgent(std::shared_ptr wantAgent) = 0; virtual void OnTrigger() = 0; }; } // MiscServices diff --git a/interfaces/kits/js/napi/system_time/BUILD.gn b/interfaces/kits/js/napi/system_time/BUILD.gn index c161edf..0bda153 100644 --- a/interfaces/kits/js/napi/system_time/BUILD.gn +++ b/interfaces/kits/js/napi/system_time/BUILD.gn @@ -32,7 +32,6 @@ ohos_shared_library("systemtime") { deps = [ "//base/miscservices/time/services:time_service", - "//base/notification/ans_standard/frameworks/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/ace/napi/:ace_napi", "//utils/native/base:utils", @@ -40,6 +39,7 @@ ohos_shared_library("systemtime") { external_deps = [ "ability_base:want", + "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/js/napi/system_timer/BUILD.gn b/interfaces/kits/js/napi/system_timer/BUILD.gn index c4cc654..dc531e2 100644 --- a/interfaces/kits/js/napi/system_timer/BUILD.gn +++ b/interfaces/kits/js/napi/system_timer/BUILD.gn @@ -50,7 +50,6 @@ ohos_shared_library("systemtimer") { deps = [ "//base/miscservices/time/services:time_service", - "//base/notification/ans_standard/frameworks/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/ace/napi:ace_napi", @@ -59,6 +58,7 @@ ohos_shared_library("systemtimer") { external_deps = [ "ability_base:want", + "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/js/napi/system_timer/include/system_timer.h b/interfaces/kits/js/napi/system_timer/include/system_timer.h index ef4ec4a..cf6cbc5 100644 --- a/interfaces/kits/js/napi/system_timer/include/system_timer.h +++ b/interfaces/kits/js/napi/system_timer/include/system_timer.h @@ -37,7 +37,7 @@ public: virtual void SetType(const int &type) override; virtual void SetRepeat(bool repeat) override; virtual void SetInterval(const uint64_t &interval) override; - virtual void SetWantAgent(std::shared_ptr wantAgent) override; + virtual void SetWantAgent(std::shared_ptr wantAgent) override; void SetCallbackInfo(const napi_env &env, const napi_ref &ref); private: diff --git a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp index d9c6dee..edfa4d3 100644 --- a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp +++ b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp @@ -228,7 +228,7 @@ void ITimerInfoInstance::SetInterval(const uint64_t &_interval) { interval = _interval; } -void ITimerInfoInstance::SetWantAgent(std::shared_ptr _wantAgent) +void ITimerInfoInstance::SetWantAgent(std::shared_ptr _wantAgent) { wantAgent = _wantAgent; } @@ -238,7 +238,7 @@ napi_value GetTimerOptions(const napi_env &env, const napi_value &value, { napi_valuetype valuetype = napi_undefined; napi_value result = nullptr; - OHOS::Notification::WantAgent::WantAgent *wantAgent = nullptr; + OHOS::AbilityRuntime::WantAgent::WantAgent *wantAgent = nullptr; bool hasProperty = false; // type: number @@ -283,8 +283,8 @@ napi_value GetTimerOptions(const napi_env &env, const napi_value &value, if (wantAgent == nullptr) { return nullptr; } - std::shared_ptr sWantAgent = - std::make_shared(*wantAgent); + std::shared_ptr sWantAgent = + std::make_shared(*wantAgent); iTimerInfoInstance->SetWantAgent(sWantAgent); } diff --git a/services/BUILD.gn b/services/BUILD.gn index be4ebb6..f9658e2 100755 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -61,7 +61,6 @@ ohos_shared_library("time_service") { deps = [ "${time_utils_path}:time_utils", - "//base/notification/ans_standard/frameworks/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_appdatafwk:native_appdatafwk", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_preferences:native_preferences", @@ -71,6 +70,7 @@ ohos_shared_library("time_service") { external_deps = [ "ability_base:base", "ability_base:want", + "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/services/time_manager/src/timer_call_back.cpp b/services/time_manager/src/timer_call_back.cpp index de76841..f57b2bc 100644 --- a/services/time_manager/src/timer_call_back.cpp +++ b/services/time_manager/src/timer_call_back.cpp @@ -93,10 +93,9 @@ void TimerCallback::NotifyTimer(const uint64_t timerId) TIME_HILOGD(TIME_MODULE_SERVICE, "trigger wantagent."); std::shared_ptr context = std::make_shared(); std::shared_ptr want = - Notification::WantAgent::WantAgentHelper::GetWant(it->second->wantAgent); - - OHOS::Notification::WantAgent::TriggerInfo paramsInfo("", nullptr, want, WANTAGENT_CODE_ELEVEN); - Notification::WantAgent::WantAgentHelper::TriggerWantAgent( + OHOS::AbilityRuntime::WantAgent::WantAgentHelper::GetWant(it->second->wantAgent); + OHOS::AbilityRuntime::WantAgent::TriggerInfo paramsInfo("", nullptr, want, WANTAGENT_CODE_ELEVEN); + OHOS::AbilityRuntime::WantAgent::WantAgentHelper::TriggerWantAgent( it->second->wantAgent, nullptr, paramsInfo); } } diff --git a/services/time_manager/test/BUILD.gn b/services/time_manager/test/BUILD.gn index 2607831..49eddc3 100644 --- a/services/time_manager/test/BUILD.gn +++ b/services/time_manager/test/BUILD.gn @@ -34,7 +34,6 @@ ohos_unittest("TimeServiceTest") { deps = [ "//base/miscservices/time/services:time_service", - "//base/notification/ans_standard/frameworks/wantagent:wantagent_innerkits", "//foundation/ace/napi:ace_napi", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -46,6 +45,7 @@ ohos_unittest("TimeServiceTest") { external_deps = [ "ability_base:base", "ability_base:want", + "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/services/time_manager/test/unittest/include/timer_info_test.h b/services/time_manager/test/unittest/include/timer_info_test.h index 1d0e99d..24ce53f 100644 --- a/services/time_manager/test/unittest/include/timer_info_test.h +++ b/services/time_manager/test/unittest/include/timer_info_test.h @@ -42,7 +42,7 @@ public: virtual void SetType(const int &type) override; virtual void SetRepeat(bool repeat) override; virtual void SetInterval(const uint64_t &interval) override; - virtual void SetWantAgent(std::shared_ptr wantAgent) override; + virtual void SetWantAgent(std::shared_ptr wantAgent) override; void SetCallbackInfo(const std::function &callBack); private: @@ -85,7 +85,7 @@ void TimerInfoTest::SetInterval(const uint64_t &_interval) { interval = _interval; } -void TimerInfoTest::SetWantAgent(std::shared_ptr _wantAgent) +void TimerInfoTest::SetWantAgent(std::shared_ptr _wantAgent) { wantAgent = _wantAgent; }