From 8e8f15e31aded0542a4a79580a6577a2e02f9c76 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Fri, 14 Jan 2022 11:31:28 +0800 Subject: [PATCH 1/2] modify the conflict definition struct Signed-off-by: zuojiangjiang --- .../unittest/communication_provider_impl_test.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp b/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp index c9cfa93be..dd2e2a249 100755 --- a/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp +++ b/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp @@ -33,10 +33,11 @@ class CommunicationProviderImplTest : public testing::Test { }; class AppDataChangeListenerImpl : public AppDataChangeListener { - void OnMessage(const DeviceInfo &info, const uint8_t *ptr, const int size, + void OnMessage(const OHOS::AppDistributedKv::DeviceInfo &info, const uint8_t *ptr, const int size, const struct PipeInfo &id) const override; }; -void AppDataChangeListenerImpl::OnMessage(const DeviceInfo &info, const uint8_t *ptr, const int size, +void AppDataChangeListenerImpl::OnMessage(const OHOS::AppDistributedKv::DeviceInfo &info, + const uint8_t *ptr, const int size, const struct PipeInfo &id) const { ZLOGI("data %{public}s %s", info.deviceName.c_str(), ptr); @@ -44,11 +45,13 @@ void AppDataChangeListenerImpl::OnMessage(const DeviceInfo &info, const uint8_t class AppDeviceStatusChangeListenerImpl : public AppDeviceStatusChangeListener { public: - void OnDeviceChanged(const DeviceInfo &info, const DeviceChangeType &type) const override; + void OnDeviceChanged(const OHOS::AppDistributedKv::DeviceInfo &info, + const DeviceChangeType &type) const override; ~AppDeviceStatusChangeListenerImpl(); }; -void AppDeviceStatusChangeListenerImpl::OnDeviceChanged(const DeviceInfo &info, const DeviceChangeType &type) const +void AppDeviceStatusChangeListenerImpl::OnDeviceChanged(const OHOS::AppDistributedKv::DeviceInfo &info, + const DeviceChangeType &type) const { ZLOGI("%{public}s %{public}d", info.deviceName.c_str(), static_cast(type)); } -- Gitee From e6337f153de37a94641c5368d523b7fe0519147c Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Fri, 14 Jan 2022 11:45:22 +0800 Subject: [PATCH 2/2] modify the conflict definition struct Signed-off-by: zuojiangjiang --- .../test/unittest/communication_provider_impl_test.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp b/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp index dd2e2a249..ba16334db 100755 --- a/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp +++ b/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp @@ -37,8 +37,7 @@ class AppDataChangeListenerImpl : public AppDataChangeListener { const struct PipeInfo &id) const override; }; void AppDataChangeListenerImpl::OnMessage(const OHOS::AppDistributedKv::DeviceInfo &info, - const uint8_t *ptr, const int size, - const struct PipeInfo &id) const + const uint8_t *ptr, const int size, const struct PipeInfo &id) const { ZLOGI("data %{public}s %s", info.deviceName.c_str(), ptr); } -- Gitee