From b05c71db104918763a481243e17309529e568b85 Mon Sep 17 00:00:00 2001 From: xinking129 Date: Sat, 23 Mar 2024 14:58:14 +0800 Subject: [PATCH] modify frameworks/js/napi Signed-off-by: xinking129 --- .../napi_common/napi_common_configuration.cpp | 30 +- .../napi_common/napi_common_execute_param.cpp | 23 +- .../napi_common_execute_result.cpp | 15 +- .../napi_common/napi_common_start_options.cpp | 23 +- .../inner/napi_common/napi_common_util.cpp | 77 +-- .../inner/napi_common/napi_common_want.cpp | 44 +- .../js_dialog_request/js_dialog_request.cpp | 35 +- .../js_dialog_request_callback.cpp | 29 +- .../js_dialog_session/js_dialog_session.cpp | 23 +- .../js_mission_info_utils.cpp | 5 +- .../js_mission_listener.cpp | 25 +- .../js_mission_manager/mission_manager.cpp | 127 ++--- .../distributed_mission_manager.cpp | 492 +++++++++--------- .../mission_manager/js_mission_info_utils.cpp | 11 +- .../mission_manager/js_mission_listener.cpp | 23 +- .../mission_manager/mission_continue_stub.cpp | 9 +- .../napi/mission_manager/mission_manager.cpp | 73 +-- .../napi/quick_fix/js_quick_fix_manager.cpp | 43 +- .../napi/uri_permission/js_uri_perm_mgr.cpp | 27 +- .../js/napi/wantConstant/want_constant.cpp | 7 +- .../ability_want_agent/want_agent_module.cpp | 13 +- .../js/napi/wantagent/napi_want_agent.cpp | 233 +++++---- 22 files changed, 707 insertions(+), 680 deletions(-) diff --git a/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp b/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp index fdbb85f454..af62ddc4d1 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -16,6 +16,7 @@ #include "napi_common_configuration.h" #include "configuration_convertor.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "napi_common_util.h" @@ -34,7 +35,8 @@ bool InnerWrapConfigurationString( napi_env env, napi_value jsObject, const std::string &key, const std::string &value) { if (!value.empty()) { - HILOG_INFO("%{public}s called. key=%{public}s, value=%{private}s", __func__, key.c_str(), value.c_str()); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called. key=%{public}s, value=%{private}s", + __func__, key.c_str(), value.c_str()); napi_value jsValue = WrapStringToJS(env, value); if (jsValue != nullptr) { NAPI_CALL_BASE(env, napi_set_named_property(env, jsObject, key.c_str(), jsValue), false); @@ -46,7 +48,7 @@ bool InnerWrapConfigurationString( napi_value WrapConfiguration(napi_env env, const AppExecFwk::Configuration &configuration) { - HILOG_DEBUG("called, config size %{public}d", static_cast(configuration.GetItemSize())); + TAG_LOGD(AAFwkTag::JSNAPI, "called, config size %{public}d", static_cast(configuration.GetItemSize())); napi_value jsObject = nullptr; NAPI_CALL(env, napi_create_object(env, &jsObject)); @@ -88,40 +90,40 @@ napi_value WrapConfiguration(napi_env env, const AppExecFwk::Configuration &conf bool UnwrapConfiguration(napi_env env, napi_value param, Configuration &config) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); if (!IsTypeForNapiValue(env, param, napi_object)) { - HILOG_INFO("%{public}s called. Params is invalid.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called. Params is invalid.", __func__); return false; } std::string language {""}; if (UnwrapStringByPropertyName(env, param, "language", language)) { - HILOG_DEBUG("The parsed language part %{public}s", language.c_str()); + TAG_LOGD(AAFwkTag::JSNAPI, "The parsed language part %{public}s", language.c_str()); if (!config.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE, language)) { - HILOG_ERROR("language Parsing failed"); + TAG_LOGE(AAFwkTag::JSNAPI, "language Parsing failed"); return false; } } int32_t colormode = -1; if (UnwrapInt32ByPropertyName(env, param, "colorMode", colormode)) { - HILOG_DEBUG("The parsed colormode part %{public}d", colormode); + TAG_LOGD(AAFwkTag::JSNAPI, "The parsed colormode part %{public}d", colormode); if (colormode != Global::Resource::DARK && colormode != Global::Resource::LIGHT) { - HILOG_ERROR("Set colorMode to unsupported value."); + TAG_LOGE(AAFwkTag::JSNAPI, "Set colorMode to unsupported value."); return false; } if (!config.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE, GetColorModeStr(colormode))) { - HILOG_ERROR("colorMode parsing failed"); + TAG_LOGE(AAFwkTag::JSNAPI, "colorMode parsing failed"); return false; } } double fontSizeScale = 0.0; if (UnwrapDoubleByPropertyName(env, param, "fontSizeScale", fontSizeScale)) { - HILOG_DEBUG("The parsed fontSizeScale part %{public}lf", fontSizeScale); + TAG_LOGD(AAFwkTag::JSNAPI, "The parsed fontSizeScale part %{public}lf", fontSizeScale); if (fontSizeScale < FONT_SIZE_MIN_SCALE || fontSizeScale > FONT_SIZE_MAX_SCALE) { - HILOG_ERROR("invalid fontSizeScale"); + TAG_LOGE(AAFwkTag::JSNAPI, "invalid fontSizeScale"); return false; } if (!config.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_SIZE_SCALE, std::to_string(fontSizeScale))) { @@ -131,9 +133,9 @@ bool UnwrapConfiguration(napi_env env, napi_value param, Configuration &config) double fontWeightScale = 0.0; if (UnwrapDoubleByPropertyName(env, param, "fontWeightScale", fontWeightScale)) { - HILOG_DEBUG("The parsed fontWeightScale part %{public}lf", fontWeightScale); + TAG_LOGD(AAFwkTag::JSNAPI, "The parsed fontWeightScale part %{public}lf", fontWeightScale); if (fontWeightScale < FONT_WEIGHT_MIN_SCALE || fontWeightScale > FONT_WEIGHT_MAX_SCALE) { - HILOG_ERROR("invalid fontWeightScale"); + TAG_LOGE(AAFwkTag::JSNAPI, "invalid fontWeightScale"); return false; } if (!config.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_WEIGHT_SCALE, std::to_string(fontWeightScale))) { diff --git a/frameworks/js/napi/inner/napi_common/napi_common_execute_param.cpp b/frameworks/js/napi/inner/napi_common/napi_common_execute_param.cpp index e32ae878f5..0a41e2c286 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_execute_param.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_execute_param.cpp @@ -15,6 +15,7 @@ #include "napi_common_execute_param.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "napi_common_util.h" #include "napi_common_want.h" @@ -25,34 +26,34 @@ using namespace OHOS::AppExecFwk; bool UnwrapExecuteParam(napi_env env, napi_value param, InsightIntentExecuteParam &executeParam) { if (!IsTypeForNapiValue(env, param, napi_object)) { - HILOG_ERROR("Params is invalid."); + TAG_LOGE(AAFwkTag::JSNAPI, "Params is invalid."); return false; } std::string bundleName {""}; if (!UnwrapStringByPropertyName(env, param, "bundleName", bundleName)) { - HILOG_ERROR("Wrong argument type bundleName."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type bundleName."); return false; } executeParam.bundleName_ = bundleName; std::string moduleName {""}; if (!UnwrapStringByPropertyName(env, param, "moduleName", moduleName)) { - HILOG_ERROR("Wrong argument type moduleName."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type moduleName."); return false; } executeParam.moduleName_ = moduleName; std::string abilityName {""}; if (!UnwrapStringByPropertyName(env, param, "abilityName", abilityName)) { - HILOG_ERROR("Wrong argument type abilityName."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type abilityName."); return false; } executeParam.abilityName_ = abilityName; std::string insightIntentName {""}; if (!UnwrapStringByPropertyName(env, param, "insightIntentName", insightIntentName)) { - HILOG_ERROR("Wrong argument type insightIntentName."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type insightIntentName."); return false; } executeParam.insightIntentName_ = insightIntentName; @@ -60,26 +61,26 @@ bool UnwrapExecuteParam(napi_env env, napi_value param, InsightIntentExecutePara napi_value napiIntentParam = nullptr; napi_get_named_property(env, param, "insightIntentParam", &napiIntentParam); if (napiIntentParam == nullptr) { - HILOG_ERROR("Wrong argument type insightIntentParam."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type insightIntentParam."); return false; } napi_valuetype valueType = napi_undefined; napi_typeof(env, napiIntentParam, &valueType); if (valueType != napi_object) { - HILOG_ERROR("Wrong argument type intentParam."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type intentParam."); return false; } auto wp = std::make_shared(); if (!AppExecFwk::UnwrapWantParams(env, napiIntentParam, *wp)) { - HILOG_ERROR("Wrong argument type intentParam."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type intentParam."); return false; } executeParam.insightIntentParam_ = wp; int32_t executeMode = 0; if (!UnwrapInt32ByPropertyName(env, param, "executeMode", executeMode)) { - HILOG_ERROR("Wrong argument type executeMode."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type executeMode."); return false; } executeParam.executeMode_ = executeMode; @@ -88,10 +89,10 @@ bool UnwrapExecuteParam(napi_env env, napi_value param, InsightIntentExecutePara if (executeMode == ExecuteMode::UI_ABILITY_FOREGROUND && UnwrapInt32ByPropertyName(env, param, "displayId", displayId)) { if (displayId < 0) { - HILOG_ERROR("Wrong argument displayId."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument displayId."); return false; } - HILOG_INFO("Get displayId %{public}d.", displayId); + TAG_LOGI(AAFwkTag::JSNAPI, "Get displayId %{public}d.", displayId); executeParam.displayId_ = displayId; } diff --git a/frameworks/js/napi/inner/napi_common/napi_common_execute_result.cpp b/frameworks/js/napi/inner/napi_common/napi_common_execute_result.cpp index 25195e7db2..4fad091ba5 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_execute_result.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_execute_result.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 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 @@ -15,6 +15,7 @@ #include "napi_common_execute_result.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "insight_intent_execute_result.h" #include "napi_common_util.h" @@ -27,15 +28,15 @@ namespace AbilityRuntime { using namespace OHOS::AppExecFwk; bool UnwrapExecuteResult(napi_env env, napi_value param, InsightIntentExecuteResult &executeResult) { - HILOG_DEBUG("called."); + TAG_LOGD(AAFwkTag::JSNAPI, "called."); if (!IsTypeForNapiValue(env, param, napi_valuetype::napi_object)) { - HILOG_ERROR("UnwrapExecuteResult not object"); + TAG_LOGE(AAFwkTag::JSNAPI, "UnwrapExecuteResult not object"); return false; } int32_t code = 0; if (!UnwrapInt32ByPropertyName(env, param, "code", code)) { - HILOG_ERROR("Intent result must contian a code."); + TAG_LOGE(AAFwkTag::JSNAPI, "Intent result must contian a code."); return false; } executeResult.code = code; @@ -46,16 +47,16 @@ bool UnwrapExecuteResult(napi_env env, napi_value param, InsightIntentExecuteRes napi_valuetype valueType = napi_undefined; napi_typeof(env, result, &valueType); if (valueType != napi_object) { - HILOG_ERROR("Wrong argument type result."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type result."); return false; } auto wp = std::make_shared(); if (!AppExecFwk::UnwrapWantParams(env, result, *wp)) { - HILOG_ERROR("Wrong argument type result."); + TAG_LOGE(AAFwkTag::JSNAPI, "Wrong argument type result."); return false; } if (!executeResult.CheckResult(wp)) { - HILOG_ERROR("Invalid intent result."); + TAG_LOGE(AAFwkTag::JSNAPI, "Invalid intent result."); return false; } executeResult.result = wp; diff --git a/frameworks/js/napi/inner/napi_common/napi_common_start_options.cpp b/frameworks/js/napi/inner/napi_common/napi_common_start_options.cpp index 3ccc66e81b..5d1f62e98b 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_start_options.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_start_options.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -15,6 +15,7 @@ #include "napi_common_start_options.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "napi_common_util.h" #include "napi_common_want.h" @@ -34,26 +35,26 @@ bool UnwrapProcessOptions(napi_env env, napi_value param, std::shared_ptr(); int32_t processMode = 0; if (!UnwrapInt32ByPropertyName(env, param, "processMode", processMode)) { - HILOG_ERROR("Unwrap processMode failed."); + TAG_LOGE(AAFwkTag::JSNAPI, "Unwrap processMode failed."); return false; } option->processMode = AAFwk::ProcessOptions::ConvertInt32ToProcessMode(processMode); if (option->processMode == AAFwk::ProcessMode::UNSPECIFIED) { - HILOG_ERROR("Convert processMode failed."); + TAG_LOGE(AAFwkTag::JSNAPI, "Convert processMode failed."); return false; } int32_t startupVisibility = 0; if (!UnwrapInt32ByPropertyName(env, param, "startupVisibility", startupVisibility)) { - HILOG_ERROR("Unwrap startupVisibility failed."); + TAG_LOGE(AAFwkTag::JSNAPI, "Unwrap startupVisibility failed."); return false; } option->startupVisibility = AAFwk::ProcessOptions::ConvertInt32ToStartupVisibility(startupVisibility); if (option->startupVisibility == AAFwk::StartupVisibility::UNSPECIFIED) { - HILOG_ERROR("Convert startupVisibility failed."); + TAG_LOGE(AAFwkTag::JSNAPI, "Convert startupVisibility failed."); return false; } processOptions = option; - HILOG_INFO("processMode:%{public}d, startupVisibility:%{public}d", + TAG_LOGI(AAFwkTag::JSNAPI, "processMode:%{public}d, startupVisibility:%{public}d", static_cast(processOptions->processMode), static_cast(processOptions->startupVisibility)); return true; @@ -63,7 +64,7 @@ bool UnwrapStartOptionsWithProcessOption(napi_env env, napi_value param, AAFwk:: { UnwrapStartOptions(env, param, startOptions); if (!UnwrapProcessOptions(env, param, startOptions.processOptions)) { - HILOG_ERROR("Unwrap processOptions failed."); + TAG_LOGE(AAFwkTag::JSNAPI, "Unwrap processOptions failed."); return false; } return true; @@ -71,10 +72,10 @@ bool UnwrapStartOptionsWithProcessOption(napi_env env, napi_value param, AAFwk:: bool UnwrapStartOptions(napi_env env, napi_value param, AAFwk::StartOptions &startOptions) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); if (!IsTypeForNapiValue(env, param, napi_object)) { - HILOG_INFO("%{public}s called. Params is invalid.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called. Params is invalid.", __func__); return false; } @@ -85,7 +86,7 @@ bool UnwrapStartOptions(napi_env env, napi_value param, AAFwk::StartOptions &sta int32_t displayId = 0; if (UnwrapInt32ByPropertyName(env, param, "displayId", displayId)) { - HILOG_INFO("get display id ok displayId %{public}d", displayId); + TAG_LOGI(AAFwkTag::JSNAPI, "get display id ok displayId %{public}d", displayId); startOptions.SetDisplayID(displayId); } @@ -124,7 +125,7 @@ bool UnwrapStartOptions(napi_env env, napi_value param, AAFwk::StartOptions &sta bool UnwrapStartOptionsAndWant(napi_env env, napi_value param, AAFwk::StartOptions &startOptions, AAFwk::Want &want) { if (!IsTypeForNapiValue(env, param, napi_object)) { - HILOG_INFO("%{public}s called. Params is invalid.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called. Params is invalid.", __func__); return false; } napi_value jsValue = GetPropertyValueByPropertyName(env, param, "parameters", napi_object); diff --git a/frameworks/js/napi/inner/napi_common/napi_common_util.cpp b/frameworks/js/napi/inner/napi_common/napi_common_util.cpp index 1cce7c6c3a..369f2c2ebb 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_util.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -16,6 +16,7 @@ #include +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "napi_common_data.h" #include "napi_common_error.h" @@ -25,11 +26,11 @@ namespace OHOS { namespace AppExecFwk { bool IsTypeForNapiValue(napi_env env, napi_value param, napi_valuetype expectType) { - HILOG_DEBUG("IsTypeForNapiValue start."); + TAG_LOGD(AAFwkTag::JSNAPI, "IsTypeForNapiValue start."); napi_valuetype valueType = napi_undefined; if (param == nullptr) { - HILOG_DEBUG("param is nullptr"); + TAG_LOGD(AAFwkTag::JSNAPI, "param is nullptr"); return false; } @@ -42,7 +43,7 @@ bool IsTypeForNapiValue(napi_env env, napi_value param, napi_valuetype expectTyp bool IsArrayForNapiValue(napi_env env, napi_value param, uint32_t &arraySize) { - HILOG_DEBUG("IsArrayForNapiValue start."); + TAG_LOGD(AAFwkTag::JSNAPI, "IsArrayForNapiValue start."); bool isArray = false; arraySize = 0; @@ -51,7 +52,7 @@ bool IsArrayForNapiValue(napi_env env, napi_value param, uint32_t &arraySize) } if (napi_get_array_length(env, param, &arraySize) != napi_ok) { - HILOG_DEBUG("napi_get_array_length is 0"); + TAG_LOGD(AAFwkTag::JSNAPI, "napi_get_array_length is 0"); return false; } return true; @@ -219,7 +220,7 @@ napi_value WrapStringToJS(napi_env env, const std::string &value) std::string UnwrapStringFromJS(napi_env env, napi_value param, const std::string &defaultValue) { - HILOG_DEBUG("UnwrapStringFromJS enter"); + TAG_LOGD(AAFwkTag::JSNAPI, "UnwrapStringFromJS enter"); size_t size = 0; if (napi_get_value_string_utf8(env, param, nullptr, 0, &size) != napi_ok) { return defaultValue; @@ -227,13 +228,13 @@ std::string UnwrapStringFromJS(napi_env env, napi_value param, const std::string std::string value(""); if (size == 0) { - HILOG_DEBUG("size is 0"); + TAG_LOGD(AAFwkTag::JSNAPI, "size is 0"); return defaultValue; } char *buf = new (std::nothrow) char[size + 1]; if (buf == nullptr) { - HILOG_DEBUG("buf is nullptr"); + TAG_LOGD(AAFwkTag::JSNAPI, "buf is nullptr"); return value; } (void)memset_s(buf, size + 1, 0, size + 1); @@ -279,7 +280,7 @@ bool UnwrapStringFromJS2(napi_env env, napi_value param, std::string &value) napi_value WrapArrayInt32ToJS(napi_env env, const std::vector &value) { - HILOG_DEBUG("WrapArrayInt32ToJS start."); + TAG_LOGD(AAFwkTag::JSNAPI, "WrapArrayInt32ToJS start."); napi_value jsArray = nullptr; napi_value jsValue = nullptr; uint32_t index = 0; @@ -303,7 +304,7 @@ bool UnwrapArrayInt32FromJS(napi_env env, napi_value param, std::vector &va int natValue = 0; if (!IsArrayForNapiValue(env, param, arraySize)) { - HILOG_DEBUG("Expanding ArrayInt32 from JS failed"); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS failed"); return false; } @@ -312,7 +313,7 @@ bool UnwrapArrayInt32FromJS(napi_env env, napi_value param, std::vector &va jsValue = nullptr; natValue = 0; if (napi_get_element(env, param, i, &jsValue) != napi_ok) { - HILOG_DEBUG("Expanding ArrayInt32 from JS failed"); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS failed"); return false; } @@ -350,7 +351,7 @@ bool UnwrapArrayLongFromJS(napi_env env, napi_value param, std::vector &va long natValue = 0; if (!IsArrayForNapiValue(env, param, arraySize)) { - HILOG_DEBUG("Expanding ArrayInt32 from JS failed."); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS failed."); return false; } @@ -359,7 +360,7 @@ bool UnwrapArrayLongFromJS(napi_env env, napi_value param, std::vector &va jsValue = nullptr; natValue = 0; if (napi_get_element(env, param, i, &jsValue) != napi_ok) { - HILOG_DEBUG("Expanding ArrayInt32 from JS failed."); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS failed."); return false; } @@ -397,7 +398,7 @@ bool UnwrapArrayInt64FromJS(napi_env env, napi_value param, std::vector int64_t natValue = 0; if (!IsArrayForNapiValue(env, param, arraySize)) { - HILOG_DEBUG("Expanding ArrayInt32 from JS error"); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS error"); return false; } @@ -406,7 +407,7 @@ bool UnwrapArrayInt64FromJS(napi_env env, napi_value param, std::vector jsValue = nullptr; natValue = 0; if (napi_get_element(env, param, i, &jsValue) != napi_ok) { - HILOG_DEBUG("Expanding ArrayInt32 from JS error"); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS error"); return false; } @@ -444,7 +445,7 @@ bool UnwrapArrayDoubleFromJS(napi_env env, napi_value param, std::vector double natValue = 0; if (!IsArrayForNapiValue(env, param, arraySize)) { - HILOG_DEBUG("Expanding ArrayInt32 from JS error."); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS error."); return false; } @@ -453,7 +454,7 @@ bool UnwrapArrayDoubleFromJS(napi_env env, napi_value param, std::vector jsValue = nullptr; natValue = 0; if (napi_get_element(env, param, i, &jsValue) != napi_ok) { - HILOG_DEBUG("Expanding ArrayInt32 from JS error."); + TAG_LOGD(AAFwkTag::JSNAPI, "Expanding ArrayInt32 from JS error."); return false; } @@ -851,7 +852,7 @@ napi_value GetCallbackErrorValue(napi_env env, int errCode) */ AsyncJSCallbackInfo *CreateAsyncJSCallbackInfo(napi_env env) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); napi_value global = nullptr; NAPI_CALL(env, napi_get_global(env, &global)); @@ -864,7 +865,7 @@ AsyncJSCallbackInfo *CreateAsyncJSCallbackInfo(napi_env env) AsyncJSCallbackInfo *asyncCallbackInfo = new (std::nothrow) AsyncJSCallbackInfo; if (asyncCallbackInfo == nullptr) { - HILOG_ERROR("%{public}s, asyncCallbackInfo == nullptr.", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s, asyncCallbackInfo == nullptr.", __func__); return nullptr; } asyncCallbackInfo->cbInfo.env = env; @@ -946,16 +947,16 @@ bool WrapThreadReturnData(napi_env env, const ThreadReturnData *data, napi_value */ bool CreateAsyncCallback(napi_env env, napi_value param, AsyncJSCallbackInfo *callback) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); if (param == nullptr || callback == nullptr) { - HILOG_INFO("%{public}s called, param or callback is null.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, param or callback is null.", __func__); return false; } callback->cbInfo.callback = CreateCallbackRefFromJS(env, param); if (callback->cbInfo.callback == nullptr) { - HILOG_INFO("%{public}s, create ref failed.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s, create ref failed.", __func__); return false; } @@ -965,7 +966,7 @@ bool CreateAsyncCallback(napi_env env, napi_value param, AsyncJSCallbackInfo *ca napi_ref CreateCallbackRefFromJS(napi_env env, napi_value param) { if (env == nullptr || param == nullptr) { - HILOG_INFO("%{public}s called, env or param is null ", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, env or param is null ", __func__); return nullptr; } @@ -973,7 +974,7 @@ napi_ref CreateCallbackRefFromJS(napi_env env, napi_value param) NAPI_CALL(env, napi_typeof(env, param, &valueType)); if (valueType != napi_function) { - HILOG_INFO("%{public}s called, Param is invalid.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, Param is invalid.", __func__); return nullptr; } @@ -993,9 +994,9 @@ napi_ref CreateCallbackRefFromJS(napi_env env, napi_value param) */ napi_value ExecuteAsyncCallbackWork(napi_env env, AsyncJSCallbackInfo *asyncCallbackInfo, const AsyncParamEx *param) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); if (asyncCallbackInfo == nullptr || param == nullptr) { - HILOG_INFO("%{public}s called, asyncCallbackInfo or param is null", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, asyncCallbackInfo or param is null", __func__); return nullptr; } @@ -1027,9 +1028,9 @@ napi_value ExecuteAsyncCallbackWork(napi_env env, AsyncJSCallbackInfo *asyncCall */ napi_value ExecutePromiseCallbackWork(napi_env env, AsyncJSCallbackInfo *asyncCallbackInfo, const AsyncParamEx *param) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); if (asyncCallbackInfo == nullptr || param == nullptr) { - HILOG_INFO("%{public}s called, asyncCallbackInfo or param is null", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, asyncCallbackInfo or param is null", __func__); return nullptr; } @@ -1062,11 +1063,11 @@ napi_value ExecutePromiseCallbackWork(napi_env env, AsyncJSCallbackInfo *asyncCa */ void CompleteAsyncCallbackWork(napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); AsyncJSCallbackInfo *asyncCallbackInfo = static_cast(data); if (asyncCallbackInfo == nullptr) { - HILOG_INFO("%{public}s called, asyncCallbackInfo is nullptr", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, asyncCallbackInfo is nullptr", __func__); return; } @@ -1092,10 +1093,10 @@ void CompleteAsyncCallbackWork(napi_env env, napi_status status, void *data) void CompleteAsyncVoidCallbackWork(napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); AsyncJSCallbackInfo *asyncCallbackInfo = static_cast(data); if (asyncCallbackInfo == nullptr) { - HILOG_INFO("%{public}s called, asyncCallbackInfo is null", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, asyncCallbackInfo is null", __func__); return; } napi_value callback = nullptr; @@ -1132,11 +1133,11 @@ void CompleteAsyncVoidCallbackWork(napi_env env, napi_status status, void *data) */ void CompletePromiseCallbackWork(napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); AsyncJSCallbackInfo *asyncCallbackInfo = static_cast(data); if (asyncCallbackInfo == nullptr) { - HILOG_INFO("%{public}s called, asyncCallbackInfo is nullptr.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, asyncCallbackInfo is nullptr.", __func__); return; } @@ -1155,11 +1156,11 @@ void CompletePromiseCallbackWork(napi_env env, napi_status status, void *data) void CompletePromiseVoidCallbackWork(napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called.", __func__); AsyncJSCallbackInfo *asyncCallbackInfo = static_cast(data); if (asyncCallbackInfo == nullptr) { - HILOG_INFO("%{public}s called, asyncCallbackInfo is null", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, asyncCallbackInfo is null", __func__); return; } napi_value result = nullptr; @@ -1207,7 +1208,7 @@ std::vector ConvertStringVector(napi_env env, napi_value jsValue) bool isTypedArray = false; napi_status status = napi_is_typedarray(env, jsValue, &isTypedArray); if (status != napi_ok || !isTypedArray) { - HILOG_ERROR("%{public}s called, napi_is_typedarray error", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s called, napi_is_typedarray error", __func__); return {}; } @@ -1217,7 +1218,7 @@ std::vector ConvertStringVector(napi_env env, napi_value jsValue) size_t offset = 0; NAPI_CALL_BASE(env, napi_get_typedarray_info(env, jsValue, &type, &length, nullptr, &buffer, &offset), {}); if (type != napi_uint8_array) { - HILOG_ERROR("%{public}s called, napi_uint8_array is nullptr", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s called, napi_uint8_array is nullptr", __func__); return {}; } std::string *data = nullptr; diff --git a/frameworks/js/napi/inner/napi_common/napi_common_want.cpp b/frameworks/js/napi/inner/napi_common/napi_common_want.cpp index e01798a249..74568fa6bd 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_want.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_want.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -21,6 +21,7 @@ #include "byte_wrapper.h" #include "double_wrapper.h" #include "float_wrapper.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "int_wrapper.h" #include "ipc_skeleton.h" @@ -267,7 +268,7 @@ bool InnerWrapWantParamsFloat( bool InnerWrapWantParamsDouble( napi_env env, napi_value jsObject, const std::string &key, const AAFwk::WantParams &wantParams) { - HILOG_DEBUG("enter"); + TAG_LOGD(AAFwkTag::JSNAPI, "enter"); auto value = wantParams.GetParam(key); AAFwk::IDouble *ao = AAFwk::IDouble::Query(value); if (ao == nullptr) { @@ -287,7 +288,7 @@ bool InnerWrapWantParamsDouble( bool InnerWrapWantParamsWantParams( napi_env env, napi_value jsObject, const std::string &key, const AAFwk::WantParams &wantParams) { - HILOG_DEBUG("%{public}s called. key=%{public}s", __func__, key.c_str()); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s called. key=%{public}s", __func__, key.c_str()); auto value = wantParams.GetParam(key); AAFwk::IWantParams *o = AAFwk::IWantParams::Query(value); if (o == nullptr) { @@ -307,17 +308,17 @@ bool InnerWrapWantParamsWantParams( bool InnerWrapWantParamsRemoteObject( napi_env env, napi_value jsObject, const std::string &key, const AAFwk::WantParams &wantParams) { - HILOG_DEBUG("%{public}s called. key=%{public}s", __func__, key.c_str()); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s called. key=%{public}s", __func__, key.c_str()); auto value = wantParams.GetParam(key); AAFwk::IRemoteObjectWrap *remoteObjectIWrap = AAFwk::IRemoteObjectWrap::Query(value); if (remoteObjectIWrap == nullptr) { - HILOG_ERROR("%{public}s remoteObjectIWrap is nullptr.", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s remoteObjectIWrap is nullptr.", __func__); return false; } auto remoteObject = AAFwk::RemoteObjectWrap::UnBox(remoteObjectIWrap); auto jsValue = NAPI_ohos_rpc_CreateJsRemoteObject(env, remoteObject); if (jsValue == nullptr) { - HILOG_ERROR("%{public}s jsValue is nullptr.", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s jsValue is nullptr.", __func__); return false; } @@ -327,7 +328,7 @@ bool InnerWrapWantParamsRemoteObject( bool InnerWrapWantParamsArrayChar(napi_env env, napi_value jsObject, const std::string &key, sptr &ao) { - HILOG_DEBUG("%{public}s called.", __func__); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s called.", __func__); long size = 0; if (ao->GetLength(size) != ERR_OK) { return false; @@ -608,7 +609,7 @@ bool InnerWrapWantParamsArrayWantParams(napi_env env, napi_value jsObject, bool InnerWrapWantParamsArray(napi_env env, napi_value jsObject, const std::string &key, sptr &ao) { - HILOG_DEBUG("%{public}s called. key=%{public}s", __func__, key.c_str()); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s called. key=%{public}s", __func__, key.c_str()); if (AAFwk::Array::IsStringArray(ao)) { return InnerWrapWantParamsArrayString(env, jsObject, key, ao); } else if (AAFwk::Array::IsBooleanArray(ao)) { @@ -698,7 +699,7 @@ bool InnerSetWantParamsArrayObject(napi_env env, const std::string &key, bool InnerSetWantParamsArrayString( const std::string &key, const std::vector &value, AAFwk::WantParams &wantParams) { - HILOG_DEBUG("InnerSetWantParamsArrayString enter"); + TAG_LOGD(AAFwkTag::JSNAPI, "InnerSetWantParamsArrayString enter"); size_t size = value.size(); sptr ao = new (std::nothrow) AAFwk::Array(size, AAFwk::g_IID_IString); if (ao != nullptr) { @@ -775,7 +776,7 @@ bool InnerSetWantParamsArrayDouble( bool InnerUnwrapWantParamsArray(napi_env env, const std::string &key, napi_value param, AAFwk::WantParams &wantParams) { - HILOG_DEBUG("%{public}s called.", __func__); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s called.", __func__); ComplexArrayData natArrayValue; if (!UnwrapArrayComplexFromJS(env, param, natArrayValue)) { return false; @@ -804,7 +805,7 @@ bool InnerUnwrapWantParamsArray(napi_env env, const std::string &key, napi_value bool InnerUnwrapWantParams(napi_env env, const std::string &key, napi_value param, AAFwk::WantParams &wantParams) { - HILOG_DEBUG("%{public}s called.", __func__); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s called.", __func__); AAFwk::WantParams wp; if (UnwrapWantParams(env, param, wp)) { @@ -876,10 +877,10 @@ bool UnwrapWantParams(napi_env env, napi_value param, AAFwk::WantParams &wantPar std::string strProName = UnwrapStringFromJS(env, jsProName); /* skip reserved param */ if (BlackListFilter(strProName)) { - HILOG_DEBUG("%{public}s is filtered.", strProName.c_str()); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s is filtered.", strProName.c_str()); continue; } - HILOG_DEBUG("%{public}s called. Property name=%{public}s.", __func__, strProName.c_str()); + TAG_LOGD(AAFwkTag::JSNAPI, "%{public}s called. Property name=%{public}s.", __func__, strProName.c_str()); NAPI_CALL_BASE(env, napi_get_named_property(env, param, strProName.c_str(), &jsProValue), false); NAPI_CALL_BASE(env, napi_typeof(env, jsProValue, &jsValueType), false); @@ -921,7 +922,7 @@ void HandleNapiObject(napi_env env, napi_value param, napi_value jsProValue, std if (Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(selfToken)) { HandleRemoteObject(env, param, strProName, wantParams); } else { - HILOG_WARN("not system app, REMOTE_OBJECT is FORIBBED IN WANT."); + TAG_LOGW(AAFwkTag::JSNAPI, "not system app, REMOTE_OBJECT is FORIBBED IN WANT."); } } else { bool isArray = false; @@ -959,7 +960,7 @@ bool IsSpecialObject(napi_env env, napi_value param, std::string &strProName, st NAPI_CALL_BASE(env, napi_get_array_length(env, jsProNameList, &jsProCount), false); if (jsProCount != PROPERTIES_SIZE) { - HILOG_ERROR("%{public}s called, size is invalid, this object is not fd object.", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s called, size is invalid, this object is not fd object.", __func__); return false; } @@ -969,7 +970,8 @@ bool IsSpecialObject(napi_env env, napi_value param, std::string &strProName, st false); NAPI_CALL_BASE(env, napi_typeof(env, jsProValue, &jsValueType), false); if (jsValueType != jsValueProType) { - HILOG_ERROR("%{public}s called, value property is invalid, this object is not fd object.", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s called, value property is invalid, this object is not fd object.", + __func__); return false; } @@ -986,7 +988,7 @@ bool HandleFdObject(napi_env env, napi_value param, std::string &strProName, AAF int32_t natValue32 = 0; napi_get_value_int32(env, jsProValue, &natValue32); - HILOG_INFO("%{public}s called, fd:%{public}d.", __func__, natValue32); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called, fd:%{public}d.", __func__, natValue32); WantParams wp; wp.SetParam(TYPE_PROPERTY, String::Box(FD)); wp.SetParam(VALUE_PROPERTY, Integer::Box(natValue32)); @@ -1005,7 +1007,7 @@ bool HandleRemoteObject(napi_env env, napi_value param, std::string &strProName, sptr remoteObject = NAPI_ohos_rpc_getNativeRemoteObject(env, jsProValue); if (remoteObject == nullptr) { - HILOG_ERROR("%{public}s called, transfer to remoteObject fail", __func__); + TAG_LOGE(AAFwkTag::JSNAPI, "%{public}s called, transfer to remoteObject fail", __func__); return false; } @@ -1071,7 +1073,7 @@ napi_value WrapWant(napi_env env, const Want &want) napi_value jsElementName = WrapElementName(env, want.GetElement()); if (jsElementName == nullptr) { - HILOG_INFO("%{public}s called. Invoke WrapElementName failed.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called. Invoke WrapElementName failed.", __func__); return nullptr; } @@ -1120,7 +1122,7 @@ napi_value WrapWant(napi_env env, const Want &want) bool UnwrapWant(napi_env env, napi_value param, Want &want) { if (!IsTypeForNapiValue(env, param, napi_object)) { - HILOG_INFO("%{public}s called. Params is invalid.", __func__); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called. Params is invalid.", __func__); return false; } @@ -1290,7 +1292,7 @@ bool InnerWrapJsWantParamsWantParams( bool WrapJsWantParamsArray(napi_env env, napi_value object, const std::string &key, sptr &ao) { - HILOG_INFO("%{public}s called. key=%{public}s", __func__, key.c_str()); + TAG_LOGI(AAFwkTag::JSNAPI, "%{public}s called. key=%{public}s", __func__, key.c_str()); if (AAFwk::Array::IsStringArray(ao)) { return InnerWrapWantParamsArray( env, object, key, ao); diff --git a/frameworks/js/napi/js_dialog_request/js_dialog_request.cpp b/frameworks/js/napi/js_dialog_request/js_dialog_request.cpp index c1f710923d..f7e21eee71 100755 --- a/frameworks/js/napi/js_dialog_request/js_dialog_request.cpp +++ b/frameworks/js/napi/js_dialog_request/js_dialog_request.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 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 @@ -15,6 +15,7 @@ #include "js_dialog_request.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_error_utils.h" #include "js_dialog_request_callback.h" @@ -33,16 +34,16 @@ constexpr int32_t RESULT_CANCEL = 1; napi_value ResultCodeInit(napi_env env) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::DIALOG, "called"); if (env == nullptr) { - HILOG_ERROR("Invalid input parameters."); + TAG_LOGE(AAFwkTag::DIALOG, "Invalid input parameters."); return nullptr; } napi_value objValue = nullptr; napi_create_object(env, &objValue); if (objValue == nullptr) { - HILOG_ERROR("Failed to get object"); + TAG_LOGE(AAFwkTag::DIALOG, "Failed to get object"); return nullptr; } @@ -59,7 +60,7 @@ public: static void Finalizer(napi_env env, void* data, void* hint) { - HILOG_INFO("JsDialogRequest::Finalizer is called"); + TAG_LOGI(AAFwkTag::DIALOG, "JsDialogRequest::Finalizer is called"); std::unique_ptr(static_cast(data)); } @@ -76,23 +77,23 @@ public: private: napi_value OnGetRequestInfo(napi_env env, NapiCallbackInfo& info) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::DIALOG, "%{public}s is called", __FUNCTION__); if (info.argc < ARGC_ONE) { - HILOG_ERROR("Params not match"); + TAG_LOGE(AAFwkTag::DIALOG, "Params not match"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } OHOS::AAFwk::Want want; if (!OHOS::AppExecFwk::UnwrapWant(env, info.argv[0], want)) { - HILOG_ERROR("The input want is invalid."); + TAG_LOGE(AAFwkTag::DIALOG, "The input want is invalid."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } sptr callerToken = want.GetRemoteObject(RequestConstants::REQUEST_TOKEN_KEY); if (!callerToken) { - HILOG_ERROR("Can not get token from target want."); + TAG_LOGE(AAFwkTag::DIALOG, "Can not get token from target want."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -104,7 +105,7 @@ private: auto requestInfo = new RequestInfo(callerToken, left, top, width, height); auto jsRequestInfo = RequestInfo::WrapRequestInfo(env, requestInfo); if (jsRequestInfo == nullptr) { - HILOG_ERROR("Can not wrap requestinfo from target request."); + TAG_LOGE(AAFwkTag::DIALOG, "Can not wrap requestinfo from target request."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -114,30 +115,30 @@ private: napi_value OnGetRequestCallback(napi_env env, NapiCallbackInfo& info) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::DIALOG, "%{public}s is called", __FUNCTION__); if (info.argc < ARGC_ONE) { - HILOG_ERROR("Params is not match"); + TAG_LOGE(AAFwkTag::DIALOG, "Params is not match"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } OHOS::AAFwk::Want want; if (!OHOS::AppExecFwk::UnwrapWant(env, info.argv[0], want)) { - HILOG_ERROR("The input want is invalid."); + TAG_LOGE(AAFwkTag::DIALOG, "The input want is invalid."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } sptr remoteObj = want.GetRemoteObject(RequestConstants::REQUEST_CALLBACK_KEY); if (!remoteObj) { - HILOG_ERROR("Can not get callback from target want."); + TAG_LOGE(AAFwkTag::DIALOG, "Can not get callback from target want."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } sptr callback = iface_cast(remoteObj); if (!callback) { - HILOG_ERROR("Cast to IDialogRequestCallback failed."); + TAG_LOGE(AAFwkTag::DIALOG, "Cast to IDialogRequestCallback failed."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INNER); return CreateJsUndefined(env); } @@ -148,9 +149,9 @@ private: napi_value JsDialogRequestInit(napi_env env, napi_value exportObj) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::DIALOG, "called"); if (env == nullptr || exportObj == nullptr) { - HILOG_INFO("Invalid input parameters"); + TAG_LOGI(AAFwkTag::DIALOG, "Invalid input parameters"); return nullptr; } diff --git a/frameworks/js/napi/js_dialog_request/js_dialog_request_callback.cpp b/frameworks/js/napi/js_dialog_request/js_dialog_request_callback.cpp index 366a533872..37993c7da9 100755 --- a/frameworks/js/napi/js_dialog_request/js_dialog_request_callback.cpp +++ b/frameworks/js/napi/js_dialog_request/js_dialog_request_callback.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 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 @@ -15,6 +15,7 @@ #include "js_dialog_request_callback.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_context_utils.h" #include "js_error_utils.h" @@ -33,14 +34,14 @@ public: static void Finalizer(napi_env env, void* data, void* hint) { - HILOG_DEBUG("JsDialogRequestCallback::Finalizer is called."); + TAG_LOGD(AAFwkTag::DIALOG, "JsDialogRequestCallback::Finalizer is called."); std::unique_ptr(static_cast(data)); } static napi_value SetRequestResult(napi_env env, napi_callback_info info) { if (env == nullptr || info == nullptr) { - HILOG_ERROR("input parameters %{public}s is nullptr", ((env == nullptr) ? "env" : "info")); + TAG_LOGE(AAFwkTag::DIALOG, "input parameters %{public}s is nullptr", ((env == nullptr) ? "env" : "info")); return nullptr; } @@ -50,15 +51,15 @@ public: private: napi_value OnSetRequestResult(napi_env env, NapiCallbackInfo& info) { - HILOG_INFO("function called"); + TAG_LOGI(AAFwkTag::DIALOG, "function called"); if (info.argc < 1) { - HILOG_ERROR("Params not match"); + TAG_LOGE(AAFwkTag::DIALOG, "Params not match"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } if (!CheckTypeForNapiValue(env, info.argv[0], napi_object)) { - HILOG_ERROR("param type mismatch!"); + TAG_LOGE(AAFwkTag::DIALOG, "param type mismatch!"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -67,7 +68,7 @@ private: napi_get_named_property(env, info.argv[0], "result", &resultCode); int32_t resultCodeValue = 0; if (!ConvertFromJsValue(env, resultCode, resultCodeValue)) { - HILOG_ERROR("Convert result failed!"); + TAG_LOGE(AAFwkTag::DIALOG, "Convert result failed!"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -78,16 +79,16 @@ private: if (jWant != nullptr && CheckTypeForNapiValue(env, jWant, napi_object)) { AppExecFwk::UnwrapWant(env, jWant, wantValue); } else { - HILOG_WARN("jWant is invalid data!"); + TAG_LOGW(AAFwkTag::DIALOG, "jWant is invalid data!"); } if (callback_ == nullptr) { - HILOG_ERROR("JsDialogRequestCallback::%{public}s, callback_ is nullptr", __func__); + TAG_LOGE(AAFwkTag::DIALOG, "JsDialogRequestCallback::%{public}s, callback_ is nullptr", __func__); ThrowError(env, AbilityErrorCode::ERROR_CODE_INNER); return CreateJsUndefined(env); } callback_->SendResult(resultCodeValue, wantValue); - HILOG_INFO("function called end."); + TAG_LOGI(AAFwkTag::DIALOG, "function called end."); return CreateJsUndefined(env); } @@ -98,16 +99,16 @@ private: napi_value CreateJsDialogRequestCallback(napi_env env, const sptr &remoteObj) { - HILOG_INFO("CreateJsDialogRequestCallback"); + TAG_LOGI(AAFwkTag::DIALOG, "CreateJsDialogRequestCallback"); if (!remoteObj) { - HILOG_ERROR("remoteObj is invalid."); + TAG_LOGE(AAFwkTag::DIALOG, "remoteObj is invalid."); return CreateJsUndefined(env); } napi_value objValue = nullptr; napi_create_object(env, &objValue); if (objValue == nullptr) { - HILOG_ERROR("object is invalid."); + TAG_LOGE(AAFwkTag::DIALOG, "object is invalid."); return CreateJsUndefined(env); } @@ -116,7 +117,7 @@ napi_value CreateJsDialogRequestCallback(napi_env env, const sptr(static_cast(data)); } @@ -55,9 +56,9 @@ public: private: napi_value OnGetDialogSessionInfo(napi_env env, NapiCallbackInfo& info) { - HILOG_DEBUG("enter, argc = %{public}d", static_cast(info.argc)); + TAG_LOGD(AAFwkTag::DIALOG, "enter, argc = %{public}d", static_cast(info.argc)); if (info.argc < 1) { - HILOG_ERROR("not enough params"); + TAG_LOGE(AAFwkTag::DIALOG, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -68,10 +69,10 @@ private: } sptr dialogSessionInfo; - HILOG_DEBUG("GetDialogSessionInfo begin"); + TAG_LOGD(AAFwkTag::DIALOG, "GetDialogSessionInfo begin"); auto errcode = AbilityManagerClient::GetInstance()->GetDialogSessionInfo(dialogSessionId, dialogSessionInfo); if (errcode || dialogSessionInfo == nullptr) { - HILOG_ERROR("GetDialogSessionInfo error"); + TAG_LOGE(AAFwkTag::DIALOG, "GetDialogSessionInfo error"); return CreateJsUndefined(env); } return OHOS::AppExecFwk::WrapDialogSessionInfo(env, *dialogSessionInfo); @@ -79,9 +80,9 @@ private: napi_value OnSendDialogResult(napi_env env, NapiCallbackInfo& info) { - HILOG_DEBUG("enter, argc = %{public}d", static_cast(info.argc)); + TAG_LOGD(AAFwkTag::DIALOG, "enter, argc = %{public}d", static_cast(info.argc)); if (info.argc < ARGC_THREE) { - HILOG_ERROR("not enough params"); + TAG_LOGE(AAFwkTag::DIALOG, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -92,7 +93,7 @@ private: } AAFwk::Want want; if (!AppExecFwk::UnwrapWant(env, info.argv[1], want)) { - HILOG_ERROR("Failed to unwrap want"); + TAG_LOGE(AAFwkTag::DIALOG, "Failed to unwrap want"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -120,9 +121,9 @@ private: napi_value JsDialogSessionInit(napi_env env, napi_value exportObj) { - HILOG_INFO("JsDialogSessionInit is called"); + TAG_LOGI(AAFwkTag::DIALOG, "JsDialogSessionInit is called"); if (env == nullptr || exportObj == nullptr) { - HILOG_INFO("Invalid input parameters"); + TAG_LOGI(AAFwkTag::DIALOG, "Invalid input parameters"); return nullptr; } diff --git a/frameworks/js/napi/js_mission_manager/js_mission_info_utils.cpp b/frameworks/js/napi/js_mission_manager/js_mission_info_utils.cpp index f43fd68d76..3410785705 100755 --- a/frameworks/js/napi/js_mission_manager/js_mission_info_utils.cpp +++ b/frameworks/js/napi/js_mission_manager/js_mission_info_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -15,6 +15,7 @@ #include "js_mission_info_utils.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "napi_common_want.h" #include "napi_remote_object.h" @@ -139,7 +140,7 @@ bool InnerWrapJsWantParamsWantParams( bool WrapJsWantParamsArray(napi_env env, napi_value object, const std::string &key, sptr &ao) { - HILOG_INFO("called. key=%{public}s", key.c_str()); + TAG_LOGI(AAFwkTag::MISSION, "called. key=%{public}s", key.c_str()); if (AAFwk::Array::IsStringArray(ao)) { return InnerWrapWantParamsArray( env, object, key, ao); diff --git a/frameworks/js/napi/js_mission_manager/js_mission_listener.cpp b/frameworks/js/napi/js_mission_manager/js_mission_listener.cpp index fd7f754b06..11b1602db0 100755 --- a/frameworks/js/napi/js_mission_manager/js_mission_listener.cpp +++ b/frameworks/js/napi/js_mission_manager/js_mission_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -17,6 +17,7 @@ #include +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_runtime_utils.h" @@ -90,9 +91,9 @@ bool JsMissionListener::IsEmpty() void JsMissionListener::CallJsMethod(const std::string &methodName, int32_t missionId) { - HILOG_DEBUG("methodName = %{public}s", methodName.c_str()); + TAG_LOGD(AAFwkTag::MISSION, "methodName = %{public}s", methodName.c_str()); if (env_ == nullptr) { - HILOG_ERROR("env_ nullptr"); + TAG_LOGE(AAFwkTag::MISSION, "env_ nullptr"); return; } @@ -131,9 +132,9 @@ void JsMissionListener::CallJsMethodInner(const std::string &methodName, int32_t void JsMissionListener::CallJsFunction( napi_value obj, const char* methodName, napi_value *argv, size_t argc) { - HILOG_INFO("method:%{public}s", methodName); + TAG_LOGI(AAFwkTag::MISSION, "method:%{public}s", methodName); if (obj == nullptr) { - HILOG_ERROR("Failed to get object"); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get object"); return; } @@ -141,7 +142,7 @@ void JsMissionListener::CallJsFunction( napi_get_named_property(env_, obj, methodName, &method); if (method == nullptr || AppExecFwk::IsTypeForNapiValue(env_, method, napi_undefined) || AppExecFwk::IsTypeForNapiValue(env_, method, napi_null)) { - HILOG_ERROR("Failed to get %{public}s from object", methodName); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get %{public}s from object", methodName); return; } napi_value callResult = nullptr; @@ -151,14 +152,14 @@ void JsMissionListener::CallJsFunction( #ifdef SUPPORT_GRAPHICS void JsMissionListener::OnMissionIconUpdated(int32_t missionId, const std::shared_ptr &icon) { - HILOG_DEBUG("OnMissionIconUpdated, missionId = %{public}d", missionId); + TAG_LOGD(AAFwkTag::MISSION, "OnMissionIconUpdated, missionId = %{public}d", missionId); if (env_ == nullptr) { - HILOG_ERROR("env_ is nullptr"); + TAG_LOGE(AAFwkTag::MISSION, "env_ is nullptr"); return; } if (missionId <= 0 || !icon) { - HILOG_ERROR("missionId or icon is invalid, missionId:%{public}d", missionId); + TAG_LOGE(AAFwkTag::MISSION, "missionId or icon is invalid, missionId:%{public}d", missionId); return; } @@ -180,7 +181,7 @@ void JsMissionListener::OnMissionIconUpdated(int32_t missionId, const std::share void JsMissionListener::CallJsMissionIconUpdated(int32_t missionId, const std::shared_ptr &icon) { if (env_ == nullptr) { - HILOG_ERROR("env_ is nullptr, not call js mission updated."); + TAG_LOGE(AAFwkTag::MISSION, "env_ is nullptr, not call js mission updated."); return; } @@ -191,14 +192,14 @@ void JsMissionListener::CallJsMissionIconUpdated(int32_t missionId, const std::s for (auto &item : tmpMap) { napi_value obj = (item.second)->GetNapiValue(); if (obj == nullptr) { - HILOG_ERROR("Failed to get js object"); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get js object"); continue; } napi_value method = nullptr; napi_get_named_property(env_, obj, "onMissionIconUpdated", &method); if (method == nullptr || AppExecFwk::IsTypeForNapiValue(env_, method, napi_undefined) || AppExecFwk::IsTypeForNapiValue(env_, method, napi_null)) { - HILOG_ERROR("Failed to get onMissionIconUpdated method from object"); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get onMissionIconUpdated method from object"); continue; } diff --git a/frameworks/js/napi/js_mission_manager/mission_manager.cpp b/frameworks/js/napi/js_mission_manager/mission_manager.cpp index 070a7b0312..4759f5644e 100755 --- a/frameworks/js/napi/js_mission_manager/mission_manager.cpp +++ b/frameworks/js/napi/js_mission_manager/mission_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 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 @@ -18,6 +18,7 @@ #include "ability_manager_client.h" #include "event_handler.h" #include "event_runner.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_error_utils.h" #include "js_mission_info_utils.h" @@ -55,7 +56,7 @@ public: static void Finalizer(napi_env env, void* data, void* hint) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); std::unique_ptr(static_cast(data)); } @@ -127,7 +128,7 @@ public: private: napi_value OnOn(napi_env env, size_t argc, napi_value* argv) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); std::string type = ParseParamType(env, argc, argv); if (type == ON_OFF_TYPE_SYNC) { return OnOnNew(env, argc, argv); @@ -137,9 +138,9 @@ private: napi_value OnOnOld(napi_env env, size_t argc, napi_value* argv) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); if (argc < ARG_COUNT_TWO) { - HILOG_ERROR("Params not match"); + TAG_LOGE(AAFwkTag::MISSION, "Params not match"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -161,7 +162,7 @@ private: missionListener_->AddJsListenerObject(missionListenerId_, argv[ARGC_ONE]); return CreateJsValue(env, missionListenerId_); } else { - HILOG_ERROR("RegisterMissionListener failed, ret = %{public}d", ret); + TAG_LOGE(AAFwkTag::MISSION, "RegisterMissionListener failed, ret = %{public}d", ret); missionListener_ = nullptr; if (ret == CHECK_PERMISSION_FAILED) { ThrowNoPermissionError(env, PermissionConstants::PERMISSION_MANAGE_MISSION); @@ -174,14 +175,14 @@ private: napi_value OnOnNew(napi_env env, size_t argc, napi_value* argv) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); if (argc < ARG_COUNT_TWO) { - HILOG_ERROR("Params not match"); + TAG_LOGE(AAFwkTag::MISSION, "Params not match"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } if (!AppExecFwk::IsTypeForNapiValue(env, argv[1], napi_object)) { - HILOG_ERROR("Invalid param"); + TAG_LOGE(AAFwkTag::MISSION, "Invalid param"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -198,7 +199,7 @@ private: missionListener_->AddJsListenerObject(missionListenerId_, argv[INDEX_ONE], true); return CreateJsValue(env, missionListenerId_); } else { - HILOG_ERROR("RegisterMissionListener failed, ret = %{public}d", ret); + TAG_LOGE(AAFwkTag::MISSION, "RegisterMissionListener failed, ret = %{public}d", ret); missionListener_ = nullptr; if (ret == CHECK_PERMISSION_FAILED) { ThrowNoPermissionError(env, PermissionConstants::PERMISSION_MANAGE_MISSION); @@ -211,7 +212,7 @@ private: napi_value OnOff(napi_env env, size_t argc, napi_value* argv) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); std::string type = ParseParamType(env, argc, argv); if (type == ON_OFF_TYPE_SYNC) { return OnOffNew(env, argc, argv); @@ -221,9 +222,9 @@ private: napi_value OnOffOld(napi_env env, size_t argc, napi_value* argv) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); if (argc < ARG_COUNT_TWO) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -235,7 +236,7 @@ private: int32_t missionListenerId = -1; if (!ConvertFromJsValue(env, argv[ARGC_ONE], missionListenerId)) { - HILOG_ERROR("Parse missionListenerId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse missionListenerId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -271,40 +272,40 @@ private: napi_value OnOffNew(napi_env env, size_t argc, napi_value* argv) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); if (argc < ARG_COUNT_TWO) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionListenerId = -1; if (!ConvertFromJsValue(env, argv[INDEX_ONE], missionListenerId)) { - HILOG_ERROR("Parse missionListenerId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse missionListenerId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } if (missionListener_ == nullptr) { - HILOG_ERROR("missionListener_ is nullptr"); + TAG_LOGE(AAFwkTag::MISSION, "missionListener_ is nullptr"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INNER); return CreateJsUndefined(env); } if (!missionListener_->RemoveJsListenerObject(missionListenerId, true)) { - HILOG_ERROR("missionListenerId not found"); + TAG_LOGE(AAFwkTag::MISSION, "missionListenerId not found"); ThrowError(env, AbilityErrorCode::ERROR_CODE_NO_MISSION_LISTENER); return CreateJsUndefined(env); } if (!missionListener_->IsEmpty()) { - HILOG_DEBUG("Off success, missionListener is not empty"); + TAG_LOGD(AAFwkTag::MISSION, "Off success, missionListener is not empty"); return CreateJsUndefined(env); } auto ret = AbilityManagerClient::GetInstance()->UnRegisterMissionListener(missionListener_); if (ret == 0) { - HILOG_DEBUG("UnRegisterMissionListener success"); + TAG_LOGD(AAFwkTag::MISSION, "UnRegisterMissionListener success"); missionListener_ = nullptr; } else { - HILOG_ERROR("UnRegisterMissionListener failed"); + TAG_LOGE(AAFwkTag::MISSION, "UnRegisterMissionListener failed"); if (ret == CHECK_PERMISSION_FAILED) { ThrowNoPermissionError(env, PermissionConstants::PERMISSION_MANAGE_MISSION); } else { @@ -316,21 +317,21 @@ private: napi_value OnGetMissionInfos(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc < ARG_COUNT_TWO) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string deviceId; if (!ConvertFromJsValue(env, argv[0], deviceId)) { - HILOG_ERROR("Parse deviceId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse deviceId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } int numMax = -1; if (!ConvertFromJsValue(env, argv[1], numMax)) { - HILOG_ERROR("Parse numMax failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse numMax failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -356,21 +357,21 @@ private: napi_value OnGetMissionInfo(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc < ARG_COUNT_TWO) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string deviceId; if (!ConvertFromJsValue(env, argv[0], deviceId)) { - HILOG_ERROR("Parse deviceId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse deviceId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[1], missionId)) { - HILOG_ERROR("Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -396,19 +397,19 @@ private: napi_value OnGetMissionSnapShot(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("called"); + TAG_LOGI(AAFwkTag::MISSION, "called"); return GetMissionSnapShot(env, argc, argv, false); } napi_value OnGetLowResolutionMissionSnapShot(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("called"); + TAG_LOGI(AAFwkTag::MISSION, "called"); return GetMissionSnapShot(env, argc, argv, true); } napi_value GetMissionSnapShot(napi_env env, size_t argc, napi_value* argv, bool isLowResolution) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); std::string deviceId; int32_t missionId = -1; if (!CheckMissionSnapShotParams(env, argc, argv, deviceId, missionId)) { @@ -465,13 +466,13 @@ private: } if (!ConvertFromJsValue(env, argv[0], deviceId)) { - HILOG_ERROR("missionSnapshot: Parse deviceId failed"); + TAG_LOGE(AAFwkTag::MISSION, "missionSnapshot: Parse deviceId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return false; } if (!ConvertFromJsValue(env, argv[1], missionId)) { - HILOG_ERROR("missionSnapshot: Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "missionSnapshot: Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return false; } @@ -481,15 +482,15 @@ private: napi_value OnLockMission(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnLockMission Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnLockMission Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnLockMission Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnLockMission Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -514,15 +515,15 @@ private: napi_value OnUnlockMission(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnUnlockMission Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnUnlockMission Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnUnlockMission Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnUnlockMission Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -547,15 +548,15 @@ private: napi_value OnClearMission(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnClearMission Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnClearMission Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnClearMission Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnClearMission Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -580,7 +581,7 @@ private: napi_value OnClearAllMissions(napi_env env, const size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); NapiAsyncTask::CompleteCallback complete = [](napi_env env, NapiAsyncTask &task, int32_t status) { auto ret = AbilityManagerClient::GetInstance()->CleanAllMissions(); @@ -601,15 +602,15 @@ private: napi_value OnMoveMissionToFront(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnMoveMissionToFront Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionToFront Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnMoveMissionToFront Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionToFront Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -617,7 +618,7 @@ private: AAFwk::StartOptions startOptions; if (argc > ARGC_ONE && AppExecFwk::IsTypeForNapiValue(env, argv[1], napi_object)) { - HILOG_INFO("OnMoveMissionToFront start options is used."); + TAG_LOGI(AAFwkTag::MISSION, "OnMoveMissionToFront start options is used."); AppExecFwk::UnwrapStartOptions(env, argv[1], startOptions); unwrapArgc++; } @@ -642,17 +643,17 @@ private: napi_value OnMoveMissionsToForeground(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); std::vector missionIds; if (argc < ARGC_ONE) { - HILOG_ERROR("OnMoveMissionsToForeground Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionsToForeground Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } uint32_t nativeArrayLen = 0; napi_get_array_length(env, argv[0], &nativeArrayLen); if (nativeArrayLen == 0) { - HILOG_ERROR("OnMoveMissionsToForeground MissionId is null"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionsToForeground MissionId is null"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -661,7 +662,7 @@ private: int32_t missionId = 0; napi_get_element(env, argv[0], i, &element); if (!ConvertFromJsValue(env, element, missionId)) { - HILOG_ERROR("OnMoveMissionsToForeground Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionsToForeground Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -672,7 +673,7 @@ private: decltype(argc) unwrapArgc = 1; if (argc > ARGC_ONE && AppExecFwk::IsTypeForNapiValue(env, argv[1], napi_number)) { if (!ConvertFromJsValue(env, argv[1], topMissionId)) { - HILOG_ERROR("OnMoveMissionsToForeground Parse topMissionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionsToForeground Parse topMissionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -700,18 +701,18 @@ private: napi_value OnMoveMissionsToBackground(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); std::vector missionIds; if (argc < ARGC_ONE) { - HILOG_ERROR("OnMoveMissionsToBackground Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionsToBackground Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } uint32_t nativeArrayLen = 0; napi_get_array_length(env, argv[0], &nativeArrayLen); if (nativeArrayLen == 0) { - HILOG_ERROR("OnMoveMissionsToBackground MissionId is null"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionsToBackground MissionId is null"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -720,7 +721,7 @@ private: int32_t missionId; napi_get_element(env, argv[0], i, &element); if (!ConvertFromJsValue(env, element, missionId)) { - HILOG_ERROR("OnMoveMissionsToBackground Parse topMissionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionsToBackground Parse topMissionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -760,18 +761,18 @@ private: } if (!AppExecFwk::IsTypeForNapiValue(env, argv[0], napi_string)) { - HILOG_ERROR("CheckOnOffType, Param 0 is not string"); + TAG_LOGE(AAFwkTag::MISSION, "CheckOnOffType, Param 0 is not string"); return false; } std::string type; if (!ConvertFromJsValue(env, argv[0], type)) { - HILOG_ERROR("CheckOnOffType, Parse on off type failed"); + TAG_LOGE(AAFwkTag::MISSION, "CheckOnOffType, Parse on off type failed"); return false; } if (type != ON_OFF_TYPE) { - HILOG_ERROR("CheckOnOffType, args[0] should be mission."); + TAG_LOGE(AAFwkTag::MISSION, "CheckOnOffType, args[0] should be mission."); return false; } return true; @@ -792,9 +793,9 @@ private: napi_value JsMissionManagerInit(napi_env env, napi_value exportObj) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::MISSION, "called"); if (env == nullptr || exportObj == nullptr) { - HILOG_INFO("Invalid input parameters"); + TAG_LOGI(AAFwkTag::MISSION, "Invalid input parameters"); return nullptr; } diff --git a/frameworks/js/napi/mission_manager/distributed_mission_manager.cpp b/frameworks/js/napi/mission_manager/distributed_mission_manager.cpp index 5862ed24ad..7287ad782e 100644 --- a/frameworks/js/napi/mission_manager/distributed_mission_manager.cpp +++ b/frameworks/js/napi/mission_manager/distributed_mission_manager.cpp @@ -19,6 +19,7 @@ #include "ability_manager_client.h" #include "dms_sa_client.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "ipc_skeleton.h" #include "napi_common_data.h" @@ -121,25 +122,25 @@ napi_value GetUndefined(const napi_env &env) bool SetStartSyncMissionsContext(const napi_env &env, const napi_value &value, SyncRemoteMissionsContext* context, std::string &errInfo) { - HILOG_INFO("%{public}s call.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s call.", __func__); bool isFixConflict = false; napi_has_named_property(env, value, "fixConflict", &isFixConflict); if (!isFixConflict) { - HILOG_ERROR("%{public}s, Wrong argument name for fixConflict.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for fixConflict.", __func__); errInfo = "Parameter error. The key of \"MissionParameter\" must be fixConflict"; return false; } napi_value fixConflictValue = nullptr; napi_get_named_property(env, value, "fixConflict", &fixConflictValue); if (fixConflictValue == nullptr) { - HILOG_ERROR("%{public}s, not find fixConflict.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find fixConflict.", __func__); errInfo = "Parameter error. The value of \"fixConflict\" must not be undefined"; return false; } napi_valuetype valueType = napi_undefined; napi_typeof(env, fixConflictValue, &valueType); if (valueType != napi_boolean) { - HILOG_ERROR("%{public}s, fixConflict error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, fixConflict error type.", __func__); errInfo = "Parameter error. The type of \"fixConflict\" must be boolean"; return false; } @@ -147,36 +148,36 @@ bool SetStartSyncMissionsContext(const napi_env &env, const napi_value &value, bool isTag = false; napi_has_named_property(env, value, "tag", &isTag); if (!isTag) { - HILOG_ERROR("%{public}s, Wrong argument name for tag.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for tag.", __func__); errInfo = "Parameter error. The key of \"MissionParameter\" must be tag"; return false; } napi_value tagValue = nullptr; napi_get_named_property(env, value, "tag", &tagValue); if (tagValue == nullptr) { - HILOG_ERROR("%{public}s, not find tag.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find tag.", __func__); errInfo = "Parameter error. The value of \"tag\" must not be undefined"; return false; } napi_typeof(env, tagValue, &valueType); if (valueType != napi_number) { - HILOG_ERROR("%{public}s, tag error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, tag error type.", __func__); errInfo = "Parameter error. The type of \"tag\" must be number"; return false; } napi_get_value_int64(env, tagValue, &context->tag); - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return true; } bool SetSyncRemoteMissionsContext(const napi_env &env, const napi_value &value, bool isStart, SyncRemoteMissionsContext* context, std::string &errInfo) { - HILOG_INFO("%{public}s call.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s call.", __func__); napi_valuetype valueType = napi_undefined; napi_typeof(env, value, &valueType); if (valueType != napi_object) { - HILOG_ERROR("%{public}s, Wrong argument type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type.", __func__); errInfo = "Parameter error. The type of \"parameter\" must be MissionParameter"; return false; } @@ -184,19 +185,19 @@ bool SetSyncRemoteMissionsContext(const napi_env &env, const napi_value &value, bool isDeviceId = false; napi_has_named_property(env, value, "deviceId", &isDeviceId); if (!isDeviceId) { - HILOG_ERROR("%{public}s, Wrong argument name for deviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for deviceId.", __func__); errInfo = "Parameter error. The key of \"parameter\" must be deviceId"; return false; } napi_get_named_property(env, value, "deviceId", &deviceIdValue); if (deviceIdValue == nullptr) { - HILOG_ERROR("%{public}s, not find deviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find deviceId.", __func__); errInfo = "Parameter error. The value of \"deviceId\" must not be undefined"; return false; } napi_typeof(env, deviceIdValue, &valueType); if (valueType != napi_string) { - HILOG_ERROR("%{public}s, deviceId error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, deviceId error type.", __func__); errInfo = "Parameter error. The type of \"deviceId\" must be string"; return false; } @@ -204,7 +205,7 @@ bool SetSyncRemoteMissionsContext(const napi_env &env, const napi_value &value, char deviceId[VALUE_BUFFER_SIZE + 1] = {0}; napi_get_value_string_utf8(env, deviceIdValue, deviceId, VALUE_BUFFER_SIZE + 1, &context->valueLen); if (context->valueLen > VALUE_BUFFER_SIZE) { - HILOG_ERROR("%{public}s, deviceId length not correct", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, deviceId length not correct", __func__); errInfo = "Parameter error. The length of \"deviceId\" must be less than " + std::to_string(VALUE_BUFFER_SIZE); return false; @@ -213,49 +214,49 @@ bool SetSyncRemoteMissionsContext(const napi_env &env, const napi_value &value, if (isStart) { if (!SetStartSyncMissionsContext (env, value, context, errInfo)) { - HILOG_ERROR("%{public}s, Wrong argument for start sync.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument for start sync.", __func__); return false; } } - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return true; } bool ProcessSyncInput(napi_env &env, napi_callback_info info, bool isStart, SyncRemoteMissionsContext* syncContext, std::string &errInfo) { - HILOG_INFO("%{public}s,called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s,called.", __func__); size_t argc = 2; napi_value argv[2] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc != ARGS_ONE && argc != ARGS_TWO) { - HILOG_ERROR("%{public}s, argument size error.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, argument size error.", __func__); errInfo = "Parameter error. The type of \"number of parameters\" must be 1 or 2"; return false; } syncContext->env = env; if (!SetSyncRemoteMissionsContext(env, argv[0], isStart, syncContext, errInfo)) { - HILOG_ERROR("%{public}s, Wrong argument.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument.", __func__); return false; } if (argc == ARGS_TWO) { napi_valuetype valueType = napi_undefined; napi_typeof(env, argv[1], &valueType); if (valueType != napi_function) { - HILOG_ERROR("%{public}s, callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, callback error type.", __func__); errInfo = "Parameter error. The type of \"callback\" must be AsynCallback: void"; return false; } napi_create_reference(env, argv[1], 1, &syncContext->callbackRef); } - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); return true; } void StartSyncRemoteMissionsAsyncWork(napi_env &env, const napi_value resourceName, SyncRemoteMissionsContext* syncContext) { - HILOG_INFO("%{public}s, called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, called.", __func__); napi_create_async_work(env, nullptr, resourceName, [](napi_env env, void* data) { SyncRemoteMissionsContext* syncContext = (SyncRemoteMissionsContext*)data; @@ -295,18 +296,18 @@ void StartSyncRemoteMissionsAsyncWork(napi_env &env, const napi_value resourceNa static_cast(syncContext), &syncContext->work); napi_queue_async_work_with_qos(env, syncContext->work, napi_qos_user_initiated); - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); } napi_value NAPI_StartSyncRemoteMissions(napi_env env, napi_callback_info info) { - HILOG_INFO("%{public}s, called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, called.", __func__); std::string errInfo = "Parameter error"; auto syncContext = new SyncRemoteMissionsContext(); if (!ProcessSyncInput(env, info, true, syncContext, errInfo)) { delete syncContext; syncContext = nullptr; - HILOG_ERROR("%{public}s, Wrong argument.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument.", __func__); napi_throw(env, GenerateBusinessError(env, PARAMETER_CHECK_FAILED, errInfo)); return GetUndefined(env); } @@ -321,14 +322,14 @@ napi_value NAPI_StartSyncRemoteMissions(napi_env env, napi_callback_info info) napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName); StartSyncRemoteMissionsAsyncWork(env, resourceName, syncContext); - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); return result; } void StopSyncRemoteMissionsAsyncWork(napi_env &env, napi_value resourceName, SyncRemoteMissionsContext* syncContext) { - HILOG_INFO("%{public}s, called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, called.", __func__); napi_create_async_work(env, nullptr, resourceName, [](napi_env env, void* data) { SyncRemoteMissionsContext* syncContext = (SyncRemoteMissionsContext*)data; @@ -367,18 +368,18 @@ void StopSyncRemoteMissionsAsyncWork(napi_env &env, napi_value resourceName, static_cast(syncContext), &syncContext->work); napi_queue_async_work_with_qos(env, syncContext->work, napi_qos_user_initiated); - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); } napi_value NAPI_StopSyncRemoteMissions(napi_env env, napi_callback_info info) { - HILOG_INFO("%{public}s, called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, called.", __func__); std::string errInfo = "Parameter error"; auto syncContext = new SyncRemoteMissionsContext(); if (!ProcessSyncInput(env, info, false, syncContext, errInfo)) { delete syncContext; syncContext = nullptr; - HILOG_ERROR("%{public}s, Wrong argument.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument.", __func__); napi_throw(env, GenerateBusinessError(env, PARAMETER_CHECK_FAILED, errInfo)); return GetUndefined(env); } @@ -393,60 +394,60 @@ napi_value NAPI_StopSyncRemoteMissions(napi_env env, napi_callback_info info) napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName); StopSyncRemoteMissionsAsyncWork(env, resourceName, syncContext); - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); return result; } RegisterMissionCB *CreateRegisterMissionCBCBInfo(napi_env &env) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto registerMissionCB = new (std::nothrow) RegisterMissionCB; if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s registerMissionCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s registerMissionCB == nullptr", __func__); return nullptr; } registerMissionCB->cbBase.cbInfo.env = env; registerMissionCB->cbBase.asyncWork = nullptr; registerMissionCB->cbBase.deferred = nullptr; registerMissionCB->callbackRef = nullptr; - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return registerMissionCB; } OnCB *CreateOnCBCBInfo(napi_env &env) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto onCB = new (std::nothrow) OnCB; if (onCB == nullptr) { - HILOG_ERROR("%{public}s onCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s onCB == nullptr", __func__); return nullptr; } onCB->cbBase.cbInfo.env = env; onCB->cbBase.asyncWork = nullptr; onCB->cbBase.deferred = nullptr; onCB->callbackRef = nullptr; - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return onCB; } void RegisterMissionExecuteCB(napi_env env, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto registerMissionCB = (RegisterMissionCB*)data; std::lock_guard autoLock(registrationLock_); sptr registration; auto item = registration_.find(registerMissionCB->deviceId); if (item != registration_.end()) { - HILOG_INFO("registration exits."); + TAG_LOGI(AAFwkTag::MISSION, "registration exits."); registration = registration_[registerMissionCB->deviceId]; } else { - HILOG_INFO("registration not exits."); + TAG_LOGI(AAFwkTag::MISSION, "registration not exits."); registration = new (std::nothrow) NAPIRemoteMissionListener(); } registerMissionCB->missionRegistration = registration; if (registerMissionCB->missionRegistration == nullptr) { - HILOG_ERROR("%{public}s missionRegistration == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s missionRegistration == nullptr.", __func__); registerMissionCB->result = -1; return; } @@ -458,22 +459,22 @@ void RegisterMissionExecuteCB(napi_env env, void *data) registerMissionCB->missionRegistration-> SetNotifyNetDisconnectCBRef(registerMissionCB-> missionRegistrationCB.callback[2]); // 2 refers the second argument - HILOG_INFO("set callback success."); + TAG_LOGI(AAFwkTag::MISSION, "set callback success."); registerMissionCB->result = AbilityManagerClient::GetInstance()-> RegisterMissionListener(registerMissionCB->deviceId, registerMissionCB->missionRegistration); if (registerMissionCB->result == NO_ERROR) { - HILOG_INFO("add registration."); + TAG_LOGI(AAFwkTag::MISSION, "add registration."); registration_[registerMissionCB->deviceId] = registration; } - HILOG_DEBUG("%{public}s end.deviceId:%{public}d ", __func__, registerMissionCB->result); + TAG_LOGD(AAFwkTag::MISSION, "%{public}s end.deviceId:%{public}d ", __func__, registerMissionCB->result); } void RegisterMissionCallbackCompletedCB(napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto registerMissionCB = static_cast(data); // set result napi_value result[2] = { nullptr }; @@ -488,7 +489,7 @@ void RegisterMissionCallbackCompletedCB(napi_env env, napi_status status, void * ReturnValueToApplication(env, &result[0], registerMissionCB); delete registerMissionCB; registerMissionCB = nullptr; - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); } void ReturnValueToApplication(napi_env &env, napi_value *result, RegisterMissionCB *registerMissionCB) @@ -511,9 +512,9 @@ void ReturnValueToApplication(napi_env &env, napi_value *result, RegisterMission napi_value RegisterMissionAsync(napi_env env, RegisterMissionCB *registerMissionCB) { - HILOG_INFO("%{public}s asyncCallback.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s asyncCallback.", __func__); if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s, registerMissionCB == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, registerMissionCB == nullptr.", __func__); napi_throw(env, GenerateBusinessError(env, SYSTEM_WORK_ABNORMALLY, ErrorMessageReturn(SYSTEM_WORK_ABNORMALLY))); return nullptr; } @@ -534,13 +535,13 @@ napi_value RegisterMissionAsync(napi_env env, RegisterMissionCB *registerMission static_cast(registerMissionCB), ®isterMissionCB->cbBase.asyncWork); napi_queue_async_work(env, registerMissionCB->cbBase.asyncWork); - HILOG_INFO("%{public}s asyncCallback end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s asyncCallback end.", __func__); return result; } bool CheckMissionCallbackProperty(napi_env &env, const napi_value &value, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); bool isFirstCallback = false; napi_has_named_property(env, value, "notifyMissionsChanged", &isFirstCallback); bool isSecondCallback = false; @@ -548,95 +549,95 @@ bool CheckMissionCallbackProperty(napi_env &env, const napi_value &value, std::s bool isThirdCallback = false; napi_has_named_property(env, value, "notifyNetDisconnect", &isThirdCallback); if (!isFirstCallback || !isSecondCallback || !isThirdCallback) { - HILOG_ERROR("%{public}s, Wrong argument name for callback.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for callback.", __func__); errInfo = "Parameter error. The type of \"options\" must be MissionCallback"; return false; } - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } bool SetCallbackReference(napi_env &env, const napi_value &value, RegisterMissionCB *registerMissionCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); if (!CheckMissionCallbackProperty(env, value, errInfo)) { return false; } napi_value jsMethod = nullptr; napi_get_named_property(env, value, "notifyMissionsChanged", &jsMethod); if (jsMethod == nullptr) { - HILOG_ERROR("%{public}s, not find callback notifyMissionsChanged.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find callback notifyMissionsChanged.", __func__); errInfo = "Parameter error. The value of \"notifyMissionsChanged\" must not be undefined"; return false; } napi_valuetype valuetype = napi_undefined; napi_typeof(env, jsMethod, &valuetype); if (valuetype != napi_function) { - HILOG_ERROR("%{public}s, notifyMissionsChanged callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, notifyMissionsChanged callback error type.", __func__); errInfo = "Parameter error. The type of \"notifyMissionsChanged\" must be function"; return false; } napi_create_reference(env, jsMethod, 1, ®isterMissionCB->missionRegistrationCB.callback[0]); napi_get_named_property(env, value, "notifySnapshot", &jsMethod); if (jsMethod == nullptr) { - HILOG_ERROR("%{public}s, not find callback notifySnapshot.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find callback notifySnapshot.", __func__); errInfo = "Parameter error. The value of \"notifySnapshot\" must not be undefined"; return false; } napi_typeof(env, jsMethod, &valuetype); if (valuetype != napi_function) { - HILOG_ERROR("%{public}s, notifySnapshot callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, notifySnapshot callback error type.", __func__); errInfo = "Parameter error. The type of \"notifySnapshot\" must be function"; return false; } napi_create_reference(env, jsMethod, 1, ®isterMissionCB->missionRegistrationCB.callback[1]); napi_get_named_property(env, value, "notifyNetDisconnect", &jsMethod); if (jsMethod == nullptr) { - HILOG_ERROR("%{public}s, not find callback notifyNetDisconnect.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find callback notifyNetDisconnect.", __func__); errInfo = "Parameter error. The value of \"notifyNetDisconnect\" must not be undefined"; return false; } napi_typeof(env, jsMethod, &valuetype); if (valuetype != napi_function) { - HILOG_ERROR("%{public}s, notifyNetDisconnect callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, notifyNetDisconnect callback error type.", __func__); errInfo = "Parameter error. The type of \"notifyNetDisconnect\" must be function"; return false; } // 2 refers the second argument napi_create_reference(env, jsMethod, 1, ®isterMissionCB->missionRegistrationCB.callback[2]); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } bool CreateCallbackReference(napi_env &env, const napi_value &value, RegisterMissionCB *registerMissionCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_valuetype valuetype = napi_undefined; napi_typeof(env, value, &valuetype); if (valuetype == napi_object) { if (!SetCallbackReference(env, value, registerMissionCB, errInfo)) { - HILOG_ERROR("%{public}s, Wrong callback.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong callback.", __func__); return false; } } else { - HILOG_ERROR("%{public}s, Wrong argument type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type.", __func__); errInfo = "Parameter error. The type of \"options\" must be MissionCallback"; return false; } - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } bool CreateOnCallbackReference(napi_env &env, const napi_value &jsMethod, OnCB *onCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_valuetype valuetype = napi_undefined; napi_typeof(env, jsMethod, &valuetype); if (valuetype != napi_function) { - HILOG_ERROR("%{public}s, onCallback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, onCallback error type.", __func__); errInfo = "Parameter error. The type of \"onCallback\" must be function"; return false; } @@ -644,7 +645,7 @@ bool CreateOnCallbackReference(napi_env &env, const napi_value &jsMethod, napi_create_reference(env, jsMethod, 1, &onCB->callbackRef); onCB->onCallbackCB.napiCallback = std::unique_ptr(reinterpret_cast(onCB->onCallbackCB.callback)); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } @@ -656,7 +657,7 @@ bool RegisterMissionWrapDeviceId(napi_env &env, napi_value &argc, napi_has_named_property(env, argc, "deviceId", &isDeviceId); napi_typeof(env, argc, &valueType); if (!isDeviceId || valueType != napi_object) { - HILOG_ERROR("%{public}s, Wrong argument name for deviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for deviceId.", __func__); errInfo = "Parameter error. The key of \"MissionDeviceInfo\" must be deviceId"; return false; } @@ -664,13 +665,13 @@ bool RegisterMissionWrapDeviceId(napi_env &env, napi_value &argc, napi_value napiDeviceId = nullptr; napi_get_named_property(env, argc, "deviceId", &napiDeviceId); if (napiDeviceId == nullptr) { - HILOG_ERROR("%{public}s, not find deviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find deviceId.", __func__); errInfo = "Parameter error. The value of \"deviceId\" must not be undefined"; return false; } napi_typeof(env, napiDeviceId, &valueType); if (valueType != napi_string) { - HILOG_ERROR("%{public}s, deviceId error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, deviceId error type.", __func__); errInfo = "Parameter error. The type of \"deviceId\" must be string"; return false; } @@ -678,7 +679,7 @@ bool RegisterMissionWrapDeviceId(napi_env &env, napi_value &argc, size_t valueLen = 0; napi_get_value_string_utf8(env, napiDeviceId, deviceId, VALUE_BUFFER_SIZE + 1, &valueLen); if (valueLen > VALUE_BUFFER_SIZE) { - HILOG_ERROR("%{public}s, deviceId length not correct", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, deviceId length not correct", __func__); errInfo = "Parameter error. The length of \"deviceId\" must be less than " + std::to_string(VALUE_BUFFER_SIZE); return false; @@ -693,13 +694,13 @@ bool OnWrapType(napi_env &env, napi_value &argc, napi_valuetype valueType = napi_undefined; napi_typeof(env, argc, &valueType); if (valueType != napi_string) { - HILOG_ERROR("%{public}s, Wrong argument name for type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for type.", __func__); errInfo = "Parameter error. The type of \"type\" must be string"; return false; } std::string type = AppExecFwk::UnwrapStringFromJS(env, argc, ""); if (type != "continueStateChange") { - HILOG_ERROR("%{public}s, not find type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find type.", __func__); errInfo = "Parameter error. The value of \"type\" must not be continueStateChange"; return false; } @@ -710,18 +711,18 @@ bool OnWrapType(napi_env &env, napi_value &argc, napi_value RegisterMissionWrap(napi_env &env, napi_callback_info info, RegisterMissionCB *registerMissionCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); size_t argcAsync = 3; napi_value args[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argcAsync, args, nullptr, nullptr); if (argcAsync != ARGS_TWO && argcAsync != ARGS_THREE) { - HILOG_ERROR("%{public}s, Wrong argument count.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument count.", __func__); errInfo = "Parameter error. The type of \"number of parameters\" must be 2 or 3"; return nullptr; } if (!RegisterMissionWrapDeviceId(env, args[0], registerMissionCB, errInfo)) { - HILOG_INFO("%{public}s, RegisterMissionWrapDeviceId failed.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, RegisterMissionWrapDeviceId failed.", __func__); return nullptr; } if (argcAsync > 1 && !CreateCallbackReference(env, args[1], registerMissionCB, errInfo)) { @@ -731,7 +732,7 @@ napi_value RegisterMissionWrap(napi_env &env, napi_callback_info info, if (argcAsync == ARGS_THREE) { napi_typeof(env, args[ARGS_TWO], &valueType); if (valueType != napi_function) { - HILOG_ERROR("%{public}s, callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, callback error type.", __func__); errInfo = "Parameter error. The type of \"options\" must be MissionCallback"; return nullptr; } @@ -739,26 +740,26 @@ napi_value RegisterMissionWrap(napi_env &env, napi_callback_info info, } napi_value ret = RegisterMissionAsync(env, registerMissionCB); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return ret; } void OnExecuteCB(napi_env &env, OnCB *onCB) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); std::lock_guard autoLock(onLock_); sptr registrationOfOn; auto item = registrationOfOn_.find(onCB->type); if (item != registrationOfOn_.end()) { - HILOG_INFO("registrationOfOn exits."); + TAG_LOGI(AAFwkTag::MISSION, "registrationOfOn exits."); registrationOfOn = registrationOfOn_[onCB->type]; } else { - HILOG_INFO("registrationOfOn not exits."); + TAG_LOGI(AAFwkTag::MISSION, "registrationOfOn not exits."); registrationOfOn = new (std::nothrow) NAPIRemoteOnListener(); } onCB->onRegistration = registrationOfOn; if (onCB->onRegistration == nullptr) { - HILOG_ERROR("%{public}s onRegistration == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s onRegistration == nullptr.", __func__); onCB->result = -1; int32_t errCode = ErrorCodeReturn(onCB->result); napi_throw(env, GenerateBusinessError(env, errCode, ErrorMessageReturn(errCode))); @@ -770,37 +771,37 @@ void OnExecuteCB(napi_env &env, OnCB *onCB) for (auto ele = vecCallback.begin(); ele != vecCallback.end(); ++ele) { napi_strict_equals(env, (*ele)->GetNapiValue(), onCB->onCallbackCB.napiCallback->GetNapiValue(), &result); if (result) { - HILOG_ERROR("Object does match value."); + TAG_LOGE(AAFwkTag::MISSION, "Object does match value."); return; } } onCB->onRegistration-> SetOnCallbackCBRef(onCB->onCallbackCB.napiCallback); - HILOG_INFO("set callback success."); + TAG_LOGI(AAFwkTag::MISSION, "set callback success."); onCB->result = DmsSaClient::GetInstance().AddListener(onCB->type, onCB->onRegistration); if (onCB->result == NO_ERROR) { - HILOG_INFO("add registrationOfOn success."); + TAG_LOGI(AAFwkTag::MISSION, "add registrationOfOn success."); registrationOfOn_[onCB->type] = registrationOfOn; } else { - HILOG_INFO("add registrationOfOn failed"); + TAG_LOGI(AAFwkTag::MISSION, "add registrationOfOn failed"); } - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); } napi_value OnWrap(napi_env &env, napi_callback_info info, OnCB *onCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); size_t argcAsync = 2; napi_value args[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argcAsync, args, nullptr, nullptr); if (argcAsync != ARGS_TWO) { - HILOG_ERROR("%{public}s, Wrong argument count.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument count.", __func__); errInfo = "Parameter error. The type of \"number of parameters\" must be 2"; return nullptr; } if (!OnWrapType(env, args[0], onCB, errInfo)) { - HILOG_INFO("%{public}s, OnWrapType failed.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, OnWrapType failed.", __func__); return nullptr; } if (!CreateOnCallbackReference(env, args[1], onCB, errInfo)) { @@ -817,52 +818,52 @@ napi_value OnWrap(napi_env &env, napi_callback_info info, } napi_value result = nullptr; napi_get_undefined(env, &result); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return result; } void OffExecuteCB(napi_env env, OnCB *onCB) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); std::lock_guard autoLock(onLock_); sptr registrationOfOn; auto item = registrationOfOn_.find(onCB->type); if (item != registrationOfOn_.end()) { - HILOG_INFO("registrationOfOff exits."); + TAG_LOGI(AAFwkTag::MISSION, "registrationOfOff exits."); registrationOfOn = registrationOfOn_[onCB->type]; } else { - HILOG_INFO("registrationOfOff not exits."); + TAG_LOGI(AAFwkTag::MISSION, "registrationOfOff not exits."); onCB->result = -1; return; } onCB->onRegistration = registrationOfOn; onCB->onRegistration->DelOnCallbackCBRef(env, onCB->onCallbackCB.napiCallback); if (!onCB->onRegistration->GetOnCallbackCBRef().empty()) { - HILOG_INFO("There are still other remaining callback"); + TAG_LOGI(AAFwkTag::MISSION, "There are still other remaining callback"); return; } DmsSaClient::GetInstance().DelListener(onCB->type, onCB->onRegistration); if (onCB->result == NO_ERROR) { - HILOG_INFO("remove registration."); + TAG_LOGI(AAFwkTag::MISSION, "remove registration."); registrationOfOn_.erase(onCB->type); } - HILOG_DEBUG("%{public}s end.type:%{public}d ", __func__, onCB->result); + TAG_LOGD(AAFwkTag::MISSION, "%{public}s end.type:%{public}d ", __func__, onCB->result); } napi_value OffWrap(napi_env &env, napi_callback_info info, OnCB *onCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); size_t argcAsync = 2; napi_value args[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argcAsync, args, nullptr, nullptr); if (argcAsync != ARGS_ONE && argcAsync != ARGS_TWO) { - HILOG_ERROR("%{public}s, Wrong argument count.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument count.", __func__); errInfo = "Parameter error. The type of \"number of parameters\" must be 1 or 2"; return nullptr; } if (!OnWrapType(env, args[0], onCB, errInfo)) { - HILOG_INFO("%{public}s, OffWrapType failed.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, OffWrapType failed.", __func__); return nullptr; } if (argcAsync == ARGS_TWO && !CreateOnCallbackReference(env, args[1], onCB, errInfo)) { @@ -878,82 +879,82 @@ napi_value OffWrap(napi_env &env, napi_callback_info info, } napi_value result = nullptr; napi_get_undefined(env, &result); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return result; } napi_value NAPI_RegisterMissionListener(napi_env env, napi_callback_info info) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); std::string errInfo = "Parameter error"; RegisterMissionCB *registerMissionCB = CreateRegisterMissionCBCBInfo(env); if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s registerMissionCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s registerMissionCB == nullptr", __func__); napi_throw(env, GenerateBusinessError(env, SYSTEM_WORK_ABNORMALLY, ErrorMessageReturn(SYSTEM_WORK_ABNORMALLY))); return GetUndefined(env); } napi_value ret = RegisterMissionWrap(env, info, registerMissionCB, errInfo); if (ret == nullptr) { - HILOG_ERROR("%{public}s ret == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s ret == nullptr", __func__); delete registerMissionCB; registerMissionCB = nullptr; napi_throw(env, GenerateBusinessError(env, PARAMETER_CHECK_FAILED, errInfo)); return GetUndefined(env); } - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return ret; } napi_value NAPI_On(napi_env env, napi_callback_info info) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); std::string errInfo = "Parameter error"; OnCB *onCB = CreateOnCBCBInfo(env); if (onCB == nullptr) { - HILOG_ERROR("%{public}s onCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s onCB == nullptr", __func__); napi_throw(env, GenerateBusinessError(env, SYSTEM_WORK_ABNORMALLY, ErrorMessageReturn(SYSTEM_WORK_ABNORMALLY))); return GetUndefined(env); } napi_value ret = OnWrap(env, info, onCB, errInfo); if (ret == nullptr) { - HILOG_ERROR("%{public}s ret == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s ret == nullptr", __func__); delete onCB; onCB = nullptr; napi_throw(env, GenerateBusinessError(env, PARAMETER_CHECK_FAILED, errInfo)); return GetUndefined(env); } - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return ret; } napi_value NAPI_Off(napi_env env, napi_callback_info info) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); std::string errInfo = "Parameter error"; OnCB *onCB = CreateOnCBCBInfo(env); if (onCB == nullptr) { - HILOG_ERROR("%{public}s onCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s onCB == nullptr", __func__); napi_throw(env, GenerateBusinessError(env, SYSTEM_WORK_ABNORMALLY, ErrorMessageReturn(SYSTEM_WORK_ABNORMALLY))); return GetUndefined(env); } napi_value ret = OffWrap(env, info, onCB, errInfo); if (ret == nullptr) { - HILOG_ERROR("%{public}s ret == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s ret == nullptr", __func__); delete onCB; onCB = nullptr; napi_throw(env, GenerateBusinessError(env, PARAMETER_CHECK_FAILED, errInfo)); return GetUndefined(env); } - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return ret; } napi_value NAPI_ContinueState(napi_env env) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_value continueState = nullptr; napi_create_object(env, &continueState); napi_value active = nullptr; @@ -962,7 +963,7 @@ napi_value NAPI_ContinueState(napi_env env) napi_create_int32(env, 1, &inActive); napi_set_named_property(env, continueState, "ACTIVE", active); napi_set_named_property(env, continueState, "INACTIVE", inActive); - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return continueState; } @@ -1023,7 +1024,7 @@ bool NAPIRemoteOnListener::DelOnCallbackCBRef(napi_env env, std::shared_ptrGetNapiValue(), ref->GetNapiValue(), &result); if (result) { - HILOG_ERROR("Object does match value, need delete this callback."); + TAG_LOGE(AAFwkTag::MISSION, "Object does match value, need delete this callback."); callbacks_.erase(ele); return result; } @@ -1044,14 +1045,14 @@ void NAPIRemoteMissionListener::SetNotifyNetDisconnectCBRef(const napi_ref &ref) void UvWorkNotifyMissionChanged(uv_work_t *work, int status) { - HILOG_INFO("UvWorkNotifyMissionChanged start, uv_queue_work"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkNotifyMissionChanged start, uv_queue_work"); if (work == nullptr) { - HILOG_ERROR("UvWorkNotifyMissionChanged, work is nullptr"); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkNotifyMissionChanged, work is nullptr"); return; } RegisterMissionCB *registerMissionCB = static_cast(work->data); if (registerMissionCB == nullptr) { - HILOG_ERROR("UvWorkNotifyMissionChanged, registerMissionCB is null"); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkNotifyMissionChanged, registerMissionCB is null"); delete work; return; } @@ -1081,19 +1082,19 @@ void UvWorkNotifyMissionChanged(uv_work_t *work, int status) delete registerMissionCB; registerMissionCB = nullptr; delete work; - HILOG_INFO("UvWorkNotifyMissionChanged, uv_queue_work end"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkNotifyMissionChanged, uv_queue_work end"); } void UvWorkOnCallback(uv_work_t *work, int status) { - HILOG_INFO("UvWorkOnCallback, uv_queue_work"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkOnCallback, uv_queue_work"); if (work == nullptr) { - HILOG_ERROR("UvWorkOnCallback, work is null"); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkOnCallback, work is null"); return; } OnCB *onCB = static_cast(work->data); if (onCB == nullptr) { - HILOG_ERROR("UvWorkOnCallback, onCB is null"); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkOnCallback, onCB is null"); delete work; return; } @@ -1126,17 +1127,17 @@ void UvWorkOnCallback(uv_work_t *work, int status) delete onCB; onCB = nullptr; delete work; - HILOG_INFO("UvWorkOnCallback, uv_queue_work end"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkOnCallback, uv_queue_work end"); } void NAPIRemoteMissionListener::NotifyMissionsChanged(const std::string &deviceId) { - HILOG_INFO("%{public}s, called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, called.", __func__); uv_loop_s *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { - HILOG_ERROR("%{public}s, loop == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, loop == nullptr.", __func__); return; } @@ -1144,7 +1145,7 @@ void NAPIRemoteMissionListener::NotifyMissionsChanged(const std::string &deviceI auto registerMissionCB = new (std::nothrow) RegisterMissionCB; if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s, registerMissionCB == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, registerMissionCB == nullptr.", __func__); delete work; return; } @@ -1160,18 +1161,18 @@ void NAPIRemoteMissionListener::NotifyMissionsChanged(const std::string &deviceI registerMissionCB = nullptr; delete work; } - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); } void NAPIRemoteOnListener::OnCallback(const uint32_t continueState, const std::string &srcDeviceId, const std::string &bundleName) { - HILOG_INFO("%{public}s, called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, called.", __func__); uv_loop_s *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { - HILOG_ERROR("%{public}s, loop == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, loop == nullptr.", __func__); return; } @@ -1179,7 +1180,7 @@ void NAPIRemoteOnListener::OnCallback(const uint32_t continueState, const std::s auto onCB = new (std::nothrow) OnCB; if (onCB == nullptr) { - HILOG_ERROR("%{public}s, onCB == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, onCB == nullptr.", __func__); delete work; return; } @@ -1199,19 +1200,19 @@ void NAPIRemoteOnListener::OnCallback(const uint32_t continueState, const std::s onCB = nullptr; delete work; } - HILOG_INFO("%{public}s, OnCallback end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, OnCallback end.", __func__); } void UvWorkNotifySnapshot(uv_work_t *work, int status) { - HILOG_INFO("UvWorkNotifySnapshot enter, uv_queue_work"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkNotifySnapshot enter, uv_queue_work"); if (work == nullptr) { - HILOG_ERROR("UvWorkNotifySnapshot, work is null"); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkNotifySnapshot, work is null"); return; } RegisterMissionCB *registerMissionCB = static_cast(work->data); if (registerMissionCB == nullptr) { - HILOG_ERROR("UvWorkNotifySnapshot, registerMissionCB is null"); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkNotifySnapshot, registerMissionCB is null"); delete work; return; } @@ -1235,7 +1236,7 @@ void UvWorkNotifySnapshot(uv_work_t *work, int status) delete registerMissionCB; registerMissionCB = nullptr; delete work; - HILOG_INFO("UvWorkNotifySnapshot, uv_queue_work end"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkNotifySnapshot, uv_queue_work end"); } void CallbackReturn(napi_value *result, RegisterMissionCB *registerMissionCB) @@ -1256,7 +1257,7 @@ void NAPIRemoteMissionListener::NotifySnapshot(const std::string &deviceId, int3 napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { - HILOG_ERROR("%{public}s, loop == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, loop == nullptr.", __func__); return; } @@ -1264,7 +1265,7 @@ void NAPIRemoteMissionListener::NotifySnapshot(const std::string &deviceId, int3 auto registerMissionCB = new (std::nothrow) RegisterMissionCB; if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s, registerMissionCB == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, registerMissionCB == nullptr.", __func__); delete work; return; } @@ -1281,19 +1282,19 @@ void NAPIRemoteMissionListener::NotifySnapshot(const std::string &deviceId, int3 registerMissionCB = nullptr; delete work; } - HILOG_INFO("%{public}s, NotifySnapshot end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, NotifySnapshot end.", __func__); } void UvWorkNotifyNetDisconnect(uv_work_t *work, int status) { - HILOG_INFO("UvWorkNotifyNetDisconnect begin, uv_queue_work"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkNotifyNetDisconnect begin, uv_queue_work"); if (work == nullptr) { - HILOG_ERROR("UvWorkNotifyNetDisconnect, work is null."); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkNotifyNetDisconnect, work is null."); return; } RegisterMissionCB *registerMissionCB = static_cast(work->data); if (registerMissionCB == nullptr) { - HILOG_ERROR("UvWorkNotifyNetDisconnect, registerMissionCB is null"); + TAG_LOGE(AAFwkTag::MISSION, "UvWorkNotifyNetDisconnect, registerMissionCB is null"); delete work; return; } @@ -1309,7 +1310,7 @@ void UvWorkNotifyNetDisconnect(uv_work_t *work, int status) napi_value result[2] = {nullptr}; result[0] = WrapString(registerMissionCB->cbBase.cbInfo.env, registerMissionCB->deviceId.c_str(), "deviceId"); - HILOG_INFO("UvWorkNotifyNetDisconnect, state = %{public}d", registerMissionCB->state); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkNotifyNetDisconnect, state = %{public}d", registerMissionCB->state); result[1] = CreateInt32(registerMissionCB->cbBase.cbInfo.env, registerMissionCB->state, "state"); @@ -1319,17 +1320,17 @@ void UvWorkNotifyNetDisconnect(uv_work_t *work, int status) delete registerMissionCB; registerMissionCB = nullptr; delete work; - HILOG_INFO("UvWorkNotifyNetDisconnect, uv_queue_work end"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkNotifyNetDisconnect, uv_queue_work end"); } void NAPIRemoteMissionListener::NotifyNetDisconnect(const std::string &deviceId, int32_t state) { - HILOG_INFO("%{public}s called. state = %{public}d", __func__, state); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called. state = %{public}d", __func__, state); uv_loop_s *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { - HILOG_ERROR("%{public}s, loop == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, loop == nullptr.", __func__); return; } @@ -1337,7 +1338,7 @@ void NAPIRemoteMissionListener::NotifyNetDisconnect(const std::string &deviceId, auto registerMissionCB = new (std::nothrow) RegisterMissionCB; if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s, registerMissionCB == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, registerMissionCB == nullptr.", __func__); delete work; return; } @@ -1354,22 +1355,22 @@ void NAPIRemoteMissionListener::NotifyNetDisconnect(const std::string &deviceId, registerMissionCB = nullptr; delete work; } - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); } void UnRegisterMissionExecuteCB(napi_env env, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto registerMissionCB = (RegisterMissionCB*)data; std::lock_guard autoLock(registrationLock_); sptr registration; auto item = registration_.find(registerMissionCB->deviceId); if (item != registration_.end()) { - HILOG_INFO("registration exits."); + TAG_LOGI(AAFwkTag::MISSION, "registration exits."); registration = registration_[registerMissionCB->deviceId]; } else { - HILOG_INFO("registration not exits."); + TAG_LOGI(AAFwkTag::MISSION, "registration not exits."); registerMissionCB->result = INVALID_PARAMETERS_ERR; return; } @@ -1380,15 +1381,15 @@ void UnRegisterMissionExecuteCB(napi_env env, void *data) UnRegisterMissionListener(registerMissionCB->deviceId, registerMissionCB->missionRegistration); if (registerMissionCB->result == NO_ERROR) { - HILOG_INFO("remove registration."); + TAG_LOGI(AAFwkTag::MISSION, "remove registration."); registration_.erase(registerMissionCB->deviceId); } - HILOG_DEBUG("%{public}s end.deviceId:%{public}d ", __func__, registerMissionCB->result); + TAG_LOGD(AAFwkTag::MISSION, "%{public}s end.deviceId:%{public}d ", __func__, registerMissionCB->result); } void UnRegisterMissionPromiseCompletedCB(napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto registerMissionCB = (RegisterMissionCB*)data; // set result napi_value result[2] = { nullptr }; @@ -1403,14 +1404,14 @@ void UnRegisterMissionPromiseCompletedCB(napi_env env, napi_status status, void ReturnValueToApplication(env, &result[0], registerMissionCB); delete registerMissionCB; registerMissionCB = nullptr; - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); } napi_value UnRegisterMissionPromise(napi_env env, RegisterMissionCB *registerMissionCB) { - HILOG_INFO("%{public}s asyncCallback.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s asyncCallback.", __func__); if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s, param == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, param == nullptr.", __func__); return nullptr; } napi_value promise = nullptr; @@ -1431,14 +1432,14 @@ napi_value UnRegisterMissionPromise(napi_env env, RegisterMissionCB *registerMis static_cast(registerMissionCB), ®isterMissionCB->cbBase.asyncWork); napi_queue_async_work(env, registerMissionCB->cbBase.asyncWork); - HILOG_INFO("%{public}s asyncCallback end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s asyncCallback end.", __func__); return promise; } bool GetUnRegisterMissionDeviceId(napi_env &env, const napi_value &value, RegisterMissionCB *registerMissionCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_value napiDeviceId = nullptr; napi_valuetype valueType = napi_undefined; bool isDeviceId = false; @@ -1447,12 +1448,12 @@ bool GetUnRegisterMissionDeviceId(napi_env &env, const napi_value &value, if (isDeviceId && valueType == napi_object) { napi_get_named_property(env, value, "deviceId", &napiDeviceId); } else { - HILOG_ERROR("%{public}s, Wrong argument name for deviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for deviceId.", __func__); errInfo = "Parameter error. The key of \"MissionDeviceInfo\" must be deviceId"; return false; } if (napiDeviceId == nullptr) { - HILOG_ERROR("%{public}s, not find deviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find deviceId.", __func__); errInfo = "Parameter error. The value of \"deviceId\" must not be undefined"; return false; } @@ -1460,41 +1461,41 @@ bool GetUnRegisterMissionDeviceId(napi_env &env, const napi_value &value, size_t valueLen = 0; napi_typeof(env, napiDeviceId, &valueType); if (valueType != napi_string) { - HILOG_ERROR("%{public}s, Wrong argument type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type.", __func__); errInfo = "Parameter error. The type of \"deviceId\" must be string"; return false; } char deviceId[VALUE_BUFFER_SIZE + 1] = {0}; napi_get_value_string_utf8(env, napiDeviceId, deviceId, VALUE_BUFFER_SIZE + 1, &valueLen); if (valueLen > VALUE_BUFFER_SIZE) { - HILOG_ERROR("%{public}s, deviceId length not correct", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, deviceId length not correct", __func__); errInfo = "Parameter error. The length of \"deviceId\" must be less than " + std::to_string(VALUE_BUFFER_SIZE); return false; } registerMissionCB->deviceId = std::string(deviceId); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } napi_value UnRegisterMissionWrap(napi_env &env, napi_callback_info info, RegisterMissionCB *registerMissionCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); size_t argc = 2; napi_value args[ARGS_MAX_COUNT] = {nullptr}; napi_value ret = nullptr; napi_get_cb_info(env, info, &argc, args, nullptr, nullptr); - HILOG_INFO("argc is %{public}zu", argc); + TAG_LOGI(AAFwkTag::MISSION, "argc is %{public}zu", argc); if (argc != ARGS_ONE && argc != ARGS_TWO) { - HILOG_ERROR("%{public}s, Wrong argument count.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument count.", __func__); errInfo = "Parameter error. The type of \"number of parameters\" must be 1 or 2"; return nullptr; } if (!GetUnRegisterMissionDeviceId(env, args[0], registerMissionCB, errInfo)) { - HILOG_ERROR("%{public}s, Wrong argument.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument.", __func__); return nullptr; } @@ -1502,46 +1503,47 @@ napi_value UnRegisterMissionWrap(napi_env &env, napi_callback_info info, napi_valuetype valueType = napi_undefined; napi_typeof(env, args[1], &valueType); if (valueType != napi_function) { - HILOG_ERROR("%{public}s, callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, callback error type.", __func__); errInfo = "Parameter error. The type of \"callback\" must be AsynCallback: void"; return nullptr; } napi_create_reference(env, args[1], 1, ®isterMissionCB->callbackRef); } ret = UnRegisterMissionPromise(env, registerMissionCB); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return ret; } napi_value NAPI_UnRegisterMissionListener(napi_env env, napi_callback_info info) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); std::string errInfo = "Parameter error"; RegisterMissionCB *registerMissionCB = CreateRegisterMissionCBCBInfo(env); if (registerMissionCB == nullptr) { - HILOG_ERROR("%{public}s registerMissionCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s registerMissionCB == nullptr", __func__); napi_throw(env, GenerateBusinessError(env, SYSTEM_WORK_ABNORMALLY, ErrorMessageReturn(SYSTEM_WORK_ABNORMALLY))); return GetUndefined(env); } napi_value ret = UnRegisterMissionWrap(env, info, registerMissionCB, errInfo); if (ret == nullptr) { - HILOG_ERROR("%{public}s ret == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s ret == nullptr", __func__); delete registerMissionCB; registerMissionCB = nullptr; napi_throw(env, GenerateBusinessError(env, PARAMETER_CHECK_FAILED, errInfo)); return GetUndefined(env); } - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return ret; } napi_value WrapString(napi_env &env, const std::string ¶m, const std::string ¶mName) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_value jsValue = nullptr; - HILOG_DEBUG("%{public}s called. %{public}s = %{public}s", __func__, paramName.c_str(), param.c_str()); + TAG_LOGD(AAFwkTag::MISSION, "%{public}s called. %{public}s = %{public}s", + __func__, paramName.c_str(), param.c_str()); napi_create_string_utf8(env, param.c_str(), NAPI_AUTO_LENGTH, &jsValue); return jsValue; @@ -1549,13 +1551,13 @@ napi_value WrapString(napi_env &env, const std::string ¶m, const std::string napi_value WrapInt32(napi_env &env, int32_t num, const std::string ¶mName) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_value jsObject = nullptr; napi_create_object(env, &jsObject); napi_value jsValue = nullptr; - HILOG_DEBUG("%{public}s called. %{public}s = %{public}d", __func__, paramName.c_str(), num); + TAG_LOGD(AAFwkTag::MISSION, "%{public}s called. %{public}s = %{public}d", __func__, paramName.c_str(), num); napi_create_int32(env, num, &jsValue); napi_set_named_property(env, jsObject, paramName.c_str(), jsValue); @@ -1564,7 +1566,7 @@ napi_value WrapInt32(napi_env &env, int32_t num, const std::string ¶mName) napi_value CreateInt32(napi_env &env, int32_t num, const std::string ¶mName) { - HILOG_DEBUG("%{public}s called. %{public}s = %{public}d", __func__, paramName.c_str(), num); + TAG_LOGD(AAFwkTag::MISSION, "%{public}s called. %{public}s = %{public}d", __func__, paramName.c_str(), num); napi_value jsValue = nullptr; napi_create_int32(env, num, &jsValue); @@ -1574,41 +1576,41 @@ napi_value CreateInt32(napi_env &env, int32_t num, const std::string ¶mName) ContinueAbilityCB *CreateContinueAbilityCBCBInfo(napi_env &env) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto continueAbilityCB = new (std::nothrow) ContinueAbilityCB; if (continueAbilityCB == nullptr) { - HILOG_ERROR("%{public}s continueAbilityCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s continueAbilityCB == nullptr", __func__); return nullptr; } continueAbilityCB->cbBase.cbInfo.env = env; continueAbilityCB->cbBase.asyncWork = nullptr; continueAbilityCB->cbBase.deferred = nullptr; continueAbilityCB->callbackRef = nullptr; - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return continueAbilityCB; } void ContinueAbilityExecuteCB(napi_env env, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto continueAbilityCB = static_cast(data); - HILOG_INFO("create continueAbilityCB success."); + TAG_LOGI(AAFwkTag::MISSION, "create continueAbilityCB success."); sptr continuation(new (std::nothrow) NAPIMissionContinue()); continueAbilityCB->abilityContinuation = continuation; if (continueAbilityCB->abilityContinuation == nullptr) { - HILOG_ERROR("%{public}s abilityContinuation == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s abilityContinuation == nullptr.", __func__); return; } continueAbilityCB->abilityContinuation->SetContinueAbilityEnv(env); - HILOG_INFO("set env success."); + TAG_LOGI(AAFwkTag::MISSION, "set env success."); if (continueAbilityCB->abilityContinuationCB.callback[0] != nullptr) { continueAbilityCB->abilityContinuation-> SetContinueAbilityCBRef(continueAbilityCB->abilityContinuationCB.callback[0]); - HILOG_INFO("set callback success."); + TAG_LOGI(AAFwkTag::MISSION, "set callback success."); } else { continueAbilityCB->abilityContinuation-> SetContinueAbilityPromiseRef(continueAbilityCB->cbBase.deferred); - HILOG_INFO("set promise success."); + TAG_LOGI(AAFwkTag::MISSION, "set promise success."); } continueAbilityCB->result = -1; @@ -1624,12 +1626,12 @@ void ContinueAbilityExecuteCB(napi_env env, void *data) continueAbilityCB->missionId, continueAbilityCB->abilityContinuation, continueAbilityCB->wantParams); } - HILOG_INFO("%{public}s end. error:%{public}d ", __func__, continueAbilityCB->result); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end. error:%{public}d ", __func__, continueAbilityCB->result); } void ContinueAbilityCallbackCompletedCB(napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); auto continueAbilityCB = static_cast(data); // set result napi_value result[2] = { nullptr }; @@ -1668,14 +1670,14 @@ void ContinueAbilityCallbackCompletedCB(napi_env env, napi_status status, void * napi_delete_async_work(env, continueAbilityCB->cbBase.asyncWork); delete continueAbilityCB; continueAbilityCB = nullptr; - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); } napi_value ContinueAbilityAsync(napi_env env, ContinueAbilityCB *continueAbilityCB) { - HILOG_INFO("%{public}s asyncCallback.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s asyncCallback.", __func__); if (continueAbilityCB == nullptr) { - HILOG_ERROR("%{public}s, param == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, param == nullptr.", __func__); return nullptr; } @@ -1697,7 +1699,7 @@ napi_value ContinueAbilityAsync(napi_env env, ContinueAbilityCB *continueAbility static_cast(continueAbilityCB), &continueAbilityCB->cbBase.asyncWork); napi_queue_async_work_with_qos(env, continueAbilityCB->cbBase.asyncWork, napi_qos_user_initiated); - HILOG_INFO("%{public}s asyncCallback end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s asyncCallback end.", __func__); return result; } @@ -1712,7 +1714,7 @@ bool CheckContinueKeyExist(napi_env &env, const napi_value &value) bool isWantParam = false; napi_has_named_property(env, value, "wantParam", &isWantParam); if (!isSrcDeviceId && !isDstDeviceId && !isMissionId && !isWantParam) { - HILOG_ERROR("%{public}s, Wrong argument key.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument key.", __func__); return false; } return true; @@ -1740,7 +1742,7 @@ bool CheckContinueDeviceInfoSrcDeviceId(napi_env &env, napi_value &napiSrcDevice napi_valuetype valueType = napi_undefined; napi_typeof(env, napiSrcDeviceId, &valueType); if (valueType != napi_string) { - HILOG_ERROR("%{public}s, Wrong argument type srcDeviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type srcDeviceId.", __func__); errInfo = "Parameter error. The type of \"srcDeviceId\" must be string"; return false; } @@ -1754,7 +1756,7 @@ bool CheckContinueDeviceInfoDstDeviceId(napi_env &env, napi_value &napiDstDevice napi_valuetype valueType = napi_undefined; napi_typeof(env, napiDstDeviceId, &valueType); if (valueType != napi_string) { - HILOG_ERROR("%{public}s, Wrong argument type dstDeviceId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type dstDeviceId.", __func__); errInfo = "Parameter error. The type of \"dstDeviceId\" must be string"; return false; } @@ -1768,7 +1770,7 @@ bool CheckContinueDeviceInfoMissionId(napi_env &env, napi_value &napiMissionId, napi_valuetype valueType = napi_undefined; napi_typeof(env, napiMissionId, &valueType); if (valueType != napi_number) { - HILOG_ERROR("%{public}s, Wrong argument type missionId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type missionId.", __func__); errInfo = "Parameter error. The type of \"missionId\" must be number"; return false; } @@ -1782,7 +1784,7 @@ bool CheckContinueDeviceInfoBundleName(napi_env &env, napi_value &napiBundleName napi_valuetype valueType = napi_undefined; napi_typeof(env, napiBundleName, &valueType); if (valueType != napi_string) { - HILOG_ERROR("%{public}s, Wrong argument type missionId.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type missionId.", __func__); errInfo = "Parameter error. The type of \"bundleName\" must be string"; return false; } @@ -1796,12 +1798,12 @@ bool CheckContinueDeviceInfoWantParam(napi_env &env, napi_value &napiWantParam, napi_valuetype valueType = napi_undefined; napi_typeof(env, napiWantParam, &valueType); if (valueType != napi_object) { - HILOG_ERROR("%{public}s, Wrong argument type wantParam.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type wantParam.", __func__); errInfo = "Parameter error. The type of \"wantParams\" must be object"; return false; } if (!AppExecFwk::UnwrapWantParams(env, napiWantParam, continueAbilityCB->wantParams)) { - HILOG_ERROR("%{public}s, Wrong argument type wantParam.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type wantParam.", __func__); errInfo = "Parameter error. The type of \"wantParams\" must be array"; return false; } @@ -1811,9 +1813,9 @@ bool CheckContinueDeviceInfoWantParam(napi_env &env, napi_value &napiWantParam, bool CheckContinueFirstArgs(napi_env &env, const napi_value &value, ContinueAbilityCB *continueAbilityCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); if (!CheckContinueKeyExist(env, value)) { - HILOG_ERROR("%{public}s, Wrong argument key.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument key.", __func__); errInfo = "Parameter error. The type of \"parameter\" must be ContinueMission"; return false; } @@ -1824,7 +1826,7 @@ bool CheckContinueFirstArgs(napi_env &env, const napi_value &value, napi_valuetype valueType = napi_undefined; napi_typeof(env, value, &valueType); if (valueType != napi_object) { - HILOG_ERROR("%{public}s, Wrong argument type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type.", __func__); errInfo = "Parameter error. The type of \"parameter\" must be ContinueMission"; return false; } @@ -1834,7 +1836,7 @@ bool CheckContinueFirstArgs(napi_env &env, const napi_value &value, napi_get_named_property(env, value, "wantParam", &napiWantParam); if (napiSrcDeviceId == nullptr || napiDstDeviceId == nullptr || napiMissionId == nullptr || napiWantParam == nullptr) { - HILOG_ERROR("%{public}s, miss required parameters.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, miss required parameters.", __func__); errInfo = "Parameter error. The number of \"ContinueMission\" must be 4"; return false; } @@ -1843,20 +1845,20 @@ bool CheckContinueFirstArgs(napi_env &env, const napi_value &value, !CheckContinueDeviceInfoDstDeviceId(env, napiDstDeviceId, continueAbilityCB, errInfo) || !CheckContinueDeviceInfoMissionId(env, napiMissionId, continueAbilityCB, errInfo) || !CheckContinueDeviceInfoWantParam(env, napiWantParam, continueAbilityCB, errInfo)) { - HILOG_ERROR("%{public}s, continueMission check ContinueDeviceInfo value failed.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, continueMission check ContinueDeviceInfo value failed.", __func__); return false; } - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } bool CheckArgsWithBundleName(napi_env &env, const napi_value &value, ContinueAbilityCB *continueAbilityCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); if (!CheckBundleNameExist(env, value)) { - HILOG_ERROR("%{public}s, Args without bundleName.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Args without bundleName.", __func__); return false; } napi_value napiSrcDeviceId = nullptr; @@ -1866,7 +1868,7 @@ bool CheckArgsWithBundleName(napi_env &env, const napi_value &value, napi_valuetype valueType = napi_undefined; napi_typeof(env, value, &valueType); if (valueType != napi_object) { - HILOG_ERROR("%{public}s, Args without bundleName.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Args without bundleName.", __func__); return false; } napi_get_named_property(env, value, "srcDeviceId", &napiSrcDeviceId); @@ -1875,7 +1877,7 @@ bool CheckArgsWithBundleName(napi_env &env, const napi_value &value, napi_get_named_property(env, value, "wantParam", &napiWantParam); if (napiSrcDeviceId == nullptr || napiDstDeviceId == nullptr || napiBundleName == nullptr || napiWantParam == nullptr) { - HILOG_ERROR("%{public}s, miss required parameters.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, miss required parameters.", __func__); return false; } @@ -1883,78 +1885,78 @@ bool CheckArgsWithBundleName(napi_env &env, const napi_value &value, !CheckContinueDeviceInfoDstDeviceId(env, napiDstDeviceId, continueAbilityCB, errInfo) || !CheckContinueDeviceInfoBundleName(env, napiBundleName, continueAbilityCB, errInfo) || !CheckContinueDeviceInfoWantParam(env, napiWantParam, continueAbilityCB, errInfo)) { - HILOG_ERROR("%{public}s, continueMission check ContinueDeviceInfo value failed.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, continueMission check ContinueDeviceInfo value failed.", __func__); return false; } - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } bool CheckContinueCallback(napi_env &env, const napi_value &value, ContinueAbilityCB *continueAbilityCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_value jsMethod = nullptr; napi_valuetype valuetype = napi_undefined; napi_typeof(env, value, &valuetype); if (valuetype != napi_object) { - HILOG_ERROR("%{public}s, Wrong argument type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type.", __func__); errInfo = "Parameter error. The type of \"options\" must be ContinueCallback"; return false; } bool isFirstCallback = false; napi_has_named_property(env, value, "onContinueDone", &isFirstCallback); if (!isFirstCallback) { - HILOG_ERROR("%{public}s, Wrong argument name for onContinueDone.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument name for onContinueDone.", __func__); errInfo = "Parameter error. The key of \"ContinueCallback\" must be onContinueDone"; return false; } napi_get_named_property(env, value, "onContinueDone", &jsMethod); if (jsMethod == nullptr) { - HILOG_ERROR("%{public}s, not find callback onContinueDone.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, not find callback onContinueDone.", __func__); errInfo = "Parameter error. The value of \"onContinueDone\" must not be undefined"; return false; } napi_typeof(env, jsMethod, &valuetype); if (valuetype != napi_function) { - HILOG_ERROR("%{public}s, onContinueDone callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, onContinueDone callback error type.", __func__); errInfo = "Parameter error. The type of \"onContinueDone\" must be function"; return false; } napi_create_reference(env, jsMethod, 1, &continueAbilityCB->abilityContinuationCB.callback[0]); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } bool CheckContinueCallbackWithBundleName(napi_env &env, const napi_value &value, ContinueAbilityCB *continueAbilityCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); napi_valuetype valueType = napi_undefined; napi_typeof(env, value, &valueType); if (valueType != napi_function) { - HILOG_ERROR("%{public}s, Wrong argument type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument type.", __func__); return false; } napi_create_reference(env, value, 1, &continueAbilityCB->abilityContinuationCB.callback[0]); napi_create_reference(env, value, 1, &continueAbilityCB->callbackRef); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return true; } napi_value ContinueAbilityWrap(napi_env &env, napi_callback_info info, ContinueAbilityCB *continueAbilityCB, std::string &errInfo) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); size_t argcAsync = 3; napi_value args[ARGS_MAX_COUNT] = {nullptr}; napi_value ret = nullptr; napi_get_cb_info(env, info, &argcAsync, args, nullptr, nullptr); - HILOG_INFO("argcAsync is %{public}zu", argcAsync); + TAG_LOGI(AAFwkTag::MISSION, "argcAsync is %{public}zu", argcAsync); if (argcAsync != ARGS_ONE && argcAsync != ARGS_TWO && argcAsync != ARGS_THREE) { - HILOG_ERROR("%{public}s, Wrong argument count.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, Wrong argument count.", __func__); errInfo = "Parameter error. The type of \"number of parameters\" must be 1 or 2 or 3"; return nullptr; } @@ -1963,20 +1965,20 @@ napi_value ContinueAbilityWrap(napi_env &env, napi_callback_info info, continueAbilityCB->hasArgsWithBundleName = true; if (argcAsync == ARGS_TWO && CheckContinueCallbackWithBundleName(env, args[1], continueAbilityCB, errInfo)) { ret = ContinueAbilityAsync(env, continueAbilityCB); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return ret; } } if (!continueAbilityCB->hasArgsWithBundleName) { if (!CheckContinueFirstArgs(env, args[0], continueAbilityCB, errInfo)) { - HILOG_ERROR("%{public}s, check the first argument failed.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, check the first argument failed.", __func__); return nullptr; } if (argcAsync > 1) { if (!CheckContinueCallback(env, args[1], continueAbilityCB, errInfo)) { - HILOG_ERROR("%{public}s, check callback failed.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, check callback failed.", __func__); return nullptr; } } @@ -1985,7 +1987,7 @@ napi_value ContinueAbilityWrap(napi_env &env, napi_callback_info info, napi_valuetype valueType = napi_undefined; napi_typeof(env, args[ARGS_TWO], &valueType); if (valueType != napi_function) { - HILOG_ERROR("%{public}s, callback error type.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, callback error type.", __func__); errInfo = "Parameter error. The type of \"callback\" must be AsynCallback: void"; return nullptr; } @@ -1994,43 +1996,43 @@ napi_value ContinueAbilityWrap(napi_env &env, napi_callback_info info, } ret = ContinueAbilityAsync(env, continueAbilityCB); - HILOG_INFO("%{public}s called end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called end.", __func__); return ret; } napi_value NAPI_ContinueAbility(napi_env env, napi_callback_info info) { - HILOG_INFO("%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s called.", __func__); std::string errInfo = "Parameter error"; ContinueAbilityCB *continueAbilityCB = CreateContinueAbilityCBCBInfo(env); if (continueAbilityCB == nullptr) { - HILOG_ERROR("%{public}s continueAbilityCB == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s continueAbilityCB == nullptr", __func__); napi_throw(env, GenerateBusinessError(env, SYSTEM_WORK_ABNORMALLY, ErrorMessageReturn(SYSTEM_WORK_ABNORMALLY))); return GetUndefined(env); } napi_value ret = ContinueAbilityWrap(env, info, continueAbilityCB, errInfo); if (ret == nullptr) { - HILOG_ERROR("%{public}s ret == nullptr", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s ret == nullptr", __func__); delete continueAbilityCB; continueAbilityCB = nullptr; napi_throw(env, GenerateBusinessError(env, PARAMETER_CHECK_FAILED, errInfo)); return GetUndefined(env); } - HILOG_INFO("%{public}s end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s end.", __func__); return ret; } ContinueAbilityCB *CheckAndGetParameters(uv_work_t *work, napi_handle_scope *scope) { - HILOG_INFO("GetParam, start"); + TAG_LOGI(AAFwkTag::MISSION, "GetParam, start"); if (work == nullptr) { - HILOG_ERROR("GetParam, work is null"); + TAG_LOGE(AAFwkTag::MISSION, "GetParam, work is null"); return nullptr; } ContinueAbilityCB *continueAbilityCB = static_cast(work->data); if (continueAbilityCB == nullptr) { - HILOG_ERROR("GetParam, continueAbilityCB is null"); + TAG_LOGE(AAFwkTag::MISSION, "GetParam, continueAbilityCB is null"); delete work; return nullptr; } @@ -2046,13 +2048,13 @@ ContinueAbilityCB *CheckAndGetParameters(uv_work_t *work, napi_handle_scope *sco void UvWorkOnContinueDone(uv_work_t *work, int status) { - HILOG_INFO("UvWorkOnContinueDone, uv_queue_work"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkOnContinueDone, uv_queue_work"); napi_handle_scope scope = nullptr; ContinueAbilityCB *continueAbilityCB = CheckAndGetParameters(work, &scope); if (continueAbilityCB == nullptr) { return; } - HILOG_INFO("UvWorkOnContinueDone, resultCode = %{public}d", continueAbilityCB->resultCode); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkOnContinueDone, resultCode = %{public}d", continueAbilityCB->resultCode); napi_value result = WrapInt32(continueAbilityCB->cbBase.cbInfo.env, continueAbilityCB->resultCode, "resultCode"); if (continueAbilityCB->hasArgsWithBundleName) { result = WrapInt32(continueAbilityCB->cbBase.cbInfo.env, continueAbilityCB->resultCode, "code"); @@ -2083,17 +2085,17 @@ void UvWorkOnContinueDone(uv_work_t *work, int status) delete continueAbilityCB; continueAbilityCB = nullptr; delete work; - HILOG_INFO("UvWorkOnContinueDone, uv_queue_work end"); + TAG_LOGI(AAFwkTag::MISSION, "UvWorkOnContinueDone, uv_queue_work end"); } void NAPIMissionContinue::OnContinueDone(int32_t result) { - HILOG_INFO("%{public}s, called. result = %{public}d", __func__, result); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, called. result = %{public}d", __func__, result); uv_loop_s *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { - HILOG_ERROR("%{public}s, loop == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, loop == nullptr.", __func__); return; } @@ -2101,7 +2103,7 @@ void NAPIMissionContinue::OnContinueDone(int32_t result) auto continueAbilityCB = new (std::nothrow) ContinueAbilityCB; if (continueAbilityCB == nullptr) { - HILOG_ERROR("%{public}s, continueAbilityCB == nullptr.", __func__); + TAG_LOGE(AAFwkTag::MISSION, "%{public}s, continueAbilityCB == nullptr.", __func__); delete work; return; } @@ -2122,7 +2124,7 @@ void NAPIMissionContinue::OnContinueDone(int32_t result) continueAbilityCB = nullptr; delete work; } - HILOG_INFO("%{public}s, end.", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s, end.", __func__); } void NAPIMissionContinue::SetContinueAbilityEnv(const napi_env &env) @@ -2147,7 +2149,7 @@ void NAPIMissionContinue::SetContinueAbilityPromiseRef(const napi_deferred &prom napi_value DistributedMissionManagerExport(napi_env env, napi_value exports) { - HILOG_INFO("%{public}s,called", __func__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s,called", __func__); napi_value continueState = NAPI_ContinueState(env); napi_property_descriptor properties[] = { DECLARE_NAPI_FUNCTION("startSyncRemoteMissions", NAPI_StartSyncRemoteMissions), diff --git a/frameworks/js/napi/mission_manager/js_mission_info_utils.cpp b/frameworks/js/napi/mission_manager/js_mission_info_utils.cpp index aa61efd8b9..560536b083 100644 --- a/frameworks/js/napi/mission_manager/js_mission_info_utils.cpp +++ b/frameworks/js/napi/mission_manager/js_mission_info_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -15,6 +15,7 @@ #include "js_mission_info_utils.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "napi_common_want.h" #include "napi_remote_object.h" @@ -119,14 +120,14 @@ napi_value CreateJsMissionInfoArray(napi_env env, const std::vector &ao) { - HILOG_INFO("%{public}s start. key=%{public}s", __func__, key.c_str()); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s start. key=%{public}s", __func__, key.c_str()); if (AAFwk::Array::IsStringArray(ao)) { return InnerWrapWantParamsArray( env, object, key, ao); diff --git a/frameworks/js/napi/mission_manager/js_mission_listener.cpp b/frameworks/js/napi/mission_manager/js_mission_listener.cpp index 813671edd0..c862e1a8fd 100644 --- a/frameworks/js/napi/mission_manager/js_mission_listener.cpp +++ b/frameworks/js/napi/mission_manager/js_mission_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -16,6 +16,7 @@ #include "js_mission_listener.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_runtime_utils.h" @@ -79,9 +80,9 @@ bool JsMissionListener::IsEmpty() void JsMissionListener::CallJsMethod(const std::string &methodName, int32_t missionId) { - HILOG_INFO("methodName = %{public}s", methodName.c_str()); + TAG_LOGI(AAFwkTag::MISSION, "methodName = %{public}s", methodName.c_str()); if (env_ == nullptr) { - HILOG_ERROR("env_ null"); + TAG_LOGE(AAFwkTag::MISSION, "env_ null"); return; } @@ -106,14 +107,14 @@ void JsMissionListener::CallJsMethodInner(const std::string &methodName, int32_t for (auto &item : tmpMap) { napi_value obj = (item.second)->GetNapiValue(); if (obj == nullptr) { - HILOG_ERROR("Failed to get object"); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get object"); continue; } napi_value method = nullptr; napi_get_named_property(env_, obj, methodName.c_str(), &method); if (method == nullptr || AppExecFwk::IsTypeForNapiValue(env_, method, napi_undefined) || AppExecFwk::IsTypeForNapiValue(env_, method, napi_null)) { - HILOG_ERROR("Failed to get %{public}s from object", methodName.c_str()); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get %{public}s from object", methodName.c_str()); continue; } napi_value argv[] = { CreateJsValue(env_, missionId) }; @@ -125,14 +126,14 @@ void JsMissionListener::CallJsMethodInner(const std::string &methodName, int32_t #ifdef SUPPORT_GRAPHICS void JsMissionListener::OnMissionIconUpdated(int32_t missionId, const std::shared_ptr &icon) { - HILOG_INFO("OnMissionIconUpdated, missionId = %{public}d.", missionId); + TAG_LOGI(AAFwkTag::MISSION, "OnMissionIconUpdated, missionId = %{public}d.", missionId); if (env_ == nullptr) { - HILOG_ERROR("env_ is null"); + TAG_LOGE(AAFwkTag::MISSION, "env_ is null"); return; } if (missionId <= 0 || !icon) { - HILOG_ERROR("missionId or icon is invalid, missionId:%{public}d.", missionId); + TAG_LOGE(AAFwkTag::MISSION, "missionId or icon is invalid, missionId:%{public}d.", missionId); return; } @@ -154,7 +155,7 @@ void JsMissionListener::OnMissionIconUpdated(int32_t missionId, const std::share void JsMissionListener::CallJsMissionIconUpdated(int32_t missionId, const std::shared_ptr &icon) { if (env_ == nullptr) { - HILOG_ERROR("env_ is null, not call js mission updated."); + TAG_LOGE(AAFwkTag::MISSION, "env_ is null, not call js mission updated."); return; } @@ -165,14 +166,14 @@ void JsMissionListener::CallJsMissionIconUpdated(int32_t missionId, const std::s for (auto &item : tmpMap) { napi_value obj = (item.second)->GetNapiValue(); if (obj == nullptr) { - HILOG_ERROR("Failed to get js object"); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get js object"); continue; } napi_value method = nullptr; napi_get_named_property(env_, obj, "onMissionIconUpdated", &method); if (method == nullptr || AppExecFwk::IsTypeForNapiValue(env_, method, napi_undefined) || AppExecFwk::IsTypeForNapiValue(env_, method, napi_null)) { - HILOG_ERROR("Failed to get onMissionIconUpdated method from object"); + TAG_LOGE(AAFwkTag::MISSION, "Failed to get onMissionIconUpdated method from object"); continue; } diff --git a/frameworks/js/napi/mission_manager/mission_continue_stub.cpp b/frameworks/js/napi/mission_manager/mission_continue_stub.cpp index c61d1c1464..a0be6383e5 100644 --- a/frameworks/js/napi/mission_manager/mission_continue_stub.cpp +++ b/frameworks/js/napi/mission_manager/mission_continue_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 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 @@ -15,6 +15,7 @@ #include "mission_continue_stub.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "ipc_types.h" #include "message_parcel.h" @@ -32,19 +33,19 @@ int32_t MissionContinueStub::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { if (data.ReadInterfaceToken() != GetDescriptor()) { - HILOG_ERROR("Local descriptor is not equal to remote"); + TAG_LOGE(AAFwkTag::MISSION, "Local descriptor is not equal to remote"); return ERR_INVALID_STATE; } switch (code) { case IMissionContinue::NOTIFY_CONTINUATION_RESULT: { int32_t result = data.ReadInt32(); - HILOG_INFO("NOTIFY_CONTINUATION_RESULT result: %{public}d", result); + TAG_LOGI(AAFwkTag::MISSION, "NOTIFY_CONTINUATION_RESULT result: %{public}d", result); OnContinueDone(result); return NO_ERROR; } default: { - HILOG_WARN("MissionContinueStub::OnRemoteRequest code: %{public}d", code); + TAG_LOGW(AAFwkTag::MISSION, "MissionContinueStub::OnRemoteRequest code: %{public}d", code); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } } diff --git a/frameworks/js/napi/mission_manager/mission_manager.cpp b/frameworks/js/napi/mission_manager/mission_manager.cpp index 54f91c80d3..7fa84622cc 100644 --- a/frameworks/js/napi/mission_manager/mission_manager.cpp +++ b/frameworks/js/napi/mission_manager/mission_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 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 @@ -18,6 +18,7 @@ #include "ability_manager_client.h" #include "event_handler.h" #include "event_runner.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_error_utils.h" #include "js_mission_info_utils.h" @@ -49,7 +50,7 @@ public: static void Finalizer(napi_env env, void* data, void* hint) { - HILOG_INFO("JsMissionManager::Finalizer is called"); + TAG_LOGI(AAFwkTag::MISSION, "JsMissionManager::Finalizer is called"); std::unique_ptr(static_cast(data)); } @@ -111,9 +112,9 @@ public: private: napi_value OnRegisterMissionListener(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc < 1) { - HILOG_ERROR("Params not match"); + TAG_LOGE(AAFwkTag::MISSION, "Params not match"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -130,7 +131,7 @@ private: missionListener_->AddJsListenerObject(missionListenerId_, argv[0]); return CreateJsValue(env, missionListenerId_); } else { - HILOG_ERROR("RegisterMissionListener error, ret = %{public}d", ret); + TAG_LOGE(AAFwkTag::MISSION, "RegisterMissionListener error, ret = %{public}d", ret); missionListener_ = nullptr; if (ret == CHECK_PERMISSION_FAILED) { ThrowNoPermissionError(env, PermissionConstants::PERMISSION_MANAGE_MISSION); @@ -143,16 +144,16 @@ private: napi_value OnUnregisterMissionListener(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc < 1) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionListenerId = -1; if (!ConvertFromJsValue(env, argv[0], missionListenerId)) { - HILOG_ERROR("Parse missionListenerId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse missionListenerId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -188,21 +189,21 @@ private: napi_value OnGetMissionInfos(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc < ARG_COUNT_TWO) { // at least 2 parameters. - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string deviceId; if (!ConvertFromJsValue(env, argv[0], deviceId)) { - HILOG_ERROR("Parse deviceId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse deviceId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } int numMax = -1; if (!ConvertFromJsValue(env, argv[1], numMax)) { - HILOG_ERROR("Parse numMax failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse numMax failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -228,21 +229,21 @@ private: napi_value OnGetMissionInfo(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc < ARG_COUNT_TWO) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string deviceId; if (!ConvertFromJsValue(env, argv[0], deviceId)) { - HILOG_ERROR("Parse deviceId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse deviceId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[1], missionId)) { - HILOG_ERROR("Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -268,13 +269,13 @@ private: napi_value OnGetMissionSnapShot(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("called"); + TAG_LOGI(AAFwkTag::MISSION, "called"); return GetMissionSnapShot(env, argc, argv, false); } napi_value OnGetLowResolutionMissionSnapShot(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("called"); + TAG_LOGI(AAFwkTag::MISSION, "called"); return GetMissionSnapShot(env, argc, argv, true); } @@ -336,13 +337,13 @@ private: } if (!ConvertFromJsValue(env, argv[0], deviceId)) { - HILOG_ERROR("missionSnapshot: Parse deviceId failed"); + TAG_LOGE(AAFwkTag::MISSION, "missionSnapshot: Parse deviceId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return false; } if (!ConvertFromJsValue(env, argv[1], missionId)) { - HILOG_ERROR("missionSnapshot: Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "missionSnapshot: Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return false; } @@ -352,15 +353,15 @@ private: napi_value OnLockMission(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnLockMission Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnLockMission Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnLockMission Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnLockMission Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -385,15 +386,15 @@ private: napi_value OnUnlockMission(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnUnlockMission Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnUnlockMission Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnUnlockMission Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnUnlockMission Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -418,15 +419,15 @@ private: napi_value OnClearMission(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnClearMission Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnClearMission Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnClearMission Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnClearMission Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -451,7 +452,7 @@ private: napi_value OnClearAllMissions(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); NapiAsyncTask::CompleteCallback complete = [](napi_env env, NapiAsyncTask &task, int32_t status) { auto ret = AbilityManagerClient::GetInstance()->CleanAllMissions(); @@ -472,15 +473,15 @@ private: napi_value OnMoveMissionToFront(napi_env env, size_t argc, napi_value* argv) { - HILOG_INFO("%{public}s is called", __FUNCTION__); + TAG_LOGI(AAFwkTag::MISSION, "%{public}s is called", __FUNCTION__); if (argc == 0) { - HILOG_ERROR("OnMoveMissionToFront Not enough params"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionToFront Not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } int32_t missionId = -1; if (!ConvertFromJsValue(env, argv[0], missionId)) { - HILOG_ERROR("OnMoveMissionToFront Parse missionId failed"); + TAG_LOGE(AAFwkTag::MISSION, "OnMoveMissionToFront Parse missionId failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -488,7 +489,7 @@ private: AAFwk::StartOptions startOptions; if (argc > ARGC_ONE && AppExecFwk::IsTypeForNapiValue(env, argv[1], napi_object)) { - HILOG_INFO("OnMoveMissionToFront start options is used."); + TAG_LOGI(AAFwkTag::MISSION, "OnMoveMissionToFront start options is used."); AppExecFwk::UnwrapStartOptions(env, argv[1], startOptions); unwrapArgc++; } @@ -517,9 +518,9 @@ private: napi_value JsMissionManagerInit(napi_env env, napi_value exportObj) { - HILOG_INFO("JsMissionManagerInit is called"); + TAG_LOGI(AAFwkTag::MISSION, "JsMissionManagerInit is called"); if (env == nullptr || exportObj == nullptr) { - HILOG_INFO("Invalid input parameters"); + TAG_LOGI(AAFwkTag::MISSION, "Invalid input parameters"); return nullptr; } diff --git a/frameworks/js/napi/quick_fix/js_quick_fix_manager.cpp b/frameworks/js/napi/quick_fix/js_quick_fix_manager.cpp index 1a6b85b05b..d875b0af70 100644 --- a/frameworks/js/napi/quick_fix/js_quick_fix_manager.cpp +++ b/frameworks/js/napi/quick_fix/js_quick_fix_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 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 @@ -15,6 +15,7 @@ #include "js_quick_fix_manager.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_application_quick_fix_info.h" #include "js_runtime_utils.h" @@ -38,7 +39,7 @@ public: static void Finalizer(napi_env env, void *data, void *hint) { - HILOG_DEBUG("function called."); + TAG_LOGD(AAFwkTag::QUICKFIX, "function called."); std::unique_ptr(static_cast(data)); } @@ -75,16 +76,16 @@ public: private: napi_value OnGetApplyedQuickFixInfo(napi_env env, NapiCallbackInfo &info) { - HILOG_DEBUG("function called."); + TAG_LOGD(AAFwkTag::QUICKFIX, "function called."); if (info.argc != ARGC_ONE && info.argc != ARGC_TWO) { - HILOG_ERROR("The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::QUICKFIX, "The number of parameter is invalid."); Throw(env, AAFwk::ERR_QUICKFIX_PARAM_INVALID); return CreateJsUndefined(env); } std::string bundleName; if (!OHOS::AppExecFwk::UnwrapStringFromJS2(env, info.argv[0], bundleName)) { - HILOG_ERROR("The bundleName is invalid."); + TAG_LOGE(AAFwkTag::QUICKFIX, "The bundleName is invalid."); Throw(env, AAFwk::ERR_QUICKFIX_PARAM_INVALID); return CreateJsUndefined(env); } @@ -104,22 +105,22 @@ private: napi_value result = nullptr; NapiAsyncTask::Schedule("JsQuickFixManager::OnGetApplyedQuickFixInfo", env, CreateAsyncTaskWithLastParam(env, lastParam, nullptr, std::move(complete), &result)); - HILOG_DEBUG("function finished."); + TAG_LOGD(AAFwkTag::QUICKFIX, "function finished."); return result; } napi_value OnApplyQuickFix(napi_env env, NapiCallbackInfo &info) { - HILOG_DEBUG("function called."); + TAG_LOGD(AAFwkTag::QUICKFIX, "function called."); if (info.argc != ARGC_ONE && info.argc != ARGC_TWO) { - HILOG_ERROR("The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::QUICKFIX, "The number of parameter is invalid."); Throw(env, AAFwk::ERR_QUICKFIX_PARAM_INVALID); return CreateJsUndefined(env); } std::vector hapQuickFixFiles; if (!OHOS::AppExecFwk::UnwrapArrayStringFromJS(env, info.argv[0], hapQuickFixFiles)) { - HILOG_ERROR("Hap quick fix files is invalid."); + TAG_LOGE(AAFwkTag::QUICKFIX, "Hap quick fix files is invalid."); Throw(env, AAFwk::ERR_QUICKFIX_PARAM_INVALID); return CreateJsUndefined(env); } @@ -138,22 +139,22 @@ private: napi_value result = nullptr; NapiAsyncTask::Schedule("JsQuickFixManager::OnApplyQuickFix", env, CreateAsyncTaskWithLastParam(env, lastParam, nullptr, std::move(complete), &result)); - HILOG_DEBUG("function finished."); + TAG_LOGD(AAFwkTag::QUICKFIX, "function finished."); return result; } napi_value OnRevokeQuickFix(napi_env env, NapiCallbackInfo &info) { - HILOG_DEBUG("called."); + TAG_LOGD(AAFwkTag::QUICKFIX, "called."); if (info.argc == ARGC_ZERO) { - HILOG_ERROR("The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::QUICKFIX, "The number of parameter is invalid."); Throw(env, AAFwk::ERR_QUICKFIX_PARAM_INVALID); return CreateJsUndefined(env); } std::string bundleName; if (!ConvertFromJsValue(env, info.argv[ARGC_ZERO], bundleName)) { - HILOG_ERROR("The bundleName is invalid."); + TAG_LOGE(AAFwkTag::QUICKFIX, "The bundleName is invalid."); Throw(env, AAFwk::ERR_QUICKFIX_PARAM_INVALID); return CreateJsUndefined(env); } @@ -163,22 +164,22 @@ private: auto quickFixMgr = DelayedSingleton::GetInstance(); if (quickFixMgr == nullptr) { *retval = AAFwk::ERR_QUICKFIX_INTERNAL_ERROR; - HILOG_ERROR("Get quick fix mgr is nullptr."); + TAG_LOGE(AAFwkTag::QUICKFIX, "Get quick fix mgr is nullptr."); return; } *retval = quickFixMgr->RevokeQuickFix(bundleName); - HILOG_DEBUG("Revoke quick fix execute retval is {%{public}d}.", *retval); + TAG_LOGD(AAFwkTag::QUICKFIX, "Revoke quick fix execute retval is {%{public}d}.", *retval); }; auto complete = [retval = errCode](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("Revoke quick fix complete called."); + TAG_LOGD(AAFwkTag::QUICKFIX, "Revoke quick fix complete called."); if (*retval != AAFwk::ERR_OK) { - HILOG_ERROR("Revoke quick fix execution failed. retval is %{public}d", *retval); + TAG_LOGE(AAFwkTag::QUICKFIX, "Revoke quick fix execution failed. retval is %{public}d", *retval); task.Reject(env, CreateJsErrorByErrorCode(env, *retval)); return; } - HILOG_DEBUG("Revoke quick fix complete called ok."); + TAG_LOGD(AAFwkTag::QUICKFIX, "Revoke quick fix complete called ok."); task.ResolveWithNoError(env, CreateJsUndefined(env)); }; @@ -186,16 +187,16 @@ private: napi_value result = nullptr; NapiAsyncTask::Schedule("JsQuickFixManager::OnRevokeQuickFix", env, CreateAsyncTaskWithLastParam(env, lastParam, std::move(execute), std::move(complete), &result)); - HILOG_DEBUG("Function finished."); + TAG_LOGD(AAFwkTag::QUICKFIX, "Function finished."); return result; } }; napi_value CreateJsQuickFixManager(napi_env env, napi_value exportObj) { - HILOG_DEBUG("function called."); + TAG_LOGD(AAFwkTag::QUICKFIX, "function called."); if (env == nullptr || exportObj == nullptr) { - HILOG_ERROR("Input parameter is invalid."); + TAG_LOGE(AAFwkTag::QUICKFIX, "Input parameter is invalid."); return nullptr; } diff --git a/frameworks/js/napi/uri_permission/js_uri_perm_mgr.cpp b/frameworks/js/napi/uri_permission/js_uri_perm_mgr.cpp index 8cb5392dc7..96a8300266 100644 --- a/frameworks/js/napi/uri_permission/js_uri_perm_mgr.cpp +++ b/frameworks/js/napi/uri_permission/js_uri_perm_mgr.cpp @@ -18,6 +18,7 @@ #include "ability_business_error.h" #include "ability_manager_errors.h" #include "ability_runtime_error_util.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "ipc_skeleton.h" #include "js_error_utils.h" @@ -43,7 +44,7 @@ public: static void Finalizer(napi_env env, void* data, void* hint) { - HILOG_INFO("JsUriPermMgr::Finalizer is called"); + TAG_LOGI(AAFwkTag::URIPERMMGR, "JsUriPermMgr::Finalizer is called"); std::unique_ptr(static_cast(data)); } @@ -60,33 +61,33 @@ public: private: napi_value OnGrantUriPermission(napi_env env, NapiCallbackInfo& info) { - HILOG_DEBUG("Grant Uri Permission start"); + TAG_LOGD(AAFwkTag::URIPERMMGR, "Grant Uri Permission start"); if (info.argc != argCountThree && info.argc != argCountFour) { - HILOG_ERROR("The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "The number of parameter is invalid."); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string uriStr; if (!OHOS::AppExecFwk::UnwrapStringFromJS2(env, info.argv[0], uriStr)) { - HILOG_ERROR("The uriStr is invalid."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "The uriStr is invalid."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } int flag = 0; if (!OHOS::AppExecFwk::UnwrapInt32FromJS2(env, info.argv[1], flag)) { - HILOG_ERROR("The flag is invalid."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "The flag is invalid."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } std::string targetBundleName; if (!OHOS::AppExecFwk::UnwrapStringFromJS2(env, info.argv[argCountTwo], targetBundleName)) { - HILOG_ERROR("The targetBundleName is invalid."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "The targetBundleName is invalid."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } auto selfToken = IPCSkeleton::GetSelfTokenID(); if (!Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(selfToken)) { - HILOG_ERROR("This application is not system-app, can not use system-api."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "This application is not system-app, can not use system-api."); ThrowError(env, AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP); return CreateJsUndefined(env); } @@ -124,25 +125,25 @@ private: { // only support 2 or 3 params (2 parameter and 1 optional callback) if (info.argc != argCountThree && info.argc != argCountTwo) { - HILOG_ERROR("Invalid arguments"); + TAG_LOGE(AAFwkTag::URIPERMMGR, "Invalid arguments"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string uriStr; if (!OHOS::AppExecFwk::UnwrapStringFromJS2(env, info.argv[0], uriStr)) { - HILOG_ERROR("invalid of the uriStr."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "invalid of the uriStr."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } std::string bundleName; if (!OHOS::AppExecFwk::UnwrapStringFromJS2(env, info.argv[1], bundleName)) { - HILOG_ERROR("The bundleName is invalid."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "The bundleName is invalid."); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } auto selfToken = IPCSkeleton::GetSelfTokenID(); if (!Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(selfToken)) { - HILOG_ERROR("can not use system-api, this application is not system-app."); + TAG_LOGE(AAFwkTag::URIPERMMGR, "can not use system-api, this application is not system-app."); ThrowError(env, AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP); return CreateJsUndefined(env); } @@ -174,9 +175,9 @@ private: napi_value CreateJsUriPermMgr(napi_env env, napi_value exportObj) { - HILOG_INFO("CreateJsUriPermMgr is called"); + TAG_LOGI(AAFwkTag::URIPERMMGR, "CreateJsUriPermMgr is called"); if (env == nullptr || exportObj == nullptr) { - HILOG_INFO("Invalid input parameters"); + TAG_LOGI(AAFwkTag::URIPERMMGR, "Invalid input parameters"); return nullptr; } diff --git a/frameworks/js/napi/wantConstant/want_constant.cpp b/frameworks/js/napi/wantConstant/want_constant.cpp index d880aab300..6527e89729 100644 --- a/frameworks/js/napi/wantConstant/want_constant.cpp +++ b/frameworks/js/napi/wantConstant/want_constant.cpp @@ -14,6 +14,7 @@ */ #include "want_constant.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" namespace OHOS { @@ -28,7 +29,7 @@ namespace AppExecFwk { */ napi_value WantConstantInit(napi_env env, napi_value exports) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::WANT, "called"); napi_value action = nullptr; napi_value entity = nullptr; napi_value Flags = nullptr; @@ -133,7 +134,7 @@ napi_value WantConstantInit(napi_env env, napi_value exports) void SetNamedProperty(napi_env env, napi_value dstObj, const char *objName, const char *propName) { - HILOG_DEBUG("start"); + TAG_LOGD(AAFwkTag::WANT, "start"); napi_value prop = nullptr; napi_create_string_utf8(env, objName, NAPI_AUTO_LENGTH, &prop); napi_set_named_property(env, dstObj, propName, prop); @@ -141,7 +142,7 @@ void SetNamedProperty(napi_env env, napi_value dstObj, const char *objName, cons void SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char *propName) { - HILOG_DEBUG("start"); + TAG_LOGD(AAFwkTag::WANT, "start"); napi_value prop = nullptr; napi_create_int32(env, objValue, &prop); napi_set_named_property(env, dstObj, propName, prop); diff --git a/frameworks/js/napi/wantagent/ability_want_agent/want_agent_module.cpp b/frameworks/js/napi/wantagent/ability_want_agent/want_agent_module.cpp index ef80cbbbad..c9a5757bec 100644 --- a/frameworks/js/napi/wantagent/ability_want_agent/want_agent_module.cpp +++ b/frameworks/js/napi/wantagent/ability_want_agent/want_agent_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 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 @@ -22,6 +22,7 @@ #include "napi/native_api.h" #include "napi/native_node_api.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "js_runtime_utils.h" @@ -36,14 +37,14 @@ EXTERN_C_START napi_value JsNapiWantAgentInit(napi_env env, napi_value exportObj) { - HILOG_DEBUG("JsNapiWantAgentInit is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "JsNapiWantAgentInit is called"); if (env == nullptr || exportObj == nullptr) { - HILOG_ERROR("env or exportObj nullptr"); + TAG_LOGE(AAFwkTag::WANTAGENT, "env or exportObj nullptr"); return nullptr; } if (!CheckTypeForNapiValue(env, exportObj, napi_object)) { - HILOG_ERROR("object nullptr"); + TAG_LOGE(AAFwkTag::WANTAGENT, "object nullptr"); return nullptr; } @@ -53,7 +54,7 @@ napi_value JsNapiWantAgentInit(napi_env env, napi_value exportObj) napi_set_named_property(env, exportObj, "WantAgentFlags", WantAgentFlagsInit(env)); napi_set_named_property(env, exportObj, "OperationType", WantAgentOperationTypeInit(env)); - HILOG_DEBUG("JsNapiWantAgentInit BindNativeFunction called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "JsNapiWantAgentInit BindNativeFunction called"); const char *moduleName = "JsWantAgent"; BindNativeFunction(env, exportObj, "equal", moduleName, JsWantAgent::Equal); BindNativeFunction(env, exportObj, "getBundleName", moduleName, JsWantAgent::GetBundleName); @@ -63,7 +64,7 @@ napi_value JsNapiWantAgentInit(napi_env env, napi_value exportObj) BindNativeFunction(env, exportObj, "getWant", moduleName, JsWantAgent::NapiGetWant); BindNativeFunction(env, exportObj, "getWantAgent", moduleName, JsWantAgent::NapiGetWantAgent); BindNativeFunction(env, exportObj, "getOperationType", moduleName, JsWantAgent::NapiGetOperationType); - HILOG_DEBUG("JsNapiWantAgentInit end"); + TAG_LOGD(AAFwkTag::WANTAGENT, "JsNapiWantAgentInit end"); return exportObj; } EXTERN_C_END diff --git a/frameworks/js/napi/wantagent/napi_want_agent.cpp b/frameworks/js/napi/wantagent/napi_want_agent.cpp index 76dd5d3f92..ef7cf0adf3 100644 --- a/frameworks/js/napi/wantagent/napi_want_agent.cpp +++ b/frameworks/js/napi/wantagent/napi_want_agent.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 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 @@ -21,6 +21,7 @@ #include #include "ability_runtime_error_util.h" +#include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "ipc_skeleton.h" #include "js_runtime_utils.h" @@ -33,7 +34,7 @@ namespace OHOS { #define NAPI_ASSERT_RETURN_NULL(env, assertion, message) \ do { \ if (!(assertion)) { \ - HILOG_INFO(message); \ + TAG_LOGI(AAFwkTag::WANTAGENT, message); \ return nullptr; \ } \ } while (0) @@ -69,9 +70,9 @@ void TriggerCompleteCallBack::SetWantAgentInstance(WantAgent* wantAgent) napi_value RetErrMsg(napi_env env, napi_value lastParam, int32_t errorCode) { - HILOG_DEBUG("RetErrMsg called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "RetErrMsg called"); auto complete = [err = errorCode] (napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("error information output"); + TAG_LOGD(AAFwkTag::WANTAGENT, "error information output"); task.Reject(env, CreateJsError(env, err, "PARAMETER_ERROR")); }; @@ -84,7 +85,7 @@ napi_value RetErrMsg(napi_env env, napi_value lastParam, int32_t errorCode) napi_value CreateErrorValue(napi_env env, int32_t errCode) { - HILOG_INFO("enter, errorCode[%{public}d]", errCode); + TAG_LOGI(AAFwkTag::WANTAGENT, "enter, errorCode[%{public}d]", errCode); napi_value error = NapiGetNull(env); if (errCode == NO_ERROR) { return error; @@ -104,22 +105,23 @@ napi_value CreateErrorValue(napi_env env, int32_t errCode) void NapiThrow(napi_env env, int32_t errCode) { - HILOG_INFO("enter"); + TAG_LOGI(AAFwkTag::WANTAGENT, "enter"); napi_throw(env, CreateErrorValue(env, errCode)); } auto OnSendFinishedUvAfterWorkCallback = [](uv_work_t* work, int status) { - HILOG_INFO("TriggerCompleteCallBack::OnSendFinishedUvAfterWorkCallback:status = %{public}d", status); + TAG_LOGI(AAFwkTag::WANTAGENT, "TriggerCompleteCallBack::OnSendFinishedUvAfterWorkCallback:status = %{public}d", + status); TriggerReceiveDataWorker* dataWorkerData = static_cast(work->data); if (dataWorkerData == nullptr) { - HILOG_ERROR("TriggerReceiveDataWorker instance(uv_work_t) is nullptr"); + TAG_LOGE(AAFwkTag::WANTAGENT, "TriggerReceiveDataWorker instance(uv_work_t) is nullptr"); delete work; return; } if (dataWorkerData->resultData == "canceled") { - HILOG_INFO("wantAgent is canceled"); + TAG_LOGI(AAFwkTag::WANTAGENT, "wantAgent is canceled"); delete dataWorkerData; dataWorkerData = nullptr; delete work; @@ -129,7 +131,7 @@ auto OnSendFinishedUvAfterWorkCallback = [](uv_work_t* work, int status) { napi_value objValueFirst = nullptr; napi_create_object(dataWorkerData->env, &objValueFirst); if (objValueFirst == nullptr) { - HILOG_ERROR("Failed to get objValueFirst"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Failed to get objValueFirst"); delete dataWorkerData; dataWorkerData = nullptr; delete work; @@ -138,7 +140,7 @@ auto OnSendFinishedUvAfterWorkCallback = [](uv_work_t* work, int status) { napi_value objValueSecond = nullptr; napi_create_object(dataWorkerData->env, &objValueSecond); if (objValueSecond == nullptr) { - HILOG_ERROR("Failed to get objValueSecond"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Failed to get objValueSecond"); delete dataWorkerData; dataWorkerData = nullptr; delete work; @@ -175,9 +177,9 @@ auto OnSendFinishedUvAfterWorkCallback = [](uv_work_t* work, int status) { void TriggerCompleteCallBack::OnSendFinished( const AAFwk::Want &want, int resultCode, const std::string &resultData, const AAFwk::WantParams &resultExtras) { - HILOG_INFO("TriggerCompleteCallBack::OnSendFinished start"); + TAG_LOGI(AAFwkTag::WANTAGENT, "TriggerCompleteCallBack::OnSendFinished start"); if (triggerCompleteInfo_.nativeRef == nullptr) { - HILOG_INFO("triggerCompleteInfo_ CallBack is nullptr"); + TAG_LOGI(AAFwkTag::WANTAGENT, "triggerCompleteInfo_ CallBack is nullptr"); return; } @@ -186,18 +188,18 @@ void TriggerCompleteCallBack::OnSendFinished( napi_get_uv_event_loop(triggerCompleteInfo_.env, &loop); #endif // NAPI_VERSION >= 2 if (loop == nullptr) { - HILOG_INFO("loop instance is nullptr"); + TAG_LOGI(AAFwkTag::WANTAGENT, "loop instance is nullptr"); return; } uv_work_t* work = new (std::nothrow) uv_work_t; if (work == nullptr) { - HILOG_INFO("uv_work_t instance is nullptr"); + TAG_LOGI(AAFwkTag::WANTAGENT, "uv_work_t instance is nullptr"); return; } TriggerReceiveDataWorker* dataWorker = new (std::nothrow) TriggerReceiveDataWorker(); if (dataWorker == nullptr) { - HILOG_INFO("TriggerReceiveDataWorker instance is nullptr"); + TAG_LOGI(AAFwkTag::WANTAGENT, "TriggerReceiveDataWorker instance is nullptr"); delete work; work = nullptr; return; @@ -218,12 +220,12 @@ void TriggerCompleteCallBack::OnSendFinished( work = nullptr; } - HILOG_INFO("TriggerCompleteCallBack::OnSendFinished end"); + TAG_LOGI(AAFwkTag::WANTAGENT, "TriggerCompleteCallBack::OnSendFinished end"); } void JsWantAgent::Finalizer(napi_env env, void* data, void* hint) { - HILOG_INFO("JsWantAgent::Finalizer is called"); + TAG_LOGI(AAFwkTag::WANTAGENT, "JsWantAgent::Finalizer is called"); std::unique_ptr(static_cast(data)); } @@ -304,12 +306,12 @@ napi_value JsWantAgent::OnEqual(napi_env env, napi_callback_info info) size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - HILOG_DEBUG("enter, argc = %{public}d", static_cast(argc)); + TAG_LOGD(AAFwkTag::WANTAGENT, "enter, argc = %{public}d", static_cast(argc)); int32_t errCode = BUSINESS_ERROR_CODE_OK; WantAgent* pWantAgentFirst = nullptr; WantAgent* pWantAgentSecond = nullptr; if (argc < ARGC_TWO || argc > ARGC_THREE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); #endif @@ -318,7 +320,7 @@ napi_value JsWantAgent::OnEqual(napi_env env, napi_callback_info info) napi_value lastParam = (argc >= ARGC_THREE) ? argv[INDEX_TWO] : nullptr; if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); #ifdef ENABLE_ERRCODE errCode = ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER; AbilityRuntimeErrorUtil::Throw(env, errCode); @@ -331,7 +333,7 @@ napi_value JsWantAgent::OnEqual(napi_env env, napi_callback_info info) UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgentFirst)); if (pWantAgentFirst == nullptr) { - HILOG_ERROR("Parse pWantAgentFirst failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgentFirst failed"); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); @@ -342,7 +344,7 @@ napi_value JsWantAgent::OnEqual(napi_env env, napi_callback_info info) } if (!CheckTypeForNapiValue(env, argv[1], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); @@ -354,7 +356,7 @@ napi_value JsWantAgent::OnEqual(napi_env env, napi_callback_info info) UnwrapWantAgent(env, argv[1], reinterpret_cast(&pWantAgentSecond)); if (pWantAgentSecond == nullptr) { - HILOG_ERROR("Parse pWantAgentSceond failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgentSceond failed"); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); @@ -368,7 +370,7 @@ napi_value JsWantAgent::OnEqual(napi_env env, napi_callback_info info) std::shared_ptr wantAgentSecond = std::make_shared(*pWantAgentSecond); NapiAsyncTask::CompleteCallback complete = [wantAgentFirst, wantAgentSecond](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnEqual NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnEqual NapiAsyncTask is called"); bool ret = false; ErrCode retCode = WantAgentHelper::IsEquals(wantAgentFirst, wantAgentSecond); #ifdef ENABLE_ERRCODE @@ -403,31 +405,31 @@ napi_value JsWantAgent::OnGetWant(napi_env env, napi_callback_info info) size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - HILOG_DEBUG("enter, argc = %{public}d", static_cast(argc)); + TAG_LOGD(AAFwkTag::WANTAGENT, "enter, argc = %{public}d", static_cast(argc)); int32_t errCode = BUSINESS_ERROR_CODE_OK; WantAgent* pWantAgent = nullptr; if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough arguments"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough arguments"); return CreateJsUndefined(env); } napi_value lastParam = (argc >= ARGC_TWO) ? argv[INDEX_ONE] : nullptr; if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong parameter type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong parameter type. Object expected."); errCode = ERR_NOT_OK; return RetErrMsg(env, lastParam, errCode); } UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent error"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent error"); errCode = ERR_NOT_OK; return RetErrMsg(env, lastParam, errCode); } std::shared_ptr wantAgent = std::make_shared(*pWantAgent); NapiAsyncTask::CompleteCallback complete = [wantAgent](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnGetWant NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnGetWant NapiAsyncTask is called"); std::shared_ptr want = WantAgentHelper::GetWant(wantAgent); if (want == nullptr) { task.Reject(env, CreateJsError(env, ERR_NOT_OK, "WantAgentHelper::GetWant result nullptr.")); @@ -447,31 +449,32 @@ napi_value JsWantAgent::OnGetOperationType(napi_env env, napi_callback_info info size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - HILOG_DEBUG("JsWantAgent::OnGetOperationType enter, argc = %{public}d", static_cast(argc)); + TAG_LOGD(AAFwkTag::WANTAGENT, "JsWantAgent::OnGetOperationType enter, argc = %{public}d", + static_cast(argc)); int32_t errCode = BUSINESS_ERROR_CODE_OK; WantAgent* pWantAgent = nullptr; if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); return CreateJsUndefined(env); } napi_value lastParam = (argc >= ARGC_TWO) ? argv[INDEX_ONE] : nullptr; if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); errCode = ERR_NOT_OK; return RetErrMsg(env, lastParam, errCode); } UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent failed"); errCode = ERR_NOT_OK; return RetErrMsg(env, lastParam, errCode); } std::shared_ptr wantAgent = std::make_shared(*pWantAgent); NapiAsyncTask::CompleteCallback complete = [wantAgent](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnGetOperationType NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnGetOperationType NapiAsyncTask is called"); auto ret = WantAgentHelper::GetType(wantAgent); task.Resolve(env, CreateJsValue(env, ret)); }; @@ -484,14 +487,14 @@ napi_value JsWantAgent::OnGetOperationType(napi_env env, napi_callback_info info napi_value JsWantAgent::OnGetBundleName(napi_env env, napi_callback_info info) { - HILOG_INFO("called."); + TAG_LOGI(AAFwkTag::WANTAGENT, "called."); size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); int32_t errCode = BUSINESS_ERROR_CODE_OK; WantAgent* pWantAgent = nullptr; if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); #endif @@ -500,7 +503,7 @@ napi_value JsWantAgent::OnGetBundleName(napi_env env, napi_callback_info info) napi_value lastParam = (argc >= ARGC_TWO) ? argv[INDEX_ONE] : nullptr; if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); @@ -512,7 +515,7 @@ napi_value JsWantAgent::OnGetBundleName(napi_env env, napi_callback_info info) UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent failed"); #ifdef ENABLE_ERRCODE errCode = ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER; AbilityRuntimeErrorUtil::Throw(env, errCode); @@ -525,7 +528,7 @@ napi_value JsWantAgent::OnGetBundleName(napi_env env, napi_callback_info info) std::shared_ptr wantAgent = std::make_shared(*pWantAgent); NapiAsyncTask::CompleteCallback complete = [wantAgent](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnGetBundleName NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnGetBundleName NapiAsyncTask is called"); std::string bundleName = ""; #ifdef ENABLE_ERRCODE ErrCode result = WantAgentHelper::GetBundleName(wantAgent, bundleName); @@ -548,14 +551,14 @@ napi_value JsWantAgent::OnGetBundleName(napi_env env, napi_callback_info info) napi_value JsWantAgent::OnGetUid(napi_env env, napi_callback_info info) { - HILOG_INFO("called."); + TAG_LOGI(AAFwkTag::WANTAGENT, "called."); size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); int32_t errCode = BUSINESS_ERROR_CODE_OK; WantAgent* pWantAgent = nullptr; if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); #ifdef ENABLE_ERRCODE errCode = ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER; AbilityRuntimeErrorUtil::Throw(env, errCode); @@ -565,7 +568,7 @@ napi_value JsWantAgent::OnGetUid(napi_env env, napi_callback_info info) napi_value lastParam = (argc >= ARGC_TWO) ? argv[INDEX_ONE] : nullptr; if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); #ifdef ENABLE_ERRCODE errCode = ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER; AbilityRuntimeErrorUtil::Throw(env, errCode); @@ -578,7 +581,7 @@ napi_value JsWantAgent::OnGetUid(napi_env env, napi_callback_info info) UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent error"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent error"); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); @@ -590,7 +593,7 @@ napi_value JsWantAgent::OnGetUid(napi_env env, napi_callback_info info) std::shared_ptr wantAgent = std::make_shared(*pWantAgent); NapiAsyncTask::CompleteCallback complete = [wantAgent](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnGetUid NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnGetUid NapiAsyncTask is called"); int uid = -1; #ifdef ENABLE_ERRCODE ErrCode result = WantAgentHelper::GetUid(wantAgent, uid); @@ -612,14 +615,14 @@ napi_value JsWantAgent::OnGetUid(napi_env env, napi_callback_info info) napi_value JsWantAgent::OnCancel(napi_env env, napi_callback_info info) { - HILOG_DEBUG("%{public}s is called", __FUNCTION__); + TAG_LOGD(AAFwkTag::WANTAGENT, "%{public}s is called", __FUNCTION__); int32_t errCode = BUSINESS_ERROR_CODE_OK; WantAgent* pWantAgent = nullptr; size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); #endif @@ -628,7 +631,7 @@ napi_value JsWantAgent::OnCancel(napi_env env, napi_callback_info info) napi_value lastParam = (argc >= ARGC_TWO) ? argv[INDEX_ONE] : nullptr; if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); #ifdef ENABLE_ERRCODE errCode = ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER; AbilityRuntimeErrorUtil::Throw(env, errCode); @@ -641,7 +644,7 @@ napi_value JsWantAgent::OnCancel(napi_env env, napi_callback_info info) UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent failed"); #ifdef ENABLE_ERRCODE AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); @@ -654,7 +657,7 @@ napi_value JsWantAgent::OnCancel(napi_env env, napi_callback_info info) std::shared_ptr wantAgent = std::make_shared(*pWantAgent); NapiAsyncTask::CompleteCallback complete = [wantAgent](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnCancel NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnCancel NapiAsyncTask is called"); #ifdef ENABLE_ERRCODE ErrCode result = WantAgentHelper::Cancel(wantAgent); if (result != NO_ERROR) { @@ -676,12 +679,12 @@ napi_value JsWantAgent::OnCancel(napi_env env, napi_callback_info info) napi_value JsWantAgent::OnTrigger(napi_env env, napi_callback_info info) { - HILOG_DEBUG("%{public}s is called", __FUNCTION__); + TAG_LOGD(AAFwkTag::WANTAGENT, "%{public}s is called", __FUNCTION__); size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc != ARGC_THREE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); return CreateJsUndefined(env); } @@ -705,26 +708,26 @@ int32_t JsWantAgent::UnWrapTriggerInfoParam(napi_env env, napi_callback_info inf napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc != ARGC_THREE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); return ERR_NOT_OK; } if (!CheckTypeForNapiValue(env, argv[ARGC_ZERO], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); return ERR_NOT_OK; } WantAgent* pWantAgent = nullptr; UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent failed"); return ERR_NOT_OK; } wantAgent = std::make_shared(*pWantAgent); int32_t ret = GetTriggerInfo(env, argv[ARGC_ONE], triggerInfo); if (ret != BUSINESS_ERROR_CODE_OK) { - HILOG_ERROR("Get trigger info error"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Get trigger info error"); return ret; } @@ -738,9 +741,9 @@ int32_t JsWantAgent::UnWrapTriggerInfoParam(napi_env env, napi_callback_info inf int32_t JsWantAgent::GetTriggerInfo(napi_env env, napi_value param, TriggerInfo &triggerInfo) { - HILOG_DEBUG("GetTriggerInfo called."); + TAG_LOGD(AAFwkTag::WANTAGENT, "GetTriggerInfo called."); if (!CheckTypeForNapiValue(env, param, napi_object)) { - HILOG_ERROR("param type mismatch!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "param type mismatch!"); return ERR_NOT_OK; } @@ -748,7 +751,7 @@ int32_t JsWantAgent::GetTriggerInfo(napi_env env, napi_value param, TriggerInfo napi_value jsCode = nullptr; napi_get_named_property(env, param, "code", &jsCode); if (!ConvertFromJsValue(env, jsCode, code)) { - HILOG_ERROR("GetTriggerInfo convert code error!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "GetTriggerInfo convert code error!"); return ERR_NOT_OK; } @@ -760,7 +763,7 @@ int32_t JsWantAgent::GetTriggerInfo(napi_env env, napi_value param, TriggerInfo napi_get_named_property(env, param, "want", &jsWant); want = std::make_shared(); if (!UnwrapWant(env, jsWant, *want)) { - HILOG_ERROR("GetTriggerInfo convert want error!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "GetTriggerInfo convert want error!"); return ERR_NOT_OK; } } @@ -772,7 +775,7 @@ int32_t JsWantAgent::GetTriggerInfo(napi_env env, napi_value param, TriggerInfo napi_value jsPermission = nullptr; napi_get_named_property(env, param, "permission", &jsPermission); if (!ConvertFromJsValue(env, jsPermission, permission)) { - HILOG_ERROR("GetTriggerInfo convert permission error!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "GetTriggerInfo convert permission error!"); return ERR_NOT_OK; } } @@ -793,7 +796,7 @@ int32_t JsWantAgent::GetTriggerInfo(napi_env env, napi_value param, TriggerInfo extraInfo = std::make_shared(); if (!UnwrapWantParams(env, (jsExtraInfo), *extraInfo)) { - HILOG_ERROR("GetTriggerInfo convert extraInfo error!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "GetTriggerInfo convert extraInfo error!"); return ERR_NOT_OK; } } @@ -805,12 +808,12 @@ int32_t JsWantAgent::GetTriggerInfo(napi_env env, napi_value param, TriggerInfo int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, WantAgentWantsParas ¶s) { - HILOG_DEBUG("GetWantAgentParam called."); + TAG_LOGD(AAFwkTag::WANTAGENT, "GetWantAgentParam called."); size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("param type mismatch!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "param type mismatch!"); return PARAMETER_ERROR; } @@ -820,7 +823,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa bool isArray = false; napi_is_array(env, jsWants, &isArray); if (!isArray) { - HILOG_ERROR("wants is not array!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "wants is not array!"); return PARAMETER_ERROR; } @@ -831,7 +834,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa napi_value jsWant = nullptr; napi_get_element(env, jsWants, i, &jsWant); if (!UnwrapWant(env, jsWant, *want)) { - HILOG_ERROR("UnwrapWant failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "UnwrapWant failed!"); return PARAMETER_ERROR; } paras.wants.emplace_back(want); @@ -843,7 +846,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa napi_value jsActionType = nullptr; napi_get_named_property(env, argv[0], "actionType", &jsActionType); if (!ConvertFromJsValue(env, jsActionType, paras.operationType)) { - HILOG_ERROR("Convert actionType failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Convert actionType failed!"); return PARAMETER_ERROR; } } @@ -854,7 +857,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa napi_value jsOperationType = nullptr; napi_get_named_property(env, argv[0], "operationType", &jsOperationType); if (!ConvertFromJsValue(env, jsOperationType, paras.operationType)) { - HILOG_ERROR("Convert operationType failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Convert operationType failed!"); return PARAMETER_ERROR; } } @@ -862,7 +865,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa napi_value jsRequestCode = nullptr; napi_get_named_property(env, argv[0], "requestCode", &jsRequestCode); if (!ConvertFromJsValue(env, jsRequestCode, paras.requestCode)) { - HILOG_ERROR("Convert requestCode failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Convert requestCode failed!"); return PARAMETER_ERROR; } @@ -874,7 +877,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa bool jsActionFlagsIsArray = false; napi_is_array(env, jsActionFlags, &jsActionFlagsIsArray); if (!jsActionFlagsIsArray) { - HILOG_ERROR("actionFlags is not array!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "actionFlags is not array!"); return PARAMETER_ERROR; } @@ -884,12 +887,12 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa napi_value jsActionFlag = nullptr; napi_get_element(env, jsActionFlags, i, &jsActionFlag); if (!CheckTypeForNapiValue(env, jsActionFlag, napi_number)) { - HILOG_ERROR("ActionFlag type error!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "ActionFlag type error!"); return PARAMETER_ERROR; } int32_t actionFlag = 0; if (!ConvertFromJsValue(env, jsActionFlag, actionFlag)) { - HILOG_ERROR("Convert actionFlag failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Convert actionFlag failed!"); return PARAMETER_ERROR; } paras.wantAgentFlags.emplace_back(static_cast(actionFlag)); @@ -904,7 +907,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa bool jsWantAgentFlagsIsArray = false; napi_is_array(env, jsWantAgentFlags, &jsWantAgentFlagsIsArray); if (!jsWantAgentFlagsIsArray) { - HILOG_ERROR("wantAgentFlags is not array!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "wantAgentFlags is not array!"); return PARAMETER_ERROR; } @@ -914,12 +917,12 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa napi_value jsWantAgentFlag = nullptr; napi_get_element(env, jsWantAgentFlags, i, &jsWantAgentFlag); if (!CheckTypeForNapiValue(env, jsWantAgentFlag, napi_number)) { - HILOG_ERROR("WantAgentFlag type failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "WantAgentFlag type failed!"); return PARAMETER_ERROR; } int32_t wantAgentFlag = 0; if (!ConvertFromJsValue(env, jsWantAgentFlag, wantAgentFlag)) { - HILOG_ERROR("Convert WantAgentFlag failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Convert WantAgentFlag failed!"); return PARAMETER_ERROR; } paras.wantAgentFlags.emplace_back(static_cast(wantAgentFlag)); @@ -939,12 +942,12 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa } if (hasExtraInfo) { if (!CheckTypeForNapiValue(env, jsExtraInfo, napi_object)) { - HILOG_ERROR("ExtraInfo type error!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "ExtraInfo type error!"); return PARAMETER_ERROR; } if (!UnwrapWantParams(env, (jsExtraInfo), paras.extraInfo)) { - HILOG_ERROR("Convert extraInfo failed!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Convert extraInfo failed!"); return PARAMETER_ERROR; } } @@ -953,7 +956,7 @@ int32_t JsWantAgent::GetWantAgentParam(napi_env env, napi_callback_info info, Wa napi_value JsWantAgent::WrapWantAgent(napi_env env, WantAgent* wantAgent) { - HILOG_DEBUG("WrapWantAgent called."); + TAG_LOGD(AAFwkTag::WANTAGENT, "WrapWantAgent called."); napi_value wantAgentClass = nullptr; napi_define_class( env, @@ -971,7 +974,7 @@ napi_value JsWantAgent::WrapWantAgent(napi_env env, WantAgent* wantAgent) napi_value result = nullptr; napi_new_instance(env, wantAgentClass, 0, nullptr, &result); if (result == nullptr) { - HILOG_ERROR("create instance failed."); + TAG_LOGE(AAFwkTag::WANTAGENT, "create instance failed."); delete wantAgent; wantAgent = nullptr; return nullptr; @@ -981,7 +984,7 @@ napi_value JsWantAgent::WrapWantAgent(napi_env env, WantAgent* wantAgent) result, reinterpret_cast(wantAgent), [](napi_env env, void* data, void* hint) { - HILOG_DEBUG("delete wantAgent."); + TAG_LOGD(AAFwkTag::WANTAGENT, "delete wantAgent."); auto agent = static_cast(data); delete agent; agent = nullptr; @@ -993,14 +996,14 @@ napi_value JsWantAgent::WrapWantAgent(napi_env env, WantAgent* wantAgent) void JsWantAgent::UnwrapWantAgent(napi_env env, napi_value jsParam, void** result) { - HILOG_DEBUG("UnwrapWantAgent called."); + TAG_LOGD(AAFwkTag::WANTAGENT, "UnwrapWantAgent called."); if (jsParam == nullptr) { - HILOG_ERROR("UnwrapWantAgent jsParam is nullptr!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "UnwrapWantAgent jsParam is nullptr!"); return; } if (!CheckTypeForNapiValue(env, jsParam, napi_object)) { - HILOG_ERROR("UnwrapWantAgent jsParam type error!"); + TAG_LOGE(AAFwkTag::WANTAGENT, "UnwrapWantAgent jsParam type error!"); return; } @@ -1012,9 +1015,9 @@ napi_value JsWantAgent::OnGetWantAgent(napi_env env, napi_callback_info info) size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - HILOG_DEBUG("enter, argc = %{public}d", static_cast(argc)); + TAG_LOGD(AAFwkTag::WANTAGENT, "enter, argc = %{public}d", static_cast(argc)); if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); return CreateJsUndefined(env); } @@ -1022,13 +1025,13 @@ napi_value JsWantAgent::OnGetWantAgent(napi_env env, napi_callback_info info) std::shared_ptr spParas = std::make_shared(); int32_t ret = GetWantAgentParam(env, info, *spParas); if (ret != 0) { - HILOG_ERROR("Failed to get wantAgent parameter."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Failed to get wantAgent parameter."); return RetErrMsg(env, lastParam, ret); } NapiAsyncTask::CompleteCallback complete = [weak = weak_from_this(), parasobj = spParas](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnGetWantAgent NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnGetWantAgent NapiAsyncTask is called"); auto self = weak.lock(); std::shared_ptr extraInfo = std::make_shared(parasobj->extraInfo); WantAgentInfo wantAgentInfo(parasobj->requestCode, @@ -1042,13 +1045,13 @@ napi_value JsWantAgent::OnGetWantAgent(napi_env env, napi_callback_info info) WantAgentHelper::GetWantAgent(context, wantAgentInfo, wantAgent); WantAgent* pWantAgent = nullptr; if (wantAgent == nullptr) { - HILOG_INFO("wantAgent is nullptr..."); + TAG_LOGI(AAFwkTag::WANTAGENT, "wantAgent is nullptr..."); } else { pWantAgent = new WantAgent(wantAgent->GetPendingWant()); } if (pWantAgent == nullptr) { - HILOG_INFO("pWantAgent is nullptr..."); + TAG_LOGI(AAFwkTag::WANTAGENT, "pWantAgent is nullptr..."); } task.Resolve(env, self->WrapWantAgent(env, pWantAgent)); }; @@ -1064,36 +1067,36 @@ napi_value JsWantAgent::OnNapiGetWant(napi_env env, napi_callback_info info) size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - HILOG_DEBUG("enter, argc = %{public}d", static_cast(argc)); + TAG_LOGD(AAFwkTag::WANTAGENT, "enter, argc = %{public}d", static_cast(argc)); if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } WantAgent* pWantAgent = nullptr; auto selfToken = IPCSkeleton::GetSelfTokenID(); if (!Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(selfToken)) { - HILOG_ERROR("This application is not system-app, can not use system-api"); + TAG_LOGE(AAFwkTag::WANTAGENT, "This application is not system-app, can not use system-api"); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_NOT_SYSTEM_APP); return CreateJsUndefined(env); } if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent failed"); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } std::shared_ptr wantAgent = std::make_shared(*pWantAgent); NapiAsyncTask::CompleteCallback complete = [wantAgent](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnNapiGetWant NapiAsyncTask is start"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnNapiGetWant NapiAsyncTask is start"); std::shared_ptr want = std::make_shared(); ErrCode result = WantAgentHelper::GetWant(wantAgent, want); if (result != NO_ERROR) { @@ -1111,12 +1114,12 @@ napi_value JsWantAgent::OnNapiGetWant(napi_env env, napi_callback_info info) napi_value JsWantAgent::OnNapiTrigger(napi_env env, napi_callback_info info) { - HILOG_INFO("called."); + TAG_LOGI(AAFwkTag::WANTAGENT, "called."); size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc != ARGC_THREE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } @@ -1141,9 +1144,9 @@ napi_value JsWantAgent::OnNapiGetWantAgent(napi_env env, napi_callback_info info size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - HILOG_DEBUG("enter, argc = %{public}d", static_cast(argc)); + TAG_LOGD(AAFwkTag::WANTAGENT, "enter, argc = %{public}d", static_cast(argc)); if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } @@ -1151,14 +1154,14 @@ napi_value JsWantAgent::OnNapiGetWantAgent(napi_env env, napi_callback_info info std::shared_ptr spParas = std::make_shared(); int32_t ret = GetWantAgentParam(env, info, *spParas); if (ret != 0) { - HILOG_ERROR("Failed to get wantAgent param."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Failed to get wantAgent param."); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } NapiAsyncTask::CompleteCallback complete = [weak = weak_from_this(), parasobj = spParas](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnNapiGetWantAgent NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnNapiGetWantAgent NapiAsyncTask is called"); auto self = weak.lock(); std::shared_ptr extraInfo = std::make_shared(parasobj->extraInfo); WantAgentInfo wantAgentInfo(parasobj->requestCode, @@ -1183,7 +1186,7 @@ napi_value JsWantAgent::OnNapiGetWantAgent(napi_env env, napi_callback_info info } if (pWantAgent == nullptr) { - HILOG_ERROR("pWantAgent is nullptr..."); + TAG_LOGE(AAFwkTag::WANTAGENT, "pWantAgent is nullptr..."); result = ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER; task.Reject(env, CreateJsError(env, result, AbilityRuntimeErrorUtil::GetErrMessage(result))); } else { @@ -1201,19 +1204,19 @@ napi_value JsWantAgent::OnNapiGetWantAgent(napi_env env, napi_callback_info info napi_value JsWantAgent::OnNapiGetOperationType(napi_env env, napi_callback_info info) { - HILOG_INFO("called."); + TAG_LOGI(AAFwkTag::WANTAGENT, "called."); size_t argc = ARGS_MAX_COUNT; napi_value argv[ARGS_MAX_COUNT] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); WantAgent* pWantAgent = nullptr; if (argc > ARGC_TWO || argc < ARGC_ONE) { - HILOG_ERROR("Not enough params"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Not enough params"); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } if (!CheckTypeForNapiValue(env, argv[0], napi_object)) { - HILOG_ERROR("Wrong argument type. Object expected."); + TAG_LOGE(AAFwkTag::WANTAGENT, "Wrong argument type. Object expected."); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } @@ -1221,14 +1224,14 @@ napi_value JsWantAgent::OnNapiGetOperationType(napi_env env, napi_callback_info UnwrapWantAgent(env, argv[0], reinterpret_cast(&pWantAgent)); if (pWantAgent == nullptr) { - HILOG_ERROR("Parse pWantAgent failed"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Parse pWantAgent failed"); AbilityRuntimeErrorUtil::Throw(env, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); return CreateJsUndefined(env); } std::shared_ptr wantAgent = std::make_shared(*pWantAgent); NapiAsyncTask::CompleteCallback complete = [wantAgent](napi_env env, NapiAsyncTask &task, int32_t status) { - HILOG_DEBUG("OnNapiGetOperationType NapiAsyncTask is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "OnNapiGetOperationType NapiAsyncTask is called"); int32_t operType; ErrCode ret = WantAgentHelper::GetType(wantAgent, operType); if (ret != NO_ERROR) { @@ -1247,10 +1250,10 @@ napi_value JsWantAgent::OnNapiGetOperationType(napi_env env, napi_callback_info napi_value WantAgentFlagsInit(napi_env env) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "called"); if (env == nullptr) { - HILOG_ERROR("Invalid input parameters"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Invalid input parameters"); return nullptr; } @@ -1283,10 +1286,10 @@ napi_value WantAgentFlagsInit(napi_env env) napi_value WantAgentOperationTypeInit(napi_env env) { - HILOG_DEBUG("called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "called"); if (env == nullptr) { - HILOG_ERROR("Invalid input parameters"); + TAG_LOGE(AAFwkTag::WANTAGENT, "Invalid input parameters"); return nullptr; } @@ -1311,10 +1314,10 @@ napi_value WantAgentOperationTypeInit(napi_env env) napi_value JsWantAgentInit(napi_env env, napi_value exportObj) { - HILOG_DEBUG("JsWantAgentInit is called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "JsWantAgentInit is called"); if (env == nullptr || exportObj == nullptr) { - HILOG_ERROR("env or exportObj null."); + TAG_LOGE(AAFwkTag::WANTAGENT, "env or exportObj null."); return nullptr; } @@ -1324,7 +1327,7 @@ napi_value JsWantAgentInit(napi_env env, napi_value exportObj) napi_set_named_property(env, exportObj, "WantAgentFlags", WantAgentFlagsInit(env)); napi_set_named_property(env, exportObj, "OperationType", WantAgentOperationTypeInit(env)); - HILOG_DEBUG("JsWantAgentInit BindNativeFunction called"); + TAG_LOGD(AAFwkTag::WANTAGENT, "JsWantAgentInit BindNativeFunction called"); const char* moduleName = "JsWantAgent"; BindNativeFunction(env, exportObj, "equal", moduleName, JsWantAgent::Equal); BindNativeFunction(env, exportObj, "getWant", moduleName, JsWantAgent::GetWant); @@ -1334,7 +1337,7 @@ napi_value JsWantAgentInit(napi_env env, napi_value exportObj) BindNativeFunction(env, exportObj, "cancel", moduleName, JsWantAgent::Cancel); BindNativeFunction(env, exportObj, "trigger", moduleName, JsWantAgent::Trigger); BindNativeFunction(env, exportObj, "getWantAgent", moduleName, JsWantAgent::GetWantAgent); - HILOG_DEBUG("JsWantAgentInit end"); + TAG_LOGD(AAFwkTag::WANTAGENT, "JsWantAgentInit end"); return CreateJsUndefined(env); }