diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 3f1ca60a4427f888c26ff322d1058d21899f9872..379f3661591f1aee66b6d9183b6cfc296eda09ff 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -223,6 +223,7 @@ ohos_shared_library("libwmutil") { "src/window_frame_trace_impl.cpp", "src/window_property.cpp", "src/window_transition_info.cpp", + "src/js_err_utils.cpp", ] configs = [ diff --git a/window_scene/interfaces/kits/napi/screen_session_manager/js_screen_session_manager.cpp b/window_scene/interfaces/kits/napi/screen_session_manager/js_screen_session_manager.cpp index 8b77bacc9f3db3e91d40f9a2032fd8995eb4012a..449254df467cfb03e058297c8b6022be5bf44098 100644 --- a/window_scene/interfaces/kits/napi/screen_session_manager/js_screen_session_manager.cpp +++ b/window_scene/interfaces/kits/napi/screen_session_manager/js_screen_session_manager.cpp @@ -25,6 +25,7 @@ #include "js_device_screen_config.h" #include "pixel_map_napi.h" #include "window_manager_hilog.h" +#include "js_err_utils.h" #ifdef POWER_MANAGER_ENABLE #include "shutdown/shutdown_client.h" @@ -1188,14 +1189,14 @@ napi_value JsScreenSessionManager::OnSetScreenFreezeImmediately(napi_env env, co napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc != ARGC_FOUR) { TLOGE(WmsLogTag::DMS, "[NAPI]Argc is invalid: %{public}zu", argc); - napi_throw(env, CreateJsError(env, static_cast(WSErrorCode::WS_ERROR_INVALID_PARAM), + napi_throw(env, JsErrUtils::CreateJsError(env, DMError::DM_ERROR_INVALID_PARAM, "Input parameter is missing or invalid")); return NapiGetUndefined(env); } int32_t screenId = INVALID_ID; if (!ConvertFromJsValue(env, argv[0], screenId) || screenId < 0) { TLOGE(WmsLogTag::DMS, "[NAPI]Failed to convert parameter to screenId"); - napi_throw(env, CreateJsError(env, static_cast(WSErrorCode::WS_ERROR_INVALID_PARAM), + napi_throw(env, JsErrUtils::CreateJsError(env, DMError::DM_ERROR_INVALID_PARAM, "Input parameter is missing or invalid")); return NapiGetUndefined(env); } @@ -1203,7 +1204,7 @@ napi_value JsScreenSessionManager::OnSetScreenFreezeImmediately(napi_env env, co for (uint8_t i = 0; i < ARGC_TWO; i++) { if (!ConvertFromJsValue(env, argv[i + 1], scaleParam[i])) { TLOGE(WmsLogTag::DMS, "[NAPI]Failed to convert parameter to scale[%d]", i + 1); - napi_throw(env, CreateJsError(env, static_cast(WSErrorCode::WS_ERROR_INVALID_PARAM), + napi_throw(env, JsErrUtils::CreateJsError(env, DMError::DM_ERROR_INVALID_PARAM, "Input parameter is missing or invalid")); return NapiGetUndefined(env); } @@ -1212,7 +1213,7 @@ napi_value JsScreenSessionManager::OnSetScreenFreezeImmediately(napi_env env, co bool isFreeze = false; if (!ConvertFromJsValue(env, argv[ARGC_THREE], isFreeze)) { TLOGE(WmsLogTag::DMS, "Failed to convert parameter to isFreeze"); - napi_throw(env, CreateJsError(env, static_cast(WSErrorCode::WS_ERROR_INVALID_PARAM), + napi_throw(env, JsErrUtils::CreateJsError(env, DMError::DM_ERROR_INVALID_PARAM, "Input parameter is missing or invalid")); return NapiGetUndefined(env); }