From f74f1bd9ceab5affaefb006d1da200a7bc6fe739 Mon Sep 17 00:00:00 2001 From: wangyb0625 Date: Thu, 24 Mar 2022 18:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=BA=90=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyb0625 --- .../src/ipc/lite/ipc_client_stub.cpp | 4 +--- .../include/authentication/dm_auth_manager.h | 2 +- .../dependency/hichain/hichain_connector.h | 12 +++++------ .../src/authentication/dm_auth_manager.cpp | 2 +- .../dependency/hichain/hichain_connector.cpp | 21 +++++++++---------- .../src/dependency/mini/dm_mutex.cpp | 2 +- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp b/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp index 3549f3e2a..d692823ea 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp @@ -35,9 +35,7 @@ static int32_t ClientIpcInterfaceMsgHandle(const IpcContext *ctx, void *ipcMsg, uint32_t code = 0; GetCode(ipcMsg, &code); - int32_t errCode = DM_OK; - - errCode = IpcCmdRegister::GetInstance().OnIpcCmd(code, *io); + int32_t errCode = IpcCmdRegister::GetInstance().OnIpcCmd(code, *io); LOGI("receive ipc transact code:%u, retCode=%d", code, errCode); FreeBuffer(ctx, ipcMsg); return errCode; diff --git a/services/devicemanagerservice/include/authentication/dm_auth_manager.h b/services/devicemanagerservice/include/authentication/dm_auth_manager.h index 087370127..cbbf5a0a4 100644 --- a/services/devicemanagerservice/include/authentication/dm_auth_manager.h +++ b/services/devicemanagerservice/include/authentication/dm_auth_manager.h @@ -131,7 +131,7 @@ public: int32_t UnAuthenticateDevice(const std::string &pkgName, const std::string &deviceId); int32_t VerifyAuthentication(const std::string &authParam); void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result); - void OnSessionClosed(int32_t sessionId); + void OnSessionClosed(const int32_t sessionId); void OnDataReceived(int32_t sessionId, std::string message); void OnGroupCreated(int64_t requestId, const std::string &groupId); void OnMemberJoin(int64_t requestId, int32_t status); diff --git a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h index d48e2228d..6e6991d6c 100644 --- a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h +++ b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h @@ -56,14 +56,14 @@ public: int32_t RegisterHiChainCallback(std::shared_ptr callback); int32_t UnRegisterHiChainCallback(); int32_t CreateGroup(int64_t requestId, const std::string &groupName); - int32_t AddMember(std::string deviceId, std::string &connectInfo); - int32_t DelMemberFromGroup(std::string groupId, std::string deviceId); + int32_t AddMember(const std::string &deviceId, const std::string &connectInfo); + int32_t DelMemberFromGroup(const std::string &groupId, const std::string &deviceId); int32_t DeleteGroup(std::string &groupId); int32_t DeleteGroup(const int32_t userId, std::string &groupId); - bool IsDevicesInGroup(std::string hostDevice, std::string peerDevice); - int32_t GetRelatedGroups(std::string DeviceId, std::vector &groupList); - int32_t GetGroupInfo(std::string queryParams, std::vector &groupList); - int32_t GetGroupInfo(const int32_t userId, std::string queryParams, std::vector &groupList); + bool IsDevicesInGroup(const std::string &hostDevice, const std::string &peerDevice); + int32_t GetRelatedGroups(const std::string &DeviceId, std::vector &groupList); + int32_t GetGroupInfo(const std::string &queryParams, std::vector &groupList); + int32_t GetGroupInfo(const int32_t userId, const std::string &queryParams, std::vector &groupList); int32_t DeleteTimeOutGroup(const char* deviceId); private: int64_t GenRequestId(); diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp index 0ef2165d3..49c3591ee 100644 --- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp +++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp @@ -241,7 +241,7 @@ void DmAuthManager::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int3 } } -void DmAuthManager::OnSessionClosed(int32_t sessionId) +void DmAuthManager::OnSessionClosed(const int32_t sessionId) { LOGI("DmAuthManager::OnSessionOpened sessionId=%d", sessionId); } diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index 33a3b3f61..8353d4bbb 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -139,7 +139,7 @@ bool HiChainConnector::IsGroupCreated(std::string groupName, GroupInfo &groupInf return false; } -int32_t HiChainConnector::GetGroupInfo(std::string queryParams, std::vector &groupList) +int32_t HiChainConnector::GetGroupInfo(const std::string &queryParams, std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; @@ -178,7 +178,8 @@ int32_t HiChainConnector::GetGroupInfo(std::string queryParams, std::vector &groupList) +int32_t HiChainConnector::GetGroupInfo(const int32_t userId, const std::string &queryParams, + std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; @@ -212,7 +213,7 @@ int32_t HiChainConnector::GetGroupInfo(const int32_t userId, std::string queryPa return true; } -int32_t HiChainConnector::AddMember(std::string deviceId, std::string &connectInfo) +int32_t HiChainConnector::AddMember(const std::string &deviceId, const std::string &connectInfo) { LOGI("HiChainConnector::AddMember"); if (deviceGroupManager_ == nullptr) { @@ -299,8 +300,7 @@ char *HiChainConnector::onRequest(int64_t requestId, int operationCode, const ch LOGE("HiChainAuthCallBack::onRequest operationCode %d", operationCode); return nullptr; } - int32_t pinCode = 0; - pinCode = hiChainConnectorCallback_->GetPinCode(); + int32_t pinCode = hiChainConnectorCallback_->GetPinCode(); nlohmann::json jsonObj; if (pinCode == DM_FAILED) { jsonObj[FIELD_CONFIRMATION] = REQUEST_REJECTED; @@ -324,8 +324,7 @@ int64_t HiChainConnector::GenRequestId() std::string HiChainConnector::GetConnectPara(std::string deviceId, std::string reqDeviceId) { - std::string connectAddr = ""; - connectAddr = hiChainConnectorCallback_->GetConnectAddr(deviceId); + std::string connectAddr = hiChainConnectorCallback_->GetConnectAddr(deviceId); LOGE("HiChainConnector::GetConnectPara get addrInfo"); nlohmann::json jsonObject = nlohmann::json::parse(connectAddr, nullptr, false); if (jsonObject.is_discarded()) { @@ -337,7 +336,7 @@ std::string HiChainConnector::GetConnectPara(std::string deviceId, std::string r return jsonObject.dump(); } -int32_t HiChainConnector::GetRelatedGroups(std::string deviceId, std::vector &groupList) +int32_t HiChainConnector::GetRelatedGroups(const std::string &deviceId, std::vector &groupList) { LOGI("HiChainConnector::GetRelatedGroups Start to get local related groups."); uint32_t groupNum = 0; @@ -368,7 +367,7 @@ int32_t HiChainConnector::GetRelatedGroups(std::string deviceId, std::vector groupInfos = jsonObject.get>(); - if (groupInfos.size() == 0) { + if (groupInfos.empty()) { LOGE("HiChainConnector::GetRelatedGroups group failed, groupInfos is empty."); return DM_FAILED; } @@ -391,7 +390,7 @@ int32_t HiChainConnector::GetSyncGroupList(std::vector &groupList, st return DM_OK; } -bool HiChainConnector::IsDevicesInGroup(std::string hostDevice, std::string peerDevice) +bool HiChainConnector::IsDevicesInGroup(const std::string &hostDevice, const std::string &peerDevice) { LOGE("HiChainConnector::IsDevicesInGroup"); std::vector hostGroupInfoList; @@ -434,7 +433,7 @@ int32_t HiChainConnector::SyncGroups(std::string deviceId, std::vector