From c955cb2c63e3ceba9c27dcbcec382756b1d4e6c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 12 Feb 2025 16:24:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BD=BF=E4=B8=9A=E5=8A=A1=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=8B=E8=B4=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- interfaces/inner_kits/native_cpp/include/dm_publish_info.h | 4 ++++ services/service/src/advertise/advertise_manager.cpp | 5 +++++ services/service/src/softbus/softbus_listener.cpp | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interfaces/inner_kits/native_cpp/include/dm_publish_info.h b/interfaces/inner_kits/native_cpp/include/dm_publish_info.h index b003475a7..bb3a48775 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_publish_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_publish_info.h @@ -42,6 +42,10 @@ typedef struct { * Discovery ranging. For details, see {@link PublishInfo}. */ bool ranging; + /** + * Service subscription medium. For details, see {@link DmExchangeMedium}. + */ + DmExchangeMedium medium; } DmPublishInfo; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/src/advertise/advertise_manager.cpp b/services/service/src/advertise/advertise_manager.cpp index 263203e85..259ca2d82 100644 --- a/services/service/src/advertise/advertise_manager.cpp +++ b/services/service/src/advertise/advertise_manager.cpp @@ -91,6 +91,7 @@ void AdvertiseManager::ConfigAdvParam(const std::map & dmPubInfo->mode = DmDiscoverMode::DM_DISCOVER_MODE_PASSIVE; dmPubInfo->freq = DmExchangeFreq::DM_LOW; dmPubInfo->ranging = true; + dmPubInfo->medium = ExchangeMedium::AUTO; if (advertiseParam.find(PARAM_KEY_META_TYPE) != advertiseParam.end()) { LOGI("StartAdvertising input MetaType=%{public}s", (advertiseParam.find(PARAM_KEY_META_TYPE)->second).c_str()); @@ -106,6 +107,10 @@ void AdvertiseManager::ConfigAdvParam(const std::map & dmPubInfo->freq = static_cast(std::atoi((advertiseParam.find(PARAM_KEY_DISC_FREQ)->second).c_str())); } + if (advertiseParam.find(PARAM_KEY_DISC_MEDIUM) != advertiseParam.end()) { + dmPubInfo->medium = + static_cast(std::atoi((advertiseParam.find(PARAM_KEY_DISC_MEDIUM)->second).c_str())); + } } int32_t AdvertiseManager::StopAdvertising(const std::string &pkgName, int32_t publishId) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index 3f7cf1343..06c7183bf 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -631,7 +631,7 @@ int32_t SoftbusListener::PublishSoftbusLNN(const DmPublishInfo &dmPubInfo, const PublishInfo publishInfo; publishInfo.publishId = dmPubInfo.publishId; publishInfo.mode = static_cast(dmPubInfo.mode); - publishInfo.medium = (capability == DM_CAPABILITY_APPROACH) ? ExchangeMedium::BLE : ExchangeMedium::AUTO; + publishInfo.medium = (capability == DM_CAPABILITY_APPROACH) ? ExchangeMedium::BLE : dmPubInfo.medium; publishInfo.freq = static_cast(dmPubInfo.freq); publishInfo.capability = capability.c_str(); publishInfo.capabilityData = const_cast(reinterpret_cast(customData.c_str())); -- Gitee From e91901a28cb78fd09c11f54a524fd411dd48e2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 13 Feb 2025 09:19:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/advertise/advertise_manager.cpp | 4 ++-- services/service/src/softbus/softbus_listener.cpp | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/service/src/advertise/advertise_manager.cpp b/services/service/src/advertise/advertise_manager.cpp index 259ca2d82..d075679f8 100644 --- a/services/service/src/advertise/advertise_manager.cpp +++ b/services/service/src/advertise/advertise_manager.cpp @@ -91,7 +91,7 @@ void AdvertiseManager::ConfigAdvParam(const std::map & dmPubInfo->mode = DmDiscoverMode::DM_DISCOVER_MODE_PASSIVE; dmPubInfo->freq = DmExchangeFreq::DM_LOW; dmPubInfo->ranging = true; - dmPubInfo->medium = ExchangeMedium::AUTO; + dmPubInfo->medium = DmExchangeMedium:DM_AUTO; if (advertiseParam.find(PARAM_KEY_META_TYPE) != advertiseParam.end()) { LOGI("StartAdvertising input MetaType=%{public}s", (advertiseParam.find(PARAM_KEY_META_TYPE)->second).c_str()); @@ -109,7 +109,7 @@ void AdvertiseManager::ConfigAdvParam(const std::map & } if (advertiseParam.find(PARAM_KEY_DISC_MEDIUM) != advertiseParam.end()) { dmPubInfo->medium = - static_cast(std::atoi((advertiseParam.find(PARAM_KEY_DISC_MEDIUM)->second).c_str())); + static_cast(std::atoi((advertiseParam.find(PARAM_KEY_DISC_MEDIUM)->second).c_str())); } } diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index 06c7183bf..8a4263f1d 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -631,7 +631,11 @@ int32_t SoftbusListener::PublishSoftbusLNN(const DmPublishInfo &dmPubInfo, const PublishInfo publishInfo; publishInfo.publishId = dmPubInfo.publishId; publishInfo.mode = static_cast(dmPubInfo.mode); - publishInfo.medium = (capability == DM_CAPABILITY_APPROACH) ? ExchangeMedium::BLE : dmPubInfo.medium; + if (capability == DM_CAPABILITY_APPROACH) { + publishInfo.medium = ExchangeMedium::BLE; + } else { + publishInfo.medium = dmPubInfo.medium; + } publishInfo.freq = static_cast(dmPubInfo.freq); publishInfo.capability = capability.c_str(); publishInfo.capabilityData = const_cast(reinterpret_cast(customData.c_str())); -- Gitee From 3c90f8c7680ea3b9da9a6eec7c68d2c590fd0fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 13 Feb 2025 09:28:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/softbus/softbus_listener.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index 8a4263f1d..7b00d75ba 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -634,7 +634,7 @@ int32_t SoftbusListener::PublishSoftbusLNN(const DmPublishInfo &dmPubInfo, const if (capability == DM_CAPABILITY_APPROACH) { publishInfo.medium = ExchangeMedium::BLE; } else { - publishInfo.medium = dmPubInfo.medium; + publishInfo.medium = static_cast(dmPubInfo.medium); } publishInfo.freq = static_cast(dmPubInfo.freq); publishInfo.capability = capability.c_str(); -- Gitee From 34094b1037dd648c92ded06b93d87b6d155aba45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 13 Feb 2025 02:14:33 +0000 Subject: [PATCH 4/5] update services/service/src/advertise/advertise_manager.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/advertise/advertise_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/service/src/advertise/advertise_manager.cpp b/services/service/src/advertise/advertise_manager.cpp index d075679f8..9f97f5e28 100644 --- a/services/service/src/advertise/advertise_manager.cpp +++ b/services/service/src/advertise/advertise_manager.cpp @@ -91,7 +91,7 @@ void AdvertiseManager::ConfigAdvParam(const std::map & dmPubInfo->mode = DmDiscoverMode::DM_DISCOVER_MODE_PASSIVE; dmPubInfo->freq = DmExchangeFreq::DM_LOW; dmPubInfo->ranging = true; - dmPubInfo->medium = DmExchangeMedium:DM_AUTO; + dmPubInfo->medium = DmExchangeMedium::DM_AUTO; if (advertiseParam.find(PARAM_KEY_META_TYPE) != advertiseParam.end()) { LOGI("StartAdvertising input MetaType=%{public}s", (advertiseParam.find(PARAM_KEY_META_TYPE)->second).c_str()); -- Gitee From bc3bbb0b34b09bf5457509dbc4289147ab45fda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Sat, 22 Feb 2025 10:27:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/advertise/advertise_manager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/service/src/advertise/advertise_manager.cpp b/services/service/src/advertise/advertise_manager.cpp index 9f97f5e28..172f0565b 100644 --- a/services/service/src/advertise/advertise_manager.cpp +++ b/services/service/src/advertise/advertise_manager.cpp @@ -108,8 +108,10 @@ void AdvertiseManager::ConfigAdvParam(const std::map & static_cast(std::atoi((advertiseParam.find(PARAM_KEY_DISC_FREQ)->second).c_str())); } if (advertiseParam.find(PARAM_KEY_DISC_MEDIUM) != advertiseParam.end()) { - dmPubInfo->medium = - static_cast(std::atoi((advertiseParam.find(PARAM_KEY_DISC_MEDIUM)->second).c_str())); + if (IsNumberString(advertiseParam.find(PARAM_KEY_DISC_MEDIUM)->second)) { + dmPubInfo->medium = + static_cast(std::atoi((advertiseParam.find(PARAM_KEY_DISC_MEDIUM)->second).c_str())); + } } } -- Gitee