From 937530e7fc7a11ed512556bcd21f339b0fb8d07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=B3=E4=B8=8D=E5=87=BA=E5=88=AB=E5=90=8D?= Date: Fri, 24 Sep 2021 15:43:59 +0800 Subject: [PATCH 1/2] code style & bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- .../inner_kits/native_cpp/include/dm_app_image_info.h | 2 +- interfaces/kits/js/src/native_devicemanager_js.cpp | 2 +- services/devicemanagerservice/include/timer/dm_timer.h | 1 - .../src/ipc/standard/ipc_server_stub.cpp | 8 +++++--- .../devicemanagerservice/src/message/msg_request_auth.cpp | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h index d98d9b791..9fbccd7d6 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h @@ -68,7 +68,7 @@ public: return -1; } - if (memcpy_s(appThumbnail + copyIndex, appThumbnailLen - copyLen, srcBuffer, copyLen) != 0) { + if (memcpy_s(appThumbnail + copyIndex, appThumbnailLen - copyIndex, srcBuffer, copyLen) != 0) { return -1; } diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 67bd749b0..3629332c0 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -392,7 +392,7 @@ void DeviceManagerNapi::DmAuthParamToJsAuthParamy(const napi_env &env, napi_create_arraybuffer(env, appIconLen, &appIcon, &appIconBuffer); if (appIcon != nullptr && memcpy_s(appIcon, appIconLen, reinterpret_cast(authParam.imageinfo.GetAppIcon()), - appIconLen) == 0) { + appIconLen) == 0) { napi_value appIconArray = nullptr; napi_create_typedarray(env, napi_uint8_array, appIconLen, appIconBuffer, 0, &appIconArray); napi_set_named_property(env, paramResult, "appIcon", appIconArray); diff --git a/services/devicemanagerservice/include/timer/dm_timer.h b/services/devicemanagerservice/include/timer/dm_timer.h index f0deba4a7..61b763e99 100644 --- a/services/devicemanagerservice/include/timer/dm_timer.h +++ b/services/devicemanagerservice/include/timer/dm_timer.h @@ -29,7 +29,6 @@ namespace OHOS { namespace DistributedHardware { - typedef void (*TimeoutHandle)(void *data); #define MAXEVENTS 255 diff --git a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp index c259394f5..7cf317ccd 100644 --- a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp +++ b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp @@ -69,9 +69,11 @@ bool IpcServerStub::Init() registerToService_ = true; } - std::thread {[] { - IpcServerAdapter::GetInstance().ModuleInit(); - }}.detach(); + std::thread { + [] { + IpcServerAdapter::GetInstance().ModuleInit(); + } + }.detach(); return true; } diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp index ef3ede248..88ed64aab 100644 --- a/services/devicemanagerservice/src/message/msg_request_auth.cpp +++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp @@ -45,8 +45,8 @@ 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); + mHead_ = std::make_shared((mAuthType_ == AUTH_TYPE_QR) ? (DmMsgType::MSG_TYPE_REQ_AUTH) : + (DmMsgType::MSG_TYPE_AUTH_BY_PIN)); char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); mDeviceName_ = devReqInfo.deviceName; -- Gitee From bfa5f5b5de9b0105436e866d00bec490bb9436d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=B3=E4=B8=8D=E5=87=BA=E5=88=AB=E5=90=8D?= Date: Fri, 24 Sep 2021 20:14:08 +0800 Subject: [PATCH 2/2] code style & bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- .../devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp index ad2141de8..7fe96002c 100644 --- a/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp +++ b/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp @@ -74,6 +74,9 @@ int32_t IpcServerListener::SendAll(int32_t cmdCode, std::shared_ptr req, SvcIdentity svc; IpcIo io; uint8_t data[MAX_DM_IPC_LEN] = {0}; + std::string pkgName = kv.first; + + req->SetPkgName(pkgName); if (IpcCmdRegister::GetInstance().SetRequest(cmdCode, req, io, data, MAX_DM_IPC_LEN) != DEVICEMANAGER_OK) { DMLOG(DM_LOG_DEBUG, "SetRequest failed cmdCode:%d", cmdCode); continue; -- Gitee