From 4d0a784f90d3abd9330292100d6a263ee809bad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E5=AE=87=E8=B1=AA?= Date: Sun, 24 Aug 2025 16:29:35 +0800 Subject: [PATCH] change1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 卢宇豪 --- .../window_manager_napi/js_window_manager.cpp | 9 +++--- .../window_runtime/window_napi/js_window.cpp | 30 +++++++++---------- .../window_stage_napi/js_window_stage.cpp | 4 +-- .../session/host/src/scene_session.cpp | 4 +-- .../src/scene_session_manager.cpp | 12 ++++---- wm/src/window_scene_session_impl.cpp | 2 +- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp b/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp index 335831a2fd..423aa36fae 100644 --- a/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp +++ b/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp @@ -1350,7 +1350,8 @@ napi_value JsWindowManager::OnGetAllWindowLayoutInfo(napi_env env, napi_callback SingletonContainer::Get().GetAllWindowLayoutInfo(static_cast(displayId), infos)); if (ret == WmErrorCode::WM_OK) { task->Resolve(env, CreateJsWindowLayoutInfoArrayObject(env, infos)); - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "%{public}s success", where); + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s displayId: %{public}" PRIu64, + where, static_cast(displayId)); } else { task->Reject(env, JsErrUtils::CreateJsError(env, ret, "failed")); TLOGNE(WmsLogTag::WMS_ATTRIBUTE, "%{public}s failed", where); @@ -1382,7 +1383,7 @@ napi_value JsWindowManager::OnGetGlobalWindowMode(napi_env env, napi_callback_in TLOGE(WmsLogTag::WMS_ATTRIBUTE, "failed to convert parameter to displayId"); return NapiThrowError(env, WmErrorCode::WM_ERROR_ILLEGAL_PARAM); } - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "explicit set undefined or null"); + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "explicit set undefined or null"); } else if (inputDisplayId < 0) { TLOGE(WmsLogTag::WMS_ATTRIBUTE, "invalid displayId value: %{public}" PRId64, inputDisplayId); return NapiThrowError(env, WmErrorCode::WM_ERROR_ILLEGAL_PARAM); @@ -1396,7 +1397,7 @@ napi_value JsWindowManager::OnGetGlobalWindowMode(napi_env env, napi_callback_in GlobalWindowMode globalWinMode = GlobalWindowMode::UNKNOWN; WMError errCode = SingletonContainer::Get().GetGlobalWindowMode(displayId, globalWinMode); if (errCode == WMError::WM_OK) { - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "%{public}s ok, globalWinMode: %{public}u, displayId: %{public}" PRIu64, + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s ok, globalWinMode: %{public}u, displayId: %{public}" PRIu64, where, static_cast(globalWinMode), displayId); task->Resolve(env, CreateJsValue(env, globalWinMode)); } else { @@ -1671,7 +1672,7 @@ napi_value JsWindowManager::OnNotifyScreenshotEvent(napi_env env, napi_callback_ auto execute = [errCodePtr, screenshotEventType, where] { *errCodePtr = WM_JS_TO_ERROR_CODE_MAP.at( SingletonContainer::Get().NotifyScreenshotEvent(screenshotEventType)); - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "%{public}s end, event: %{public}d, result: %{public}d", + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s end, event: %{public}d, result: %{public}d", where, screenshotEventType, *errCodePtr); }; auto complete = [errCodePtr, where](napi_env env, NapiAsyncTask& task, int32_t status) { diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp index 2fb9479bde..89cf6e1d60 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp @@ -4088,7 +4088,7 @@ napi_value JsWindow::OnSetWindowBackgroundColorSync(napi_env env, napi_callback_ "[window][setWindowBackgroundColor]msg: invalid window"); } auto retErr = windowToken_->SetBackgroundColor(color); - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "win=%{public}u, color=%{public}s, retErr=%{public}d", + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "win=%{public}u, color=%{public}s, retErr=%{public}d", windowToken_->GetWindowId(), color.c_str(), static_cast(retErr)); WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(retErr); if (ret == WmErrorCode::WM_OK) { @@ -4768,14 +4768,14 @@ napi_value JsWindow::OnSetWindowPrivacyMode(napi_env env, napi_callback_info inf napi_value argv[4] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc < 1) { // 1: params num - WLOGFE("Argc is invalid: %{public}zu", argc); + TLOGE(WmsLogTag::WMS_ATTRIBUTE, "Argc is invalid: %{public}zu", argc); errCode = WmErrorCode::WM_ERROR_INVALID_PARAM; } bool isPrivacyMode = false; if (errCode == WmErrorCode::WM_OK) { napi_value nativeVal = argv[0]; if (nativeVal == nullptr) { - WLOGFE("Failed to convert parameter to isPrivacyMode"); + TLOGE(WmsLogTag::WMS_ATTRIBUTE, "Failed to convert parameter to isPrivacyMode"); errCode = WmErrorCode::WM_ERROR_INVALID_PARAM; } else { CHECK_NAPI_RETCODE(errCode, WmErrorCode::WM_ERROR_INVALID_PARAM, @@ -4801,16 +4801,16 @@ napi_value JsWindow::OnSetWindowPrivacyMode(napi_env env, napi_callback_info inf WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(weakWindow->SetPrivacyMode(isPrivacyMode)); if (ret == WmErrorCode::WM_ERROR_NO_PERMISSION) { task->Reject(env, JsErrUtils::CreateJsError(env, ret, "[window][setWindowPrivacyMode]msg: no permission")); - WLOGI("%{public}s failed, window [%{public}u, %{public}s] mode=%{public}u", - where, weakWindow->GetWindowId(), weakWindow->GetWindowName().c_str(), isPrivacyMode); + TLOGNE(WmsLogTag::WMS_ATTRIBUTE, "%{public}s permission denied, wid: %{public}u mode=%{public}u", + where, weakWindow->GetWindowId(), isPrivacyMode); return; } task->Resolve(env, NapiGetUndefined(env)); - WLOGI("%{public}s succeed, window [%{public}u, %{public}s] mode=%{public}u", + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s succeed, window [%{public}u, %{public}s] mode=%{public}u", where, weakWindow->GetWindowId(), weakWindow->GetWindowName().c_str(), isPrivacyMode); }; if (napi_send_event(env, asyncTask, napi_eprio_high, "OnSetWindowPrivacyMode") != napi_status::napi_ok) { - TLOGE(WmsLogTag::WMS_IMMS, "napi_send_event failed"); + TLOGE(WmsLogTag::WMS_ATTRIBUTE, "napi_send_event failed"); napiAsyncTask->Reject(env, JsErrUtils::CreateJsError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY, "[window][setWindowPrivacyMode]msg: failed to send event")); @@ -5052,9 +5052,9 @@ napi_value JsWindow::OnHideNonSystemFloatingWindows(napi_env env, napi_callback_ return; } task->Resolve(env, NapiGetUndefined(env)); - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, - "%{public}s end. Window [%{public}u, %{public}s]", - where, window->GetWindowId(), window->GetWindowName().c_str()); + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, + "%{public}s end. Window [%{public}u, %{public}d]", + where, window->GetWindowId(), shouldHide); }; if (napi_send_event(env, asyncTask, napi_eprio_high, "OnHideNonSystemFloatingWindows") != napi_status::napi_ok) { napiAsyncTask->Reject(env, @@ -5813,7 +5813,7 @@ napi_value JsWindow::OnSnapshotSync(napi_env env, napi_callback_info info) } std::shared_ptr pixelMap = nullptr; WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(windowToken_->Snapshot(pixelMap)); - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "winId: %{public}u snapshot end, result: %{public}d", + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "winId: %{public}u snapshot end, result: %{public}d", windowToken_->GetWindowId(), ret); if (ret != WmErrorCode::WM_OK) { return NapiThrowError(env, ret, "[window][snapshotSync]msg: snapshot failed"); @@ -5863,7 +5863,7 @@ napi_value JsWindow::OnSnapshotIgnorePrivacy(napi_env env, napi_callback_info in return; } task->Resolve(env, nativePixelMap); - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "windowId:%{public}u, WxH=%{public}dx%{public}d", + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "windowId:%{public}u, WxH=%{public}dx%{public}d", weakWindow->GetWindowId(), pixelMap->GetWidth(), pixelMap->GetHeight()); }; if (napi_send_event(env, asyncTask, napi_eprio_high, "OnSnapshotIgnorePrivacy") != napi_status::napi_ok) { @@ -6415,7 +6415,7 @@ napi_value JsWindow::OnGetWindowCornerRadius(napi_env env, napi_callback_info in return NapiThrowError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY, "[window][getWindowCornerRadius]msg:convert corner radius to js value failed."); } - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u, %{public}s] Get success, cornerRadius=%{public}f.", + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u, %{public}s] Get success, cornerRadius=%{public}f.", windowToken_->GetWindowId(), windowToken_->GetWindowName().c_str(), cornerRadius); return jsCornerRadius; } @@ -6542,7 +6542,7 @@ napi_value JsWindow::OnSetWindowShadowRadius(napi_env env, napi_callback_info in return NapiThrowError(env, syncShadowsRet, "[window][setWindowShadowRadius]msg:sync shadows to component failed"); } - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u, %{public}s] set success, radius=%{public}f.", + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u, %{public}s] set success, radius=%{public}f.", windowToken_->GetWindowId(), windowToken_->GetWindowName().c_str(), radius); return NapiGetUndefined(env); } @@ -8702,7 +8702,7 @@ napi_value JsWindow::OnSetDefaultDensityEnabled(napi_env env, napi_callback_info "[window][setDefaultDensityEnabled]msg: invalid window"); } WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(windowToken_->SetWindowDefaultDensityEnabled(enabled)); - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "winId: %{public}u set enabled=%{public}u result=%{public}d", + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "winId: %{public}u set enabled=%{public}u result=%{public}d", windowToken_->GetWindowId(), enabled, ret); if (ret != WmErrorCode::WM_OK) { return NapiThrowError(env, ret, "[window][setDefaultDensityEnabled]msg: set default density failed"); diff --git a/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp b/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp index bbf6d9c41c..a753c9274e 100644 --- a/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp +++ b/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp @@ -780,7 +780,7 @@ napi_value JsWindowStage::OnSetDefaultDensityEnabled(napi_env env, napi_callback } WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(window->SetDefaultDensityEnabled(enabled)); - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u,%{public}s] enabled=%{public}u ret=%{public}u", + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u,%{public}s] enabled=%{public}u ret=%{public}u", window->GetWindowId(), window->GetWindowName().c_str(), enabled, ret); return CreateJsValue(env, static_cast(ret)); @@ -824,7 +824,7 @@ napi_value JsWindowStage::OnSetCustomDensity(napi_env env, napi_callback_info in } WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(window->SetCustomDensity(density, applyToSubWindow)); - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u,%{public}s] set density=%{public}f, " + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "Window [%{public}u,%{public}s] set density=%{public}f, " "applyToSubWindow=%{public}d, result=%{public}u", window->GetWindowId(), window->GetWindowName().c_str(), density, applyToSubWindow, ret); if (ret != WmErrorCode::WM_OK) { diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp index 73eeed9730..c637a24eb0 100644 --- a/window_scene/session/host/src/scene_session.cpp +++ b/window_scene/session/host/src/scene_session.cpp @@ -7962,7 +7962,7 @@ bool SceneSession::UpdateVisibilityInner(bool visibility) if (isVisible_ == visibility) { return false; } - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "id: %{public}d, visibility: %{public}u -> %{public}u", + TLOGI(WmsLogTag::WMS_PIPELINE, "id: %{public}d, visibility: %{public}u -> %{public}u", GetPersistentId(), isVisible_, visibility); if (visibilityChangedDetectFunc_) { visibilityChangedDetectFunc_(GetCallingPid(), isVisible_, visibility); @@ -7977,7 +7977,7 @@ bool SceneSession::UpdateVisibilityInner(bool visibility) SceneSessionChangeInfo changeInfo { .persistentId_ = GetPersistentId(), .changeInfo_ = "Visibility change to " + std::to_string(visibility), - .logTag_ = WmsLogTag::WMS_ATTRIBUTE, + .logTag_ = WmsLogTag::WMS_PIPELINE, }; SessionChangeRecorder::GetInstance().RecordSceneSessionChange(RecordType::VISIBLE_RECORD, changeInfo); return true; diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 2a77b5a9be..984127601d 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -1962,7 +1962,7 @@ WMError SceneSessionManager::AddSkipSelfWhenShowOnVirtualScreenList(const std::v TLOGNE(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] not found or is sub window", persistentId); continue; } - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] add to virtual screen black list", persistentId); + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] add to virtual screen black list", persistentId); auto surfaceNode = session->GetSurfaceNode(); if (surfaceNode) { auto surfaceNodeId = surfaceNode->GetId(); @@ -1998,7 +1998,7 @@ WMError SceneSessionManager::RemoveSkipSelfWhenShowOnVirtualScreenList(const std TLOGNE(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] not found or is sub window", persistentId); continue; } - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] remove from virtual screen black list", persistentId); + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] remove from virtual screen black list", persistentId); auto surfaceNode = session->GetSurfaceNode(); if (surfaceNode) { auto surfaceNodeId = surfaceNode->GetId(); @@ -6245,7 +6245,7 @@ void SceneSessionManager::HandleKeepScreenOn(const sptr& sceneSess sourceMode = screenSession->GetSourceMode(); } bool shouldLock = requireLock && IsSessionVisibleForeground(sceneSession) && sourceMode != ScreenSourceMode::SCREEN_UNIQUE; - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "keep screen on: [%{public}s, %{public}d, %{public}d, %{public}d, %{public}d, %{public}" PRIu64 ", %{public}d]", sceneSession->GetWindowName().c_str(), sceneSession->GetSessionState(), sceneSession->IsVisible(), requireLock, shouldLock, currScreenId, sourceMode); @@ -6316,6 +6316,7 @@ void SceneSessionManager::PostBrightnessTask(const sptr& sceneSess } DisplayPowerMgr::DisplayPowerMgrClient::GetInstance().RestoreBrightness(); SetDisplayBrightness(UNDEFINED_BRIGHTNESS); // UNDEFINED_BRIGHTNESS means system default brightness + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s restore value", where); }; taskScheduler_->AddExportTask("DisplayPowerMgr:RestoreBrightness", std::move(task)); } @@ -6339,6 +6340,7 @@ void SceneSessionManager::PostBrightnessTask(const sptr& sceneSess static_cast(brightness * MAX_BRIGHTNESS)); } SetDisplayBrightness(brightness); + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s override value: %{public}f", where, brightness); }; taskScheduler_->AddExportTask("DisplayPowerMgr:OverrideBrightness", std::move(task)); } @@ -6367,7 +6369,7 @@ WSError SceneSessionManager::UpdateBrightness(int32_t persistentId) if (std::fabs(brightness - UNDEFINED_BRIGHTNESS) < std::numeric_limits::min()) { if (IsNeedUpdateBrightness(persistentId, brightness)) { auto task = [this, where = __func__] { - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "%{public}s adjust brightness with default value", where); + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s restore value", where); DisplayPowerMgr::DisplayPowerMgrClient::GetInstance().RestoreBrightness(); SetDisplayBrightness(UNDEFINED_BRIGHTNESS); // UNDEFINED_BRIGHTNESS means system default brightness }; @@ -6377,7 +6379,7 @@ WSError SceneSessionManager::UpdateBrightness(int32_t persistentId) } else { if (std::fabs(brightness - GetDisplayBrightness()) > std::numeric_limits::min()) { auto task = [this, where = __func__, brightness] { - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "%{public}s adjust brightness with value", where); + TLOGNW(WmsLogTag::WMS_ATTRIBUTE, "%{public}s override value: %{public}f", where, brightness); DisplayPowerMgr::DisplayPowerMgrClient::GetInstance().OverrideBrightness( static_cast(brightness * MAX_BRIGHTNESS)); SetDisplayBrightness(brightness); diff --git a/wm/src/window_scene_session_impl.cpp b/wm/src/window_scene_session_impl.cpp index 7790ddb8cf..a1713764ae 100644 --- a/wm/src/window_scene_session_impl.cpp +++ b/wm/src/window_scene_session_impl.cpp @@ -6151,7 +6151,7 @@ WSError WindowSceneSessionImpl::UpdateDisplayId(DisplayId displayId) property_->SetDisplayId(displayId); NotifyDisplayInfoChange(); if (displayIdChanged) { - TLOGI(WmsLogTag::WMS_ATTRIBUTE, "wid: %{public}d, displayId: %{public}" PRIu64, GetPersistentId(), displayId); + TLOGW(WmsLogTag::WMS_ATTRIBUTE, "wid: %{public}d, displayId: %{public}" PRIu64, GetPersistentId(), displayId); NotifyDisplayIdChange(displayId); } return WSError::WS_OK; -- Gitee