From dbe32b0c50335dfaec712e56166d1ffcd5c4129a Mon Sep 17 00:00:00 2001 From: zZjuN Date: Fri, 8 Aug 2025 16:17:55 +0800 Subject: [PATCH 1/2] test head file Signed-off-by: zZjuN --- .../screen_session_manager/js_screen_session_manager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 8b77bacc9f..449254df46 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); } -- Gitee From 6ceb3c6928c0686c733e3871d38f4a5518d07e85 Mon Sep 17 00:00:00 2001 From: zZjuN Date: Fri, 8 Aug 2025 17:32:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?build.gn=E4=B8=AD=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zZjuN --- utils/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 3f1ca60a44..379f366159 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 = [ -- Gitee