From 99410534e3e0a82e1e966050da0cc286944f7240 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Wed, 23 Jul 2025 19:56:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AC=E6=9C=BA=E7=AB=AF=E7=AB=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../distributed_hardware_manager_factory.cpp | 6 ++- .../accessmanager/access_manager_test.cpp | 49 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index 44b909d0..7a7df2b1 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -193,8 +193,10 @@ int32_t DistributedHardwareManagerFactory::SendOnLineEvent(const std::string &ne } if (DeviceParamMgr::GetInstance().IsDeviceE2ESync()) { - DHLOGI("e2e device, need initiative sync data."); - MetaInfoManager::GetInstance()->SyncDataByNetworkId(networkId); + if (osType != OLD_HO_DEVICE_TYPE && osType != NEW_HO_DEVICE_TYPE) { + DHLOGI("local device is e2e device and remote is single frame device, need initiative sync data."); + MetaInfoManager::GetInstance()->SyncDataByNetworkId(networkId); + } } if (osType == OLD_HO_DEVICE_TYPE || osType == NEW_HO_DEVICE_TYPE) { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 2aab85bf..c9f26cbf 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -22,6 +22,8 @@ #include "dh_context.h" #include "distributed_hardware_manager_factory.h" #include "distributed_hardware_errno.h" +#include "device_param_mgr.h" + using namespace testing::ext; namespace OHOS { @@ -34,6 +36,8 @@ enum class Status : uint32_t { constexpr uint16_t TEST_DEV_TYPE_PAD = 0x11; constexpr int32_t INVALID_OSTYPE = 10; +constexpr int32_t OLD_HO_DEVICE_TYPE = -1; +constexpr int32_t NEW_HO_DEVICE_TYPE = 11; const std::string TEST_NETWORKID = "111111"; const std::string TEST_UUID = "222222"; const std::string TEST_UDID = "333333"; @@ -238,5 +242,50 @@ HWTEST_F(AccessManagerTest, InitLocalDevInfo_001, TestSize.Level1) { ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().InitLocalDevInfo()); } + +HWTEST_F(AccessManagerTest, SendOnLineEvent_002, TestSize.Level1) +{ + std::string networkId = "networkId_1"; + std::string uuid = "uuid_1"; + std::string udid = "udid_1"; + uint16_t deviceType = TEST_DEV_TYPE_PAD; + int32_t osType = OLD_HO_DEVICE_TYPE; + DistributedHardwareManagerFactory::GetInstance().flagUnInit_.store(false); + DistributedHardwareManagerFactory::GetInstance().isInit_.store(true); + DeviceParamMgr::GetInstance().isDeviceE2ESync_.store(true); + int32_t ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, udid, deviceType, osType); + EXPECT_EQ(ret, DH_FWK_SUCCESS); +} + +HWTEST_F(AccessManagerTest, SendOnLineEvent_003, TestSize.Level1) +{ + std::string networkId = "networkId_2"; + std::string uuid = "uuid_2"; + std::string udid = "udid_2"; + uint16_t deviceType = TEST_DEV_TYPE_PAD; + int32_t osType = NEW_HO_DEVICE_TYPE; + DistributedHardwareManagerFactory::GetInstance().flagUnInit_.store(false); + DistributedHardwareManagerFactory::GetInstance().isInit_.store(true); + DeviceParamMgr::GetInstance().isDeviceE2ESync_.store(true); + int32_t ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, udid, deviceType, osType); + EXPECT_EQ(ret, DH_FWK_SUCCESS); +} + +HWTEST_F(AccessManagerTest, SendOnLineEvent_004, TestSize.Level1) +{ + std::string networkId = "networkId_3"; + std::string uuid = "uuid_3"; + std::string udid = "udid_3"; + uint16_t deviceType = TEST_DEV_TYPE_PAD; + int32_t osType = INVALID_OSTYPE; + DistributedHardwareManagerFactory::GetInstance().flagUnInit_.store(false); + DistributedHardwareManagerFactory::GetInstance().isInit_.store(true); + DeviceParamMgr::GetInstance().isDeviceE2ESync_.store(true); + int32_t ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, udid, deviceType, osType); + EXPECT_EQ(ret, DH_FWK_SUCCESS); +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 216ae82aa48572ec3f9aa7b61b02f3915a38bf88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A4=A9=E5=88=9A?= Date: Mon, 28 Jul 2025 07:21:17 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20access=5Fmanager=5Ftes?= =?UTF-8?q?t.cpp=20=E5=A4=B4=E6=96=87=E4=BB=B6=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李天刚 --- .../test/unittest/common/accessmanager/access_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index c9f26cbf..4f9b6536 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -19,10 +19,10 @@ #include "dm_device_info.h" +#include "device_param_mgr.h" #include "dh_context.h" #include "distributed_hardware_manager_factory.h" #include "distributed_hardware_errno.h" -#include "device_param_mgr.h" using namespace testing::ext; -- Gitee