From 2bae1dfd8566abfee178d4ecfff6a28941602b91 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Fri, 26 Aug 2022 11:58:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- interfaces/inner_kits/BUILD.gn | 2 -- services/distributedhardwarefwkservice/BUILD.gn | 7 ------- utils/BUILD.gn | 3 --- 3 files changed, 12 deletions(-) diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 24bb4f56..3c78bfa8 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -50,9 +50,7 @@ ohos_shared_library("libdhfwk_sdk") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index eb4226e5..b6199a09 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -80,8 +80,6 @@ ohos_shared_library("distributedhardwarefwksvr") { deps = [ "${utils_path}:distributedhardwareutils", - "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager", - "//foundation/ability/ability_runtime/services/abilitymgr:abilityms", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] @@ -93,13 +91,8 @@ ohos_shared_library("distributedhardwarefwksvr") { ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "ipc:ipc_core", "kv_store:distributeddata_inner", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 0ebf6958..0c694346 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -44,11 +44,8 @@ ohos_shared_library("distributedhardwareutils") { ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", "dsoftbus:softbus_client", - "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", -- Gitee From 80ff4b343aeaea39e1a07e83825d6424361d46fd Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 8 Sep 2022 16:10:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8D=20DM=20OnDeviceReady?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/accessmanager/access_manager.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp index eb93bbdb..085c7925 100644 --- a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp +++ b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp @@ -120,16 +120,8 @@ void AccessManager::OnRemoteDied() void AccessManager::OnDeviceOnline(const DmDeviceInfo &deviceInfo) { - std::lock_guard lock(accessMutex_); - DHLOGI("start, networkId = %s, deviceName = %s, deviceTypeId = %d", GetAnonyString(deviceInfo.deviceId).c_str(), - GetAnonyString(deviceInfo.deviceName).c_str(), deviceInfo.deviceTypeId); - - auto networkId = std::string(deviceInfo.deviceId); // deviceId of DM actually is networkId - auto uuid = GetUUIDBySoftBus(networkId); - auto ret = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, deviceInfo.deviceTypeId); - DHLOGI("online result = %d, networkId = %s, uuid = %s", ret, GetAnonyString(networkId).c_str(), - GetAnonyString(uuid).c_str()); + (void)deviceInfo; + return; } void AccessManager::OnDeviceOffline(const DmDeviceInfo &deviceInfo) @@ -157,8 +149,16 @@ void AccessManager::OnDeviceOffline(const DmDeviceInfo &deviceInfo) void AccessManager::OnDeviceReady(const DmDeviceInfo &deviceInfo) { - (void)deviceInfo; - return; + std::lock_guard lock(accessMutex_); + DHLOGI("start, networkId = %s, deviceName = %s, deviceTypeId = %d", GetAnonyString(deviceInfo.deviceId).c_str(), + GetAnonyString(deviceInfo.deviceName).c_str(), deviceInfo.deviceTypeId); + + auto networkId = std::string(deviceInfo.deviceId); // deviceId of DM actually is networkId + auto uuid = GetUUIDBySoftBus(networkId); + auto ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, deviceInfo.deviceTypeId); + DHLOGI("online result = %d, networkId = %s, uuid = %s", ret, GetAnonyString(networkId).c_str(), + GetAnonyString(uuid).c_str()); } void AccessManager::OnDeviceChanged(const DmDeviceInfo &deviceInfo) -- Gitee