From 54ba25e6a38ae275a34e8f527140fb14e04a9bc1 Mon Sep 17 00:00:00 2001 From: unknown_yangzhou Date: Fri, 9 Aug 2024 01:35:30 +0000 Subject: [PATCH] Add new discover type and scan freq Signed-off-by: unknown_yangzhou --- common/include/dm_constants.h | 1 + services/service/src/advertise/advertise_manager.cpp | 2 +- services/service/src/discovery/discovery_manager.cpp | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index 00927bc59..8bc56951d 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -131,6 +131,7 @@ constexpr const char* DM_PIN_HOLDER_SESSION_NAME = "ohos.distributedhardware.dev constexpr const char* DM_UNBIND_SESSION_NAME = "ohos.distributedhardware.devicemanager.unbind"; constexpr const char* DM_CAPABILITY_OSD = "osdCapability"; constexpr const char* DM_CAPABILITY_APPROACH = "approach"; +constexpr const char* DM_CAPABILITY_TOUCH = "touch"; constexpr const char* DM_CAPABILITY_CASTPLUS = "castPlus"; constexpr const char* DM_CAPABILITY_VIRTUAL_LINK = "virtualLink"; constexpr const char* DM_CAPABILITY_SHARE = "share"; diff --git a/services/service/src/advertise/advertise_manager.cpp b/services/service/src/advertise/advertise_manager.cpp index 3e4490281..263203e85 100644 --- a/services/service/src/advertise/advertise_manager.cpp +++ b/services/service/src/advertise/advertise_manager.cpp @@ -48,7 +48,7 @@ int32_t AdvertiseManager::StartAdvertising(const std::string &pkgName, if (advertiseParam.find(PARAM_KEY_DISC_CAPABILITY) != advertiseParam.end()) { capability = advertiseParam.find(PARAM_KEY_DISC_CAPABILITY)->second; } - if (capability == DM_CAPABILITY_APPROACH) { + if (capability == DM_CAPABILITY_APPROACH || capability == DM_CAPABILITY_TOUCH) { dmPubInfo.mode = DmDiscoverMode::DM_DISCOVER_MODE_ACTIVE; } std::string customData = ""; diff --git a/services/service/src/discovery/discovery_manager.cpp b/services/service/src/discovery/discovery_manager.cpp index 1d7094d39..0eab1da4e 100644 --- a/services/service/src/discovery/discovery_manager.cpp +++ b/services/service/src/discovery/discovery_manager.cpp @@ -73,6 +73,10 @@ int32_t DiscoveryManager::EnableDiscoveryListener(const std::string &pkgName, return ERR_DM_ENABLE_DISCOVERY_LISTENER_FAILED; } + if (discoverParam.find(PARAM_KEY_DISC_FREQ) != discoverParam.end()) { + int32_t freq = std::atoi((discoverParam.find(PARAM_KEY_DISC_FREQ)->second).c_str()); + dmSubInfo.freq = static_cast(freq); + } if (discoverParam.find(PARAM_KEY_META_TYPE) != discoverParam.end()) { std::string metaType = discoverParam.find(PARAM_KEY_META_TYPE)->second; LOGI("EnableDiscoveryListener, input MetaType = %{public}s in discoverParam map.", metaType.c_str()); -- Gitee