From 0245fab37752a2655dd1d044a3da6e25ab53becb Mon Sep 17 00:00:00 2001 From: q30043944 Date: Thu, 10 Jul 2025 10:02:02 +0800 Subject: [PATCH] =?UTF-8?q?ostype=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: q30043944 --- common/include/dm_constants.h | 3 ++- common/src/dm_constants.cpp | 3 ++- .../inner_kits/native_cpp/src/device_manager_impl.cpp | 10 +++++----- services/service/src/device_manager_service.cpp | 3 ++- utils/src/kvadapter/kv_adapter.cpp | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index 901a30b7a..cdbece3c1 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -200,7 +200,8 @@ extern const char* DM_VERSION_5_1_2; extern const char* DM_CURRENT_VERSION; extern const char* DM_ACL_AGING_VERSION; extern const char* DM_VERSION_5_0_OLD_MAX; // Estimated highest version number of the old version -extern const int32_t DM_HO_OSTYPE; +extern const int32_t OLD_DM_HO_OSTYPE; +extern const int32_t NEW_DM_HO_OSTYPE; extern const int32_t DM_OH_OSTYPE; extern const char* PEER_UDID; extern const char* PEER_OSTYPE; diff --git a/common/src/dm_constants.cpp b/common/src/dm_constants.cpp index 5a2632e9d..e6ea1205f 100644 --- a/common/src/dm_constants.cpp +++ b/common/src/dm_constants.cpp @@ -188,7 +188,8 @@ const char* DM_VERSION_5_1_2 = "5.1.2"; const char* DM_CURRENT_VERSION = DM_VERSION_5_1_2; const char* DM_ACL_AGING_VERSION = DM_VERSION_5_1_0; const char* DM_VERSION_5_0_OLD_MAX = "5.0.99"; // Estimated highest version number of the old version -const int32_t DM_HO_OSTYPE = -1; +const int32_t OLD_DM_HO_OSTYPE = -1; +const int32_t NEW_DM_HO_OSTYPE = 11; const int32_t DM_OH_OSTYPE = 10; const char* PEER_UDID = "peer_udid"; const char* PEER_OSTYPE = "peer_ostype"; diff --git a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp index 0b2bfebae..2093b0d85 100644 --- a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp +++ b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp @@ -415,8 +415,8 @@ int32_t DeviceManagerImpl::RegisterDevStateCallback(const std::string &pkgName, return ret; } #endif - SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName); DeviceManagerNotify::GetInstance().RegisterDeviceStateCallback(pkgName, callback); + SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName); DmRadarHelper::GetInstance().ReportDmBehavior(pkgName, "RegisterDevStateCallback", DM_OK, anonyLocalUdid_); LOGI("Completed"); return DM_OK; @@ -432,8 +432,8 @@ int32_t DeviceManagerImpl::RegisterDevStatusCallback(const std::string &pkgName, return ERR_DM_INPUT_PARA_INVALID; } LOGI("Start, pkgName: %{public}s", pkgName.c_str()); - SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName); DeviceManagerNotify::GetInstance().RegisterDeviceStatusCallback(pkgName, callback); + SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName); DmRadarHelper::GetInstance().ReportDmBehavior(pkgName, "RegisterDevStatusCallback", DM_OK, anonyLocalUdid_); LOGI("Completed"); return DM_OK; @@ -2318,8 +2318,8 @@ int32_t DeviceManagerImpl::RegDevTrustChangeCallback(const std::string &pkgName, return ERR_DM_INPUT_PARA_INVALID; } LOGI("PkgName %{public}s.", pkgName.c_str()); - SyncCallbackToService(DmCommonNotifyEvent::REG_REMOTE_DEVICE_TRUST_CHANGE, pkgName); DeviceManagerNotify::GetInstance().RegDevTrustChangeCallback(pkgName, callback); + SyncCallbackToService(DmCommonNotifyEvent::REG_REMOTE_DEVICE_TRUST_CHANGE, pkgName); DmRadarHelper::GetInstance().ReportDmBehavior(pkgName, "RegDevTrustChangeCallback", DM_OK, anonyLocalUdid_); return DM_OK; } @@ -2331,8 +2331,8 @@ int32_t DeviceManagerImpl::RegisterDeviceScreenStatusCallback(const std::string LOGE("Error: Invalid para"); return ERR_DM_INPUT_PARA_INVALID; } - SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_SCREEN_STATE, pkgName); DeviceManagerNotify::GetInstance().RegisterDeviceScreenStatusCallback(pkgName, callback); + SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_SCREEN_STATE, pkgName); LOGI("Completed, pkgName: %{public}s", pkgName.c_str()); return DM_OK; } @@ -2415,8 +2415,8 @@ int32_t DeviceManagerImpl::RegisterCredentialAuthStatusCallback(const std::strin LOGE("Error: Invalid para"); return ERR_DM_INPUT_PARA_INVALID; } - SyncCallbackToService(DmCommonNotifyEvent::REG_CREDENTIAL_AUTH_STATUS_NOTIFY, pkgName); DeviceManagerNotify::GetInstance().RegisterCredentialAuthStatusCallback(pkgName, callback); + SyncCallbackToService(DmCommonNotifyEvent::REG_CREDENTIAL_AUTH_STATUS_NOTIFY, pkgName); LOGI("Completed, pkgName: %{public}s", pkgName.c_str()); return DM_OK; } diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 4b66bb655..968256723 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -4436,7 +4436,8 @@ void DeviceManagerService::GetHoOsTypeUdids(std::vector &peerUdids) LOGE("osTypeObj value invalid."); continue; } - if (osTypeObj[PEER_OSTYPE].Get() == DM_HO_OSTYPE) { + if (osTypeObj[PEER_OSTYPE].Get() == OLD_DM_HO_OSTYPE || + osTypeObj[PEER_OSTYPE].Get() == NEW_DM_HO_OSTYPE) { peerUdids.push_back(osTypeObj[PEER_UDID].Get()); } } diff --git a/utils/src/kvadapter/kv_adapter.cpp b/utils/src/kvadapter/kv_adapter.cpp index 7c7495bb0..f0b8d0a53 100644 --- a/utils/src/kvadapter/kv_adapter.cpp +++ b/utils/src/kvadapter/kv_adapter.cpp @@ -42,8 +42,8 @@ namespace { constexpr int32_t INIT_RETRY_SLEEP_INTERVAL = 200 * 1000; // 200ms constexpr uint32_t DM_OSTYPE_PREFIX_LEN = 16; const char* PEER_UDID = "peer_udid"; - const char* PEER_OSTYPE = "peer_os_type"; - const char* TIME_STAMP = "timestamp"; + const char* PEER_OSTYPE = "peer_ostype"; + const char* TIME_STAMP = "time_stamp"; } int32_t KVAdapter::Init() -- Gitee