From 593e395df9a49696510088af8826c75e819e01b3 Mon Sep 17 00:00:00 2001 From: wangsen1994 Date: Sat, 17 May 2025 16:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4=E4=BA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangsen1994 --- services/distributed/BUILD.gn | 6 +++++- .../distributed_operation_helper.h} | 0 .../distributed_operation_helper.cpp} | 2 +- .../src/soft_bus/distributed_observer_service.cpp | 2 +- .../src/soft_bus/distributed_publish_service.cpp | 2 +- services/distributed/test/unittest/BUILD.gn | 4 ++-- 6 files changed, 10 insertions(+), 6 deletions(-) rename services/distributed/include/{soft_bus/distributed_operation_service.h => helper/distributed_operation_helper.h} (100%) rename services/distributed/src/{soft_bus/distributed_operation_service.cpp => helper/distributed_operation_helper.cpp} (98%) diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index ad446f0cb..185f5f3c7 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -105,12 +105,12 @@ ohos_shared_library("libdans") { "src/helper/analytics_util.cpp", "src/helper/bundle_resource_helper.cpp", "src/helper/distributed_operation_connection.cpp", + "src/helper/distributed_operation_helper.cpp", "src/helper/distributed_preference.cpp", "src/helper/distributed_rdb_helper.cpp", "src/soft_bus/distributed_cmd_service.cpp", "src/soft_bus/distributed_extern_intferface.cpp", "src/soft_bus/distributed_observer_service.cpp", - "src/soft_bus/distributed_operation_service.cpp", "src/soft_bus/distributed_publish_service.cpp", "src/soft_bus/distributed_service.cpp", "src/soft_bus/distributed_service_uitls.cpp", @@ -169,6 +169,10 @@ ohos_shared_library("libdans") { defines += [ "HITRACE_METER_ENABLE" ] } + if (distributed_notification_service_feature_distributed_master) { + defines += [ "DISTRIBUTED_FEATURE_MASTER" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/distributed/include/soft_bus/distributed_operation_service.h b/services/distributed/include/helper/distributed_operation_helper.h similarity index 100% rename from services/distributed/include/soft_bus/distributed_operation_service.h rename to services/distributed/include/helper/distributed_operation_helper.h diff --git a/services/distributed/src/soft_bus/distributed_operation_service.cpp b/services/distributed/src/helper/distributed_operation_helper.cpp similarity index 98% rename from services/distributed/src/soft_bus/distributed_operation_service.cpp rename to services/distributed/src/helper/distributed_operation_helper.cpp index 17aabde60..e9ce47284 100644 --- a/services/distributed/src/soft_bus/distributed_operation_service.cpp +++ b/services/distributed/src/helper/distributed_operation_helper.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "distributed_operation_service.h" +#include "distributed_operation_helper.h" #include "screenlock_common.h" #include "in_process_call_wrapper.h" diff --git a/services/distributed/src/soft_bus/distributed_observer_service.cpp b/services/distributed/src/soft_bus/distributed_observer_service.cpp index ad2865766..e31cdc937 100644 --- a/services/distributed/src/soft_bus/distributed_observer_service.cpp +++ b/services/distributed/src/soft_bus/distributed_observer_service.cpp @@ -17,7 +17,7 @@ #include "distributed_service.h" #include "common_event_manager.h" #include "common_event_support.h" -#include "distributed_operation_service.h" +#include "distributed_operation_helper.h" namespace OHOS { namespace Notification { diff --git a/services/distributed/src/soft_bus/distributed_publish_service.cpp b/services/distributed/src/soft_bus/distributed_publish_service.cpp index 48ccb03a7..60879db2d 100644 --- a/services/distributed/src/soft_bus/distributed_publish_service.cpp +++ b/services/distributed/src/soft_bus/distributed_publish_service.cpp @@ -30,7 +30,7 @@ #include "response_box.h" #include "power_mgr_client.h" #include "distributed_local_config.h" -#include "distributed_operation_service.h" +#include "distributed_operation_helper.h" #include "notification_sync_box.h" #include "ans_inner_errors.h" #include "ability_manager_helper.h" diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index 18073254b..2b76ae7b2 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -443,11 +443,11 @@ ohos_unittest("distributed_service_test") { "/${services_path}/distributed/src/helper/analytics_util.cpp", "/${services_path}/distributed/src/helper/bundle_resource_helper.cpp", "/${services_path}/distributed/src/helper/distributed_operation_connection.cpp", + "/${services_path}/distributed/src/helper/distributed_operation_helper.cpp", "/${services_path}/distributed/src/helper/distributed_preference.cpp", "/${services_path}/distributed/src/helper/distributed_rdb_helper.cpp", "/${services_path}/distributed/src/soft_bus/distributed_cmd_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_observer_service.cpp", - "/${services_path}/distributed/src/soft_bus/distributed_operation_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_publish_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service_uitls.cpp", @@ -536,11 +536,11 @@ ohos_unittest("distributed_subscriber_test") { "/${services_path}/distributed/src/helper/analytics_util.cpp", "/${services_path}/distributed/src/helper/bundle_resource_helper.cpp", "/${services_path}/distributed/src/helper/distributed_operation_connection.cpp", + "/${services_path}/distributed/src/helper/distributed_operation_helper.cpp", "/${services_path}/distributed/src/helper/distributed_preference.cpp", "/${services_path}/distributed/src/helper/distributed_rdb_helper.cpp", "/${services_path}/distributed/src/soft_bus/distributed_cmd_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_observer_service.cpp", - "/${services_path}/distributed/src/soft_bus/distributed_operation_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_publish_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service.cpp", "/${services_path}/distributed/src/soft_bus/distributed_service_uitls.cpp", -- Gitee