From 155a0d9e04e2499578534171456195bb192fc7b8 Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Fri, 29 Oct 2021 09:40:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yuqianyuan --- .../include/softbus/softbus_session.h | 4 ++-- .../src/auth/hichain_connector.cpp | 2 +- .../src/message/msg_request_auth.cpp | 12 ++++++++++-- .../src/softbus/softbus_adapter.cpp | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/services/devicemanagerservice/include/softbus/softbus_session.h b/services/devicemanagerservice/include/softbus/softbus_session.h index 71b699376..03610be2c 100644 --- a/services/devicemanagerservice/include/softbus/softbus_session.h +++ b/services/devicemanagerservice/include/softbus/softbus_session.h @@ -43,8 +43,8 @@ private: private: int32_t SendData(int32_t sessionId, const void *data, int32_t len); private: - const char *PKG_NAME = "com.huawei.devicemanager"; - const char *SESSION_NAME = "com.huawei.devicemanager.resident"; + const char *PKG_NAME = "ohos.distributedhardware.devicemanager"; + const char *SESSION_NAME = "ohos.distributedhardware.devicemanager.resident"; std::set sessionIdSet_; std::vector messages_ {}; }; diff --git a/services/devicemanagerservice/src/auth/hichain_connector.cpp b/services/devicemanagerservice/src/auth/hichain_connector.cpp index fdc68e179..88516aebd 100644 --- a/services/devicemanagerservice/src/auth/hichain_connector.cpp +++ b/services/devicemanagerservice/src/auth/hichain_connector.cpp @@ -46,7 +46,7 @@ const std::string BR_MAC = "BR_MAC"; const std::string BLE_MAC = "BLE_MAC"; const std::string ETH_IP = "ETH_IP"; const std::string ETH_PORT = "ETH_PORT"; -const std::string DEVICE_MANAGER_APP = "com.huawei.devicemanager"; +const std::string DEVICE_MANAGER_APP = "ohos.distributedhardware.devicemanager"; const std::string DEVICE_MANAGER_GROUPNAME = "DMPeerToPeerGroup"; const int64_t MIN_REQUEST_ID = 1000000000; diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp index f58a361fc..2cd8de707 100644 --- a/services/devicemanagerservice/src/message/msg_request_auth.cpp +++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp @@ -26,6 +26,7 @@ #include "msg_request_auth.h" #include "parameter.h" #include "softbus_session.h" +#include "softbus_bus_center.h" namespace OHOS { namespace DistributedHardware { @@ -47,9 +48,16 @@ MsgRequestAuth::MsgRequestAuth(std::string &token, std::string hostPkgName, std: mAuthType_ = jsonObject.contains(AUTH_TYPE) ? (int32_t)jsonObject[AUTH_TYPE] : AUTH_TYPE_QR; mHead_ = std::make_shared((mAuthType_ == AUTH_TYPE_QR) ? (DmMsgType::MSG_TYPE_REQ_AUTH) : (DmMsgType::MSG_TYPE_AUTH_BY_PIN)); + std::string deviceManagerPkgName = "ohos.distributedhardware.devicemanager"; + NodeBasicInfo localBasicInfo; + int32_t ret = GetLocalNodeDeviceInfo(deviceManagerPkgName.c_str(), &localBasicInfo); + if (ret != 0) { + DMLOG(DM_LOG_ERROR, "GetLocalNodeDeviceInfo err: %d", ret); + return; + } + mDeviceName_ = localBasicInfo.deviceName; char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); - mDeviceName_ = devReqInfo.deviceName; mDeviceId_ = localDeviceId; mToken_ = token; mHostPkg_ = hostPkgName; @@ -60,7 +68,7 @@ MsgRequestAuth::MsgRequestAuth(std::string &token, std::string hostPkgName, std: mImageInfo_ = imageInfo; mThumbnailSize_ = mImageInfo_.GetAppThumbnailLen(); mAppIconSize_ = mImageInfo_.GetAppIconLen(); - mDeviceType_ = ToHexString(devReqInfo.deviceTypeId); + mDeviceType_ = ToHexString(localBasicInfo.deviceTypeId); DMLOG(DM_LOG_INFO, "MsgRequestAuth construction completed"); } diff --git a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp index 4db2ad209..f5da3a1a3 100644 --- a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp +++ b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp @@ -37,7 +37,7 @@ namespace OHOS { namespace DistributedHardware { namespace { -const std::string DEVICE_MANAGER_PACKAGE_NAME = "com.huawei.devicemanager"; +const std::string DEVICE_MANAGER_PACKAGE_NAME = "ohos.distributedhardware.devicemanager"; const char *DM_CAPABILITY_OSD = "osdCapability"; const int32_t CHECK_INTERVAL = 100000; // 100ms const uint32_t SUBSCRIBE_ID_PREFIX_LEN = 16; -- Gitee From 99b713bf1bc76c5de76637eb46db9b3ee4c396d4 Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Sat, 30 Oct 2021 17:02:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=B4=E6=96=87?= =?UTF-8?q?=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: yuqianyuan --- services/devicemanagerservice/src/message/msg_request_auth.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp index 2cd8de707..d902d86fa 100644 --- a/services/devicemanagerservice/src/message/msg_request_auth.cpp +++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp @@ -16,7 +16,6 @@ #include #include -#include "msg_request_auth.h" #include "device_manager_log.h" #include "constants.h" #include "encrypt_utils.h" @@ -27,6 +26,7 @@ #include "parameter.h" #include "softbus_session.h" #include "softbus_bus_center.h" +#include "msg_request_auth.h" namespace OHOS { namespace DistributedHardware { -- Gitee