diff --git a/interfaces/kits/js/include/native_devicemanager_js.h b/interfaces/kits/js/include/native_devicemanager_js.h index 6b0883f8..3efde146 100644 --- a/interfaces/kits/js/include/native_devicemanager_js.h +++ b/interfaces/kits/js/include/native_devicemanager_js.h @@ -25,7 +25,7 @@ #include "dm_native_event.h" #include "dm_subscribe_info.h" #include "dm_anonymous.h" -#include "errormessage/errormessage.h" +#include "dm_error_message.h" #include "napi/native_api.h" #include "napi/native_node_api.h" #include "nlohmann/json.hpp" @@ -312,7 +312,5 @@ private: std::string bundleName_; static AuthAsyncCallbackInfo authAsyncCallbackInfo_; static AuthAsyncCallbackInfo verifyAsyncCallbackInfo_; - std::shared_ptr errorMessage_ = - std::make_shared(); }; #endif // OHOS_DM_NATIVE_DEVICEMANAGER_JS_H diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index b4cb83bc..05042785 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -489,7 +489,7 @@ void DeviceManagerNapi::OnDiscoveryFailed(uint16_t subscribeId, int32_t failedRe napi_create_object(env_, &result); SetValueInt32(env_, "subscribeId", (int)subscribeId, result); SetValueInt32(env_, "reason", (int)failedReason, result); - std::string errCodeInfo = errorMessage_->GetErrorString((int)failedReason); + std::string errCodeInfo = OHOS::DistributedHardware::GetErrorString((int)failedReason); SetValueUtf8String(env_, "errInfo", errCodeInfo, result); OnEvent("discoverFail", DM_NAPI_ARGS_ONE, &result); } @@ -512,7 +512,7 @@ void DeviceManagerNapi::OnAuthResult(const std::string &deviceId, const std::str napi_create_object(env_, &result[0]); SetValueInt32(env_, "code", status, result[0]); SetValueInt32(env_, "reason", reason, result[0]); - std::string errCodeInfo = errorMessage_->GetErrorString((int)reason); + std::string errCodeInfo = OHOS::DistributedHardware::GetErrorString((int)reason); SetValueUtf8String(env_, "errInfo", errCodeInfo, result[0]); napi_get_undefined(env_, &result[1]); } diff --git a/utils/BUILD.gn b/utils/BUILD.gn index bf4fb711..a938e8ff 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -37,14 +37,14 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//third_party/bounds_checking_function/include", "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//utils/include/errormessage", + "//utils/include/dm_error_message", ] sources = [ "${utils_path}/src/dm_anonymous.cpp", + "${utils_path}/src/dm_error_message.cpp", "${utils_path}/src/dm_log.cpp", "${utils_path}/src/dm_random.cpp", - "${utils_path}/src/errormessage/errormessage.cpp", "${utils_path}/src/permission/lite/permission_manager.cpp", ] @@ -90,13 +90,13 @@ if (defined(ohos_lite)) { "//foundation/communication/dsoftbus/interfaces/kits/transport", "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//utils/include/errormessage", + "//utils/include/dm_error_message", ] sources = [ "src/dm_anonymous.cpp", + "src/dm_error_message.cpp", "src/dm_log.cpp", "src/dm_random.cpp", - "src/errormessage/errormessage.cpp", "src/fwkload/lite/dm_distributed_hardware_load.cpp", "src/ipc/lite/ipc_cmd_register.cpp", "src/permission/lite/permission_manager.cpp", @@ -129,17 +129,17 @@ if (defined(ohos_lite)) { "${common_path}/include/ipc/model", "include/permission/standard", "//third_party/mbedtls/include/mbedtls", - "//utils/include/errormessage", + "//utils/include/dm_error_message", ] } ohos_shared_library("devicemanagerutils") { sources = [ "src/dm_anonymous.cpp", + "src/dm_error_message.cpp", "src/dm_hash.cpp", "src/dm_log.cpp", "src/dm_random.cpp", - "src/errormessage/errormessage.cpp", "src/ipc/standard/ipc_cmd_register.cpp", ] if (support_jsapi) { diff --git a/utils/include/errormessage/errormessage.h b/utils/include/dm_error_message.h similarity index 62% rename from utils/include/errormessage/errormessage.h rename to utils/include/dm_error_message.h index 86774958..52e22059 100644 --- a/utils/include/errormessage/errormessage.h +++ b/utils/include/dm_error_message.h @@ -16,34 +16,13 @@ #ifndef OHOS_DM_ERROMSG_H #define OHOS_DM_ERROMSG_H -#include #include #include "dm_log.h" #include "dm_constants.h" namespace OHOS { namespace DistributedHardware { -class ErrorMessage { -public: - /** - * @tc.name: ErrorMessage::ErrorMessage - * @tc.desc: Dm Error Message Info Constructor. - * @tc.type: FUNC - */ - ErrorMessage(); - /** - * @tc.name: ErrorMessage::~ErrorMessage - * @tc.desc: Dm Error Message Info destructor. - * @tc.type: FUNC - */ - virtual ~ErrorMessage(); - /** - * @tc.name: ErrorMessage::GetErrorString - * @tc.desc: Get Error String. - * @tc.type: FUNC - */ - std::string GetErrorString(int); -}; +std::string GetErrorString(int failedReason); } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DM_ERROMSG_H diff --git a/utils/src/dm_error_message.cpp b/utils/src/dm_error_message.cpp new file mode 100644 index 00000000..d9e24471 --- /dev/null +++ b/utils/src/dm_error_message.cpp @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_error_message.h" + +namespace OHOS { +namespace DistributedHardware { +typedef struct ERROR_INFO +{ + int errCode; + std::string errMsg; +}ERROR_INFO; + +static ERROR_INFO g_errorMessages[] = +{ + {ERR_DM_FAILED, DM_FAILED_INFO}, + {ERR_DM_TIME_OUT, DM_TIME_OUT_INFO}, + {ERR_DM_NOT_INIT, DM_NOT_INIT_INFO}, + {ERR_DM_INIT_REPEATED, DM_INIT_REPEATED_INFO}, + {ERR_DM_INIT_FAILED, DM_INIT_FAILED_INFO}, + {ERR_DM_UNINIT_FAILED, DM_UNINIT_FAILED_INFO}, + {ERR_DM_POINT_NULL, DM_POINT_NULL_INFO}, + {ERR_DM_INPUT_PARAMETER_EMPTY, DM_INPUT_PARAMETER_EMPTY_INFO}, + {ERR_DM_NO_PERMISSION, DM_NO_PERMISSION_INFO}, + {ERR_DM_MALLOC_FAILED, DM_MALLOC_FAILED_INFO}, + {ERR_DM_DISCOVERY_FAILED, DM_DISCOVERY_FAILED_INFO}, + {ERR_DM_MAP_KEY_ALREADY_EXISTS, DM_MAP_KEY_ALREADY_EXISTS_INFO}, + {DM_PROFILE_EVENTS_FAILED, DM_PROFILE_EVENTS_FAILED_INFO}, + {ERR_DM_IPC_WRITE_FAILED, DM_IPC_WRITE_FAILED_INFO}, + {ERR_DM_IPC_COPY_FAILED, DM_IPC_COPY_FAILED_INFO}, + {ERR_DM_IPC_SEND_REQUEST_FAILED, DM_IPC_SEND_REQUEST_FAILED_INFO}, + {ERR_DM_UNSUPPORTED_IPC_COMMAND, DM_UNSUPPORTED_IPC_COMMAND_INFO}, + {ERR_DM_IPC_RESPOND_FAILED, DM_IPC_RESPOND_FAILED_INFO}, + {ERR_DM_IPC_WRITE_TOKEN_FAILED, DM_IPC_WRITE_TOKEN_INFO}, + {ERR_DM_DISCOVERY_REPEATED, DM_DISCOVERY_REPEATED_INFO}, + {ERR_DM_UNSUPPORTED_AUTH_TYPE, DM_UNSUPPORTED_AUTH_TYPE_INFO}, + {ERR_DM_AUTH_BUSINESS_BUSY, DM_AUTH_BUSINESS_BUSY_INFO}, + {ERR_DM_AUTH_OPEN_SESSION_FAILED, DM_AUTH_OPEN_SESSION_FAILED_INFO}, + {ERR_DM_AUTH_PEER_REJECT, DM_AUTH_PEER_REJECT_INFO}, + {ERR_DM_AUTH_REJECT, DM_AUTH_REJECT_INFO}, + {ERR_DM_AUTH_FAILED, DM_AUTH_FAILED_INFO}, + {ERR_DM_AUTH_NOT_START, DM_AUTH_NOT_START_INFO}, + {ERR_DM_AUTH_MESSAGE_INCOMPLETE, DM_AUTH_MESSAGE_INCOMPLETE_INFO}, + {ERR_DM_CREATE_GROUP_FAILED, DM_CREATE_GROUP_FAILED_INFO}, +}; + +std::string GetErrorString(int failedReason) +{ + std::string g_errorMessage = "dm process execution failed."; + for (int i =0; i