diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index 00927bc59a75bf374cbd5f2d8dbe82fbfa6ce884..8bc56951d3d29171f9758e98c10b4e332aca2802 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 3e449028129400c6c2eeb72b8a3ca8f4795182d2..263203e85048c9e7ad3a8862b82f1aa8b483e774 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 1d7094d398d963d25b8ff33065370e4d4ca3ca53..0eab1da4ea82f7581ce94257c217647fd53826a2 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());