From deb3a740f0bd8bb3dfcafe30074d275d5595a1ba Mon Sep 17 00:00:00 2001 From: zhutianyi Date: Wed, 15 Jun 2022 17:26:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A8=E8=A3=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhutianyi --- notification.gni | 8 ++++++++ services/ans/BUILD.gn | 6 +++++- services/ans/src/advanced_notification_service.cpp | 4 ++++ services/ans/test/unittest/BUILD.gn | 6 +++++- services/test/moduletest/BUILD.gn | 6 +++++- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/notification.gni b/notification.gni index d7cf9b918..c1453990c 100644 --- a/notification.gni +++ b/notification.gni @@ -41,3 +41,11 @@ component_external_deps = [ "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] + +declare_args() { + device_usage = true + if (defined(global_parts_info) && + !defined(global_parts_info.device_usage_statistics)) { + device_usage = false + } +} \ No newline at end of file diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index ce40019bc..a664a86d3 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -79,7 +79,6 @@ ohos_shared_library("libans") { "ability_runtime:app_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", - "device_usage_statistics:usagestatsinner", "distributeddatamgr:distributeddata_inner", "multimedia_image_standard:image_native", "multimedia_media_standard:media_client", @@ -89,6 +88,11 @@ ohos_shared_library("libans") { ] external_deps += component_external_deps + if (device_usage) { + external_deps += [ "device_usage_statistics:usagestatsinner" ] + defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp index 77d4781dc..5d846f986 100644 --- a/services/ans/src/advanced_notification_service.cpp +++ b/services/ans/src/advanced_notification_service.cpp @@ -29,7 +29,9 @@ #include "ans_watchdog.h" #include "ans_permission_def.h" #include "bundle_manager_helper.h" +#ifdef DEVICE_USAGE_STATISTICS_ENABLE #include "bundle_active_client.h" +#endif #include "common_event_manager.h" #include "common_event_support.h" #include "display_manager.h" @@ -484,8 +486,10 @@ ErrCode AdvancedNotificationService::Publish(const std::string &label, const spt void AdvancedNotificationService::ReportInfoToResourceSchedule(const int32_t userId, const std::string &bundleName) { +#ifdef DEVICE_USAGE_STATISTICS_ENABLE DeviceUsageStats::BundleActiveEvent event(DeviceUsageStats::BundleActiveEvent::NOTIFICATION_SEEN, bundleName); DeviceUsageStats::BundleActiveClient::GetInstance().ReportEvent(event, userId); +#endif } bool AdvancedNotificationService::IsNotificationExists(const std::string &key) diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index dfe7650eb..4dd3cbafc 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -85,7 +85,6 @@ ohos_unittest("ans_unit_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "common_event_service:cesfwk_innerkits", - "device_usage_statistics:usagestatsinner", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:libhitrace", @@ -99,6 +98,11 @@ ohos_unittest("ans_unit_test") { "time_native:time_service", ] + if (device_usage) { + external_deps += [ "device_usage_statistics:usagestatsinner" ] + defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index 73f8e937d..83400fd45 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -71,7 +71,6 @@ ohos_moduletest("ans_module_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "common_event_service:cesfwk_innerkits", - "device_usage_statistics:usagestatsinner", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:libhitrace", @@ -85,6 +84,11 @@ ohos_moduletest("ans_module_test") { "time_native:time_service", ] + if (device_usage) { + external_deps += [ "device_usage_statistics:usagestatsinner" ] + defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } -- Gitee From 25d3d109964d7ca1b8f3ee78691a9bdb191102db Mon Sep 17 00:00:00 2001 From: zhutianyi Date: Thu, 16 Jun 2022 15:10:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhutianyi --- notification.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notification.gni b/notification.gni index c1453990c..fd49ed488 100644 --- a/notification.gni +++ b/notification.gni @@ -48,4 +48,4 @@ declare_args() { !defined(global_parts_info.device_usage_statistics)) { device_usage = false } -} \ No newline at end of file +} -- Gitee