From 6f8eb279703f44c00131d33dd221fd84f0efe2fb Mon Sep 17 00:00:00 2001 From: koroltang Date: Thu, 22 Aug 2024 21:45:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=AD=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97=E6=97=A5=E5=BF=97?= =?UTF-8?q?tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: koroltang --- .../kits/napi/window_runtime/window_napi/js_window.cpp | 10 +++++----- utils/include/window_manager_hilog.h | 2 ++ .../napi/scene_session_manager/js_scene_session.cpp | 10 +++++----- window_scene/session/host/src/main_session.cpp | 6 +++--- window_scene/session/host/src/scene_session.cpp | 2 +- window_scene/session_manager/src/anomaly_detection.cpp | 10 +++++----- .../session_manager/src/scene_session_manager.cpp | 2 +- wm/src/window_session_impl.cpp | 2 +- 8 files changed, 23 insertions(+), 21 deletions(-) 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 b352bbc3f6..737cc658b9 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp @@ -459,7 +459,7 @@ napi_value JsWindow::SetWindowFocusable(napi_env env, napi_callback_info info) /** @note @window.hierarchy */ napi_value JsWindow::SetTopmost(napi_env env, napi_callback_info info) { - TLOGI(WmsLogTag::WMS_LAYOUT, "SetTopmost"); + TLOGI(WmsLogTag::WMS_HIERARCHY, "SetTopmost"); JsWindow* me = CheckParamsAndGetThis(env, info); return (me != nullptr) ? me->OnSetTopmost(env, info) : nullptr; } @@ -3469,14 +3469,14 @@ napi_value JsWindow::OnSetWindowFocusable(napi_env env, napi_callback_info info) napi_value JsWindow::OnSetTopmost(napi_env env, napi_callback_info info) { if (!Permission::IsSystemCalling()) { - TLOGE(WmsLogTag::WMS_LAYOUT, "[NAPI]SetTopmost permission denied!"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "[NAPI]SetTopmost permission denied!"); return NapiThrowError(env, WmErrorCode::WM_ERROR_NOT_SYSTEM_APP); } if (windowToken_ == nullptr) { return NapiThrowError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } if (!WindowHelper::IsMainWindow(windowToken_->GetType())) { - TLOGE(WmsLogTag::WMS_LAYOUT, "[NAPI]SetTopmost is not allowed since window is not main window"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "[NAPI]SetTopmost is not allowed since window is not main window"); return NapiThrowError(env, WmErrorCode::WM_ERROR_INVALID_CALLING); } @@ -3484,7 +3484,7 @@ napi_value JsWindow::OnSetTopmost(napi_env env, napi_callback_info info) napi_value argv[4] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc != 1 || argv[0] == nullptr) { - TLOGE(WmsLogTag::WMS_LAYOUT, "Argc is invalid: %{public}zu. Failed to convert parameter to topmost", argc); + TLOGE(WmsLogTag::WMS_HIERARCHY, "Argc is invalid: %{public}zu. Failed to convert parameter to topmost", argc); return NapiThrowError(env, WmErrorCode::WM_ERROR_INVALID_PARAM); } bool topmost = false; @@ -3502,7 +3502,7 @@ napi_value JsWindow::OnSetTopmost(napi_env env, napi_callback_info info) return; } *errCodePtr = WM_JS_TO_ERROR_CODE_MAP.at(window->SetTopmost(topmost)); - TLOGI(WmsLogTag::WMS_LAYOUT, "Window [%{public}u, %{public}s] set topmost end", + TLOGI(WmsLogTag::WMS_HIERARCHY, "Window [%{public}u, %{public}s] set topmost end", window->GetWindowId(), window->GetWindowName().c_str()); }; NapiAsyncTask::CompleteCallback complete = diff --git a/utils/include/window_manager_hilog.h b/utils/include/window_manager_hilog.h index b82216aa31..af14767921 100644 --- a/utils/include/window_manager_hilog.h +++ b/utils/include/window_manager_hilog.h @@ -59,6 +59,7 @@ enum class WmsLogTag : uint8_t { WMS_MULTI_WINDOW, // C04212 WMS_INPUT_KEY_FLOW, // C04213 WMS_PIPELINE, // C04214 + WMS_HIERARCHY, // C04215 END = 256, // Last one, do not use }; @@ -84,6 +85,7 @@ const std::unordered_map DOMAIN_CONTENTS_MAP = { { WmsLogTag::WMS_MULTI_WINDOW, "WMSMultiWindow" }, { WmsLogTag::WMS_INPUT_KEY_FLOW, "InputKeyFlow" }, { WmsLogTag::WMS_PIPELINE, "WMSPipeLine" }, + { WmsLogTag::WMS_HIERARCHY, "WMS_Hierarchy" }, }; #ifdef IS_RELEASE_VERSION #define WMS_FILE_NAME "" diff --git a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp index 449786a8ac..7313a4d96a 100644 --- a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp +++ b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp @@ -925,7 +925,7 @@ void JsSceneSession::ProcessSessionTopmostChangeRegister() { auto sessionchangeCallback = sessionchangeCallback_.promote(); if (sessionchangeCallback == nullptr) { - TLOGE(WmsLogTag::WMS_LAYOUT, "sessionchangeCallback is nullptr"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "sessionchangeCallback is nullptr"); return; } sessionchangeCallback->onSessionTopmostChange_ = [this](bool topmost) { @@ -933,11 +933,11 @@ void JsSceneSession::ProcessSessionTopmostChangeRegister() }; auto session = weakSession_.promote(); if (session == nullptr) { - TLOGE(WmsLogTag::WMS_LAYOUT, "session is nullptr, id:%{public}d", persistentId_); + TLOGE(WmsLogTag::WMS_HIERARCHY, "session is nullptr, id:%{public}d", persistentId_); return; } sessionchangeCallback->onSessionTopmostChange_(session->IsTopmost()); - TLOGD(WmsLogTag::WMS_LAYOUT, "ProcessSessionTopmostChangeRegister success"); + TLOGD(WmsLogTag::WMS_HIERARCHY, "ProcessSessionTopmostChangeRegister success"); } void JsSceneSession::ProcessSessionFocusableChangeRegister() @@ -2307,7 +2307,7 @@ void JsSceneSession::OnSessionTouchableChange(bool touchable) /** @note @window.hierarchy */ void JsSceneSession::OnSessionTopmostChange(bool topmost) { - TLOGI(WmsLogTag::WMS_LAYOUT, "[NAPI]State: %{public}u", topmost); + TLOGI(WmsLogTag::WMS_HIERARCHY, "[NAPI]State: %{public}u", topmost); auto task = [this, persistentId = persistentId_, topmost, env = env_] { if (jsSceneSessionMap_.find(persistentId) == jsSceneSessionMap_.end()) { TLOGE(WmsLogTag::WMS_LIFE, "OnSessionTopmostChange jsSceneSession id:%{public}d has been destroyed", @@ -2316,7 +2316,7 @@ void JsSceneSession::OnSessionTopmostChange(bool topmost) } auto jsCallBack = this->GetJSCallback(SESSION_TOP_MOST_CHANGE_CB); if (!jsCallBack) { - TLOGE(WmsLogTag::WMS_LAYOUT, "[NAPI]jsCallBack is nullptr"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "[NAPI]jsCallBack is nullptr"); return; } napi_value jsSessionTouchableObj = CreateJsValue(env, topmost); diff --git a/window_scene/session/host/src/main_session.cpp b/window_scene/session/host/src/main_session.cpp index 52a4d1eaa5..d13b85e4d8 100644 --- a/window_scene/session/host/src/main_session.cpp +++ b/window_scene/session/host/src/main_session.cpp @@ -159,16 +159,16 @@ bool MainSession::CheckPointerEventDispatch(const std::shared_ptrGetSessionProperty(); if (property) { - TLOGI(WmsLogTag::WMS_LAYOUT, "Notify session topmost change, id: %{public}d, topmost: %{public}u", + TLOGI(WmsLogTag::WMS_HIERARCHY, "Notify session topmost change, id: %{public}d, topmost: %{public}u", session->GetPersistentId(), topmost); property->SetTopmost(topmost); if (session->sessionChangeCallback_ && session->sessionChangeCallback_->onSessionTopmostChange_) { diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp index 358a5b9688..bda19c99f6 100644 --- a/window_scene/session/host/src/scene_session.cpp +++ b/window_scene/session/host/src/scene_session.cpp @@ -1069,7 +1069,7 @@ WSError SceneSession::RaiseAboveTarget(int32_t subWindowId) }); int32_t callingPid = IPCSkeleton::GetCallingPid(); if (subSession != subSession_.end() && callingPid != (*subSession)->GetCallingPid()) { - TLOGE(WmsLogTag::WMS_LAYOUT, "permission denied! id: %{public}d", subWindowId); + TLOGE(WmsLogTag::WMS_HIERARCHY, "permission denied! id: %{public}d", subWindowId); return WSError::WS_ERROR_INVALID_CALLING; } auto task = [weakThis = wptr(this), subWindowId]() { diff --git a/window_scene/session_manager/src/anomaly_detection.cpp b/window_scene/session_manager/src/anomaly_detection.cpp index 6ea34b68b3..7826c85a24 100644 --- a/window_scene/session_manager/src/anomaly_detection.cpp +++ b/window_scene/session_manager/src/anomaly_detection.cpp @@ -37,12 +37,12 @@ void AnomalyDetection::SceneZOrderCheckProcess() } // check zorder = 0 if (session->GetZOrder() == 0) { - TLOGE(WmsLogTag::WMS_FOCUS, "ZOrderCheck err, zorder 0"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "ZOrderCheck err, zorder 0"); ReportZOrderException("check zorder 0", session); } // repetitive zorder if (session->GetZOrder() == curZOrder) { - TLOGE(WmsLogTag::WMS_FOCUS, "ZOrderCheck err, repetitive zorder %{public}d", session->GetZOrder()); + TLOGE(WmsLogTag::WMS_HIERARCHY, "ZOrderCheck err, repetitive zorder %{public}d", session->GetZOrder()); ReportZOrderException("check repetitive zorder", session); } curZOrder = session->GetZOrder(); @@ -52,7 +52,7 @@ void AnomalyDetection::SceneZOrderCheckProcess() const auto& callingSession = SceneSessionManager::GetInstance().GetSceneSession(static_cast(callingWindowId)); if ((callingSession != nullptr) && (callingSession->GetZOrder() > session->GetZOrder())) { - TLOGE(WmsLogTag::WMS_FOCUS, "ZOrderCheck err, callingSession: %{public}d curSession: %{public}d", + TLOGE(WmsLogTag::WMS_HIERARCHY, "ZOrderCheck err, callingSession: %{public}d curSession: %{public}d", callingSession->GetZOrder(), session->GetZOrder()); ReportZOrderException("check callingSession check for input", session); } @@ -62,7 +62,7 @@ void AnomalyDetection::SceneZOrderCheckProcess() session->GetWindowType() == WindowType::WINDOW_TYPE_DIALOG) { auto mainSession = session->GetParentSession(); if ((mainSession != nullptr) && (session->GetZOrder() < mainSession->GetZOrder())) { - TLOGE(WmsLogTag::WMS_FOCUS, "ZOrderCheck err, subSession %{public}d mainSession %{public}d", + TLOGE(WmsLogTag::WMS_HIERARCHY, "ZOrderCheck err, subSession %{public}d mainSession %{public}d", session->GetZOrder(), mainSession->GetZOrder()); ReportZOrderException("check subWindow and dialogWindow", session); } @@ -72,7 +72,7 @@ void AnomalyDetection::SceneZOrderCheckProcess() return false; } if (keyGuardFlag && (!session->IsShowWhenLocked()) && (session->IsAppSession())) { - TLOGE(WmsLogTag::WMS_FOCUS, "ZOrderCheck err %{public}d IsShowWhenLocked", session->GetZOrder()); + TLOGE(WmsLogTag::WMS_HIERARCHY, "ZOrderCheck err %{public}d IsShowWhenLocked", session->GetZOrder()); ReportZOrderException("check isShowWhenLocked", session); } return false; diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index bbdb432345..b637e9b4f6 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -3471,7 +3471,7 @@ WMError SceneSessionManager::UpdateTopmostProperty(const sptr& sceneSession) { if (!SessionPermission::IsSystemCalling()) { - TLOGE(WmsLogTag::WMS_LAYOUT, "UpdateTopmostProperty permission denied!"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "UpdateTopmostProperty permission denied!"); return WMError::WM_ERROR_NOT_SYSTEM_APP; } diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index e74d82dae4..80d44dbdb8 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -1338,7 +1338,7 @@ WMError WindowSessionImpl::SetTouchable(bool isTouchable) /** @note @window.hierarchy */ WMError WindowSessionImpl::SetTopmost(bool topmost) { - TLOGD(WmsLogTag::WMS_LAYOUT, "%{public}d", topmost); + TLOGD(WmsLogTag::WMS_HIERARCHY, "%{public}d", topmost); if (!windowSystemConfig_.IsPcWindow()) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } -- Gitee From 1082d4ccfd5d2ec8c9a8be576106019d7e2f062d Mon Sep 17 00:00:00 2001 From: koroltang Date: Fri, 23 Aug 2024 10:34:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=83=A8=E5=88=86api?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=97=A5=E5=BF=97tag=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: koroltang --- interfaces/kits/cj/window_runtime/window_impl.cpp | 4 ++-- interfaces/kits/cj/window_runtime/window_manager_impl.cpp | 6 +++--- interfaces/kits/cj/window_runtime/window_stage_impl.cpp | 6 +++--- .../kits/napi/scene_session_manager/js_scene_session.cpp | 6 +++--- window_scene/session/host/src/scene_session.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/interfaces/kits/cj/window_runtime/window_impl.cpp b/interfaces/kits/cj/window_runtime/window_impl.cpp index fc7d64b158..7a73d65aca 100644 --- a/interfaces/kits/cj/window_runtime/window_impl.cpp +++ b/interfaces/kits/cj/window_runtime/window_impl.cpp @@ -749,7 +749,7 @@ int32_t CJWindowImpl::RaiseToAppTop() } sptr weakWindow = result.nativeWindow; WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(weakWindow->RaiseToAppTop()); - TLOGI(WmsLogTag::WMS_DIALOG, "Window [%{public}u, %{public}s] zorder raise success", + TLOGI(WmsLogTag::WMS_HIERARCHY, "Window [%{public}u, %{public}s] zorder raise success", weakWindow->GetWindowId(), weakWindow->GetWindowName().c_str()); return static_cast(ret); } @@ -806,7 +806,7 @@ int32_t CJWindowImpl::SetRaiseByClickEnabled(bool enable) } sptr weakWindow = result.nativeWindow; WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(weakWindow->SetRaiseByClickEnabled(enable)); - TLOGI(WmsLogTag::WMS_DIALOG, "Window [%{public}u, %{public}s] set raiseEnabled end", + TLOGI(WmsLogTag::WMS_HIERARCHY, "Window [%{public}u, %{public}s] set raiseEnabled end", weakWindow->GetWindowId(), weakWindow->GetWindowName().c_str()); return static_cast(ret); } diff --git a/interfaces/kits/cj/window_runtime/window_manager_impl.cpp b/interfaces/kits/cj/window_runtime/window_manager_impl.cpp index 8bb9c75b43..8c842f93ba 100644 --- a/interfaces/kits/cj/window_runtime/window_manager_impl.cpp +++ b/interfaces/kits/cj/window_runtime/window_manager_impl.cpp @@ -148,18 +148,18 @@ int32_t WindowManagerImpl::GetLastWindow(OHOS::AbilityRuntime::Context* ctx, int { sptr window = nullptr; if (ctx == nullptr) { - TLOGE(WmsLogTag::WMS_SUB, "[WindowManager]Stage mode without context"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "[WindowManager]Stage mode without context"); return static_cast(WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } auto sctx = ctx->shared_from_this(); auto context = std::weak_ptr(sctx); if (sctx == nullptr) { - TLOGE(WmsLogTag::WMS_SUB, "[WindowManager]Stage mode without context"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "[WindowManager]Stage mode without context"); return static_cast(WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } window = Window::GetTopWindowWithContext(context.lock()); if (window == nullptr) { - TLOGE(WmsLogTag::WMS_SUB, "[WindowManager]Get top window failed"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "[WindowManager]Get top window failed"); return static_cast(WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } return FindWindow(window->GetWindowName(), id); diff --git a/interfaces/kits/cj/window_runtime/window_stage_impl.cpp b/interfaces/kits/cj/window_runtime/window_stage_impl.cpp index e3079b26f8..93aeaae4cd 100644 --- a/interfaces/kits/cj/window_runtime/window_stage_impl.cpp +++ b/interfaces/kits/cj/window_runtime/window_stage_impl.cpp @@ -159,12 +159,12 @@ int32_t CJWindowStageImpl::DisableWindowDecor() int32_t CJWindowStageImpl::SetShowOnLockScreen(bool showOnLockScreen) { if (!Permission::IsSystemCalling() && !Permission::IsStartByHdcd()) { - TLOGE(WmsLogTag::WMS_DIALOG, "Set show on lock screen permission denied!"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "Set show on lock screen permission denied!"); return static_cast(WmErrorCode::WM_ERROR_NOT_SYSTEM_APP); } auto weakScene = windowScene_.lock(); if (weakScene == nullptr || weakScene->GetMainWindow() == nullptr) { - TLOGE(WmsLogTag::WMS_DIALOG, "[WindowStage] WindowScene is null or window is null"); + TLOGE(WmsLogTag::WMS_HIERARCHY, "[WindowStage] WindowScene is null or window is null"); return static_cast(WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } auto window = weakScene->GetMainWindow(); @@ -176,7 +176,7 @@ int32_t CJWindowStageImpl::SetShowOnLockScreen(bool showOnLockScreen) ret = WM_JS_TO_ERROR_CODE_MAP.at( window->RemoveWindowFlag(WindowFlag::WINDOW_FLAG_SHOW_WHEN_LOCKED)); } - TLOGI(WmsLogTag::WMS_DIALOG, + TLOGI(WmsLogTag::WMS_HIERARCHY, "[WindowStage] Window [%{public}u, %{public}s] SetShowOnLockScreen %{public}u, ret = %{public}u", window->GetWindowId(), window->GetWindowName().c_str(), showOnLockScreen, ret); return static_cast(ret); diff --git a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp index 7313a4d96a..a25add9f4d 100644 --- a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp +++ b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp @@ -2179,7 +2179,7 @@ void JsSceneSession::OnRaiseToTop() auto task = [this, persistentId = persistentId_, env = env_] { if (jsSceneSessionMap_.find(persistentId) == jsSceneSessionMap_.end()) { - TLOGE(WmsLogTag::WMS_LIFE, "OnRaiseToTop jsSceneSession id:%{public}d has been destroyed", + TLOGE(WmsLogTag::WMS_HIERARCHY, "OnRaiseToTop jsSceneSession id:%{public}d has been destroyed", persistentId); return; } @@ -2201,7 +2201,7 @@ void JsSceneSession::OnRaiseToTopForPointDown() auto task = [this, persistentId = persistentId_, env = env_] { if (jsSceneSessionMap_.find(persistentId) == jsSceneSessionMap_.end()) { - TLOGE(WmsLogTag::WMS_LIFE, "OnRaiseToTopForPointDown jsSceneSession id:%{public}d has been destroyed", + TLOGE(WmsLogTag::WMS_HIERARCHY, "OnRaiseToTopForPointDown jsSceneSession id:%{public}d has been destroyed", persistentId); return; } @@ -2310,7 +2310,7 @@ void JsSceneSession::OnSessionTopmostChange(bool topmost) TLOGI(WmsLogTag::WMS_HIERARCHY, "[NAPI]State: %{public}u", topmost); auto task = [this, persistentId = persistentId_, topmost, env = env_] { if (jsSceneSessionMap_.find(persistentId) == jsSceneSessionMap_.end()) { - TLOGE(WmsLogTag::WMS_LIFE, "OnSessionTopmostChange jsSceneSession id:%{public}d has been destroyed", + TLOGE(WmsLogTag::WMS_HIERARCHY, "OnSessionTopmostChange jsSceneSession id:%{public}d has been destroyed", persistentId); return; } diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp index bda19c99f6..f39f138712 100644 --- a/window_scene/session/host/src/scene_session.cpp +++ b/window_scene/session/host/src/scene_session.cpp @@ -1047,7 +1047,7 @@ WSError SceneSession::RaiseToAppTop() return WSError::WS_ERROR_DESTROYED_OBJECT; } if (session->sessionChangeCallback_ && session->sessionChangeCallback_->onRaiseToTop_) { - TLOGI(WmsLogTag::WMS_SUB, "id: %{public}d", session->GetPersistentId()); + TLOGI(WmsLogTag::WMS_HIERARCHY, "id: %{public}d", session->GetPersistentId()); session->sessionChangeCallback_->onRaiseToTop_(); session->SetMainSessionUIStateDirty(true); } -- Gitee From 7d7aac12699480e4617d99b42c33e97f85676d3f Mon Sep 17 00:00:00 2001 From: tangkun Date: Mon, 2 Sep 2024 19:20:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=82=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangkun --- utils/include/window_manager_hilog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/include/window_manager_hilog.h b/utils/include/window_manager_hilog.h index af14767921..7f5a8ed441 100644 --- a/utils/include/window_manager_hilog.h +++ b/utils/include/window_manager_hilog.h @@ -85,7 +85,7 @@ const std::unordered_map DOMAIN_CONTENTS_MAP = { { WmsLogTag::WMS_MULTI_WINDOW, "WMSMultiWindow" }, { WmsLogTag::WMS_INPUT_KEY_FLOW, "InputKeyFlow" }, { WmsLogTag::WMS_PIPELINE, "WMSPipeLine" }, - { WmsLogTag::WMS_HIERARCHY, "WMS_Hierarchy" }, + { WmsLogTag::WMS_HIERARCHY, "WMSHierarchy" }, }; #ifdef IS_RELEASE_VERSION #define WMS_FILE_NAME "" -- Gitee