From e2363e2126ba2e5dca4c22df46bb34ec6dcb8041 Mon Sep 17 00:00:00 2001 From: zhouyan Date: Tue, 7 Jun 2022 15:50:41 +0800 Subject: [PATCH] =?UTF-8?q?tokensync=E5=8A=A8=E6=80=81=E6=8B=89=E8=B5=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=AB=E6=8F=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyan Change-Id: I7a7ed63df1c179b0469578fdb860c2f2149fcfc9 --- .../include/device/atm_device_state_callback.h | 16 ++++++---------- .../cpp/src/device/atm_device_state_callback.cpp | 4 ++++ .../remote/soft_bus_device_connection_listener.h | 16 ++++++---------- .../soft_bus_device_connection_listener.cpp | 4 ++++ .../src/remote/soft_bus_manager.cpp | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h b/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h index f8efb8489..dbc45fa31 100644 --- a/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h +++ b/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h @@ -21,24 +21,20 @@ namespace OHOS { namespace Security { namespace AccessToken { -using OHOS::DistributedHardware::DeviceStateCallback; -using OHOS::DistributedHardware::DmDeviceInfo; -using OHOS::DistributedHardware::DmInitCallback; - -class AtmDmInitCallback final : public DmInitCallback { +class AtmDmInitCallback final : public DistributedHardware::DmInitCallback { void OnRemoteDied() override {} }; -class AtmDeviceStateCallback final : public DeviceStateCallback { +class AtmDeviceStateCallback final : public DistributedHardware::DeviceStateCallback { public: AtmDeviceStateCallback(); ~AtmDeviceStateCallback(); - void OnDeviceOnline(const DmDeviceInfo &deviceInfo) override; - void OnDeviceOffline(const DmDeviceInfo &deviceInfo) override; - void OnDeviceReady(const DmDeviceInfo &deviceInfo) override; - void OnDeviceChanged(const DmDeviceInfo &deviceInfo) override; + void OnDeviceOnline(const DistributedHardware::DmDeviceInfo &deviceInfo) override; + void OnDeviceOffline(const DistributedHardware::DmDeviceInfo &deviceInfo) override; + void OnDeviceReady(const DistributedHardware::DmDeviceInfo &deviceInfo) override; + void OnDeviceChanged(const DistributedHardware::DmDeviceInfo &deviceInfo) override; }; } // namespace AccessToken } // namespace Security diff --git a/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp b/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp index 33667b60f..0feac7b32 100644 --- a/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp +++ b/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp @@ -28,6 +28,10 @@ namespace OHOS { namespace Security { namespace AccessToken { +using OHOS::DistributedHardware::DeviceStateCallback; +using OHOS::DistributedHardware::DmDeviceInfo; +using OHOS::DistributedHardware::DmInitCallback; + namespace { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AtmDeviceStateCallback"}; diff --git a/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h b/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h index 2a207dbaf..7d0086efb 100644 --- a/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h +++ b/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h @@ -27,16 +27,12 @@ namespace OHOS { namespace Security { namespace AccessToken { -using OHOS::DistributedHardware::DeviceStateCallback; -using OHOS::DistributedHardware::DmDeviceInfo; -using OHOS::DistributedHardware::DmInitCallback; - -class MyDmInitCallback final : public DmInitCallback { +class MyDmInitCallback final : public DistributedHardware::DmInitCallback { void OnRemoteDied() override {} }; -class SoftBusDeviceConnectionListener final : public DeviceStateCallback { +class SoftBusDeviceConnectionListener final : public DistributedHardware::DeviceStateCallback { public: SoftBusDeviceConnectionListener(); ~SoftBusDeviceConnectionListener(); @@ -46,28 +42,28 @@ public: * * @param deviceInfo node info */ - void OnDeviceOnline(const DmDeviceInfo &deviceInfo) override; + void OnDeviceOnline(const DistributedHardware::DmDeviceInfo &deviceInfo) override; /** * @brief node offline callback * * @param deviceInfo node info */ - void OnDeviceOffline(const DmDeviceInfo &deviceInfo) override; + void OnDeviceOffline(const DistributedHardware::DmDeviceInfo &deviceInfo) override; /** * @brief node ready callback * * @param deviceInfo node info */ - void OnDeviceReady(const DmDeviceInfo &deviceInfo) override; + void OnDeviceReady(const DistributedHardware::DmDeviceInfo &deviceInfo) override; /** * @brief node changed callback * * @param deviceInfo node info */ - void OnDeviceChanged(const DmDeviceInfo &deviceInfo) override; + void OnDeviceChanged(const DistributedHardware::DmDeviceInfo &deviceInfo) override; }; } // namespace AccessToken } // namespace Security diff --git a/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp index 0835b06d6..62982e364 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp @@ -24,6 +24,10 @@ namespace OHOS { namespace Security { namespace AccessToken { +using OHOS::DistributedHardware::DeviceStateCallback; +using OHOS::DistributedHardware::DmDeviceInfo; +using OHOS::DistributedHardware::DmInitCallback; + namespace { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "SoftBusDeviceConnectionListener"}; diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index d1a6e4be4..61c5be28b 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -61,7 +61,7 @@ int SoftBusManager::AddTrustedDeviceInfo() { std::string packageName = TOKEN_SYNC_PACKAGE_NAME; std::string extra = ""; - std::vector deviceList; + std::vector deviceList; int32_t ret = DistributedHardware::DeviceManager::GetInstance().GetTrustedDeviceList(packageName, extra, deviceList); @@ -70,7 +70,7 @@ int SoftBusManager::AddTrustedDeviceInfo() return Constant::FAILURE; } - for (DmDeviceInfo device : deviceList) { + for (DistributedHardware::DmDeviceInfo device : deviceList) { std::string uuid = GetUuidByNodeId(device.networkId); std::string udid = GetUdidByNodeId(device.networkId); if (uuid.empty() || udid.empty()) { -- Gitee