From a0cc648fdc17c9e2f0aab025148fcba26bb14d40 Mon Sep 17 00:00:00 2001 From: liuxiaowei Date: Mon, 19 May 2025 16:49:05 +0800 Subject: [PATCH 1/2] version Signed-off-by: liuxiaowei --- .../distributed_device_profile_constants.h | 2 +- .../interfaces/distributed_device_profile_enums.h | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common/include/constants/distributed_device_profile_constants.h b/common/include/constants/distributed_device_profile_constants.h index b2395044..ac16a04f 100644 --- a/common/include/constants/distributed_device_profile_constants.h +++ b/common/include/constants/distributed_device_profile_constants.h @@ -285,7 +285,7 @@ constexpr int32_t DEFAULT_AUTH_TYPE = -1; constexpr int32_t DEFAULT_PIN_EXCHANGE_TYPE = -1; constexpr uint32_t NUM_1U = 1; constexpr uint32_t NUM_8U = 8; -constexpr uint16_t CUR_SWITCH_LEN = 4; +constexpr uint16_t CUR_SWITCH_LEN = 5; extern const std::string DP_PKG_NAME; extern const std::string IS_NUMSTRING_RULES; constexpr int32_t OHOS_TYPE = 10; diff --git a/common/include/interfaces/distributed_device_profile_enums.h b/common/include/interfaces/distributed_device_profile_enums.h index 5709732b..54d09928 100644 --- a/common/include/interfaces/distributed_device_profile_enums.h +++ b/common/include/interfaces/distributed_device_profile_enums.h @@ -180,9 +180,10 @@ enum StaticCapabilityFlag { CAPABILITY_FLAG_MIN = -1, CAPABILITY_FLAG_DMS = 0, CAPABILITY_FLAG_PASTE_BOARD = 1, - CAPABILITY_FLAG_COLLABORATION_FWK = 2, - CAPABILITY_FLAG_DEVICE_STATUS = 3, - CAPABILITY_FLAG_MAX = 4, + CAPABILITY_FLAG_DISTRIBUTED_FILE_DAEMON = 2, + CAPABILITY_FLAG_COLLABORATION_FWK = 3, + CAPABILITY_FLAG_DEVICE_STATUS = 4, + CAPABILITY_FLAG_MAX = 5, }; enum class SwitchFlag : int32_t { SWITCH_FLAG_MIN = -1, @@ -190,17 +191,20 @@ enum class SwitchFlag : int32_t { SWITCH_FLAG_KEY_DISTRIBUTED_PASTEBOARD = 1, SWITCH_FLAG_DCSHARESWITCH = 2, SWITCH_FLAG_WIFI_DISPLAY_SERVICE = 3, - SWITCH_FLAG_MAX = 4 + SWITCH_FLAG_DISTRIBUTED_SUPER_MANAGER = 4, + SWITCH_FLAG_MAX = 5 }; const std::unordered_map SWITCH_SERVICE_MAP = { { "SwitchStatus_Key_Mouse_Edge_Crossing", SwitchFlag::SWITCH_FLAG_KEY_MOUSE_EDGE_CROSSING }, { "SwitchStatus_Key_Distributed_Pasteboard", SwitchFlag::SWITCH_FLAG_KEY_DISTRIBUTED_PASTEBOARD }, { "SwitchStatus_DcShareSwitch", SwitchFlag::SWITCH_FLAG_DCSHARESWITCH }, - { "SwitchStatus_Wifi_Display_Service", SwitchFlag::SWITCH_FLAG_WIFI_DISPLAY_SERVICE } + { "SwitchStatus_Wifi_Display_Service", SwitchFlag::SWITCH_FLAG_WIFI_DISPLAY_SERVICE }, + { "SwitchStatus_Distributed_Super_Manager", SwitchFlag::SWITCH_FLAG_DISTRIBUTED_SUPER_MANAGER } }; const std::unordered_map CAPABILITY_FLAG_MAP = { { "dmsfwk_svr_id", StaticCapabilityFlag::CAPABILITY_FLAG_DMS }, { "pasteboardService", StaticCapabilityFlag::CAPABILITY_FLAG_PASTE_BOARD }, + { "distributedfiledaemon", StaticCapabilityFlag::CAPABILITY_FLAG_DISTRIBUTED_FILE_DAEMON }, { "collaborationFwk", StaticCapabilityFlag::CAPABILITY_FLAG_COLLABORATION_FWK }, { "deviceStatus", StaticCapabilityFlag::CAPABILITY_FLAG_DEVICE_STATUS }, }; -- Gitee From 8dfcbf46624961a2344d0f0cc934ab97b731dc2f Mon Sep 17 00:00:00 2001 From: liuxiaowei Date: Wed, 21 May 2025 18:12:07 +0800 Subject: [PATCH 2/2] version Signed-off-by: liuxiaowei --- .../include/interfaces/distributed_device_profile_enums.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/include/interfaces/distributed_device_profile_enums.h b/common/include/interfaces/distributed_device_profile_enums.h index 54d09928..6b62fa98 100644 --- a/common/include/interfaces/distributed_device_profile_enums.h +++ b/common/include/interfaces/distributed_device_profile_enums.h @@ -181,9 +181,7 @@ enum StaticCapabilityFlag { CAPABILITY_FLAG_DMS = 0, CAPABILITY_FLAG_PASTE_BOARD = 1, CAPABILITY_FLAG_DISTRIBUTED_FILE_DAEMON = 2, - CAPABILITY_FLAG_COLLABORATION_FWK = 3, - CAPABILITY_FLAG_DEVICE_STATUS = 4, - CAPABILITY_FLAG_MAX = 5, + CAPABILITY_FLAG_MAX = 3, }; enum class SwitchFlag : int32_t { SWITCH_FLAG_MIN = -1, @@ -204,9 +202,7 @@ const std::unordered_map SWITCH_SERVICE_MAP = { const std::unordered_map CAPABILITY_FLAG_MAP = { { "dmsfwk_svr_id", StaticCapabilityFlag::CAPABILITY_FLAG_DMS }, { "pasteboardService", StaticCapabilityFlag::CAPABILITY_FLAG_PASTE_BOARD }, - { "distributedfiledaemon", StaticCapabilityFlag::CAPABILITY_FLAG_DISTRIBUTED_FILE_DAEMON }, - { "collaborationFwk", StaticCapabilityFlag::CAPABILITY_FLAG_COLLABORATION_FWK }, - { "deviceStatus", StaticCapabilityFlag::CAPABILITY_FLAG_DEVICE_STATUS }, + { "distributedfiledaemon", StaticCapabilityFlag::CAPABILITY_FLAG_DISTRIBUTED_FILE_DAEMON } }; } // namespace DistributedDeviceProfile } // namespace OHOS -- Gitee