From d5cd70ee751db2db00faf858350a6caa1f844d42 Mon Sep 17 00:00:00 2001 From: zhanghangkai Date: Mon, 23 Jun 2025 10:44:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86=E6=97=A0?= =?UTF-8?q?=E9=9A=9C=E7=A2=8D=E5=B1=9E=E6=80=A7dump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghangkai Change-Id: I3195bb07d7098afc75ffb6582afebee39a08618f --- adapter/ohos/osal/js_accessibility_manager.cpp | 14 +++++++++++--- .../base/view_abstract_model_static.cpp | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/adapter/ohos/osal/js_accessibility_manager.cpp b/adapter/ohos/osal/js_accessibility_manager.cpp index b3bad14f379..41a21aba909 100644 --- a/adapter/ohos/osal/js_accessibility_manager.cpp +++ b/adapter/ohos/osal/js_accessibility_manager.cpp @@ -3885,6 +3885,16 @@ bool CheckAndGetEventTestArgument(std::vector::const_iterator start argument.eventId = StringUtils::StringToInt(*arg); return true; } + +void DumpFromProperty(const RefPtr& accessibilityProperty) +{ + CHECK_NULL_VOID(accessibilityProperty); + DumpLog::GetInstance().AddDesc("offset: ", accessibilityProperty->GetScrollOffSet()); + DumpLog::GetInstance().AddDesc("childTreeId: ", accessibilityProperty->GetChildTreeId()); + DumpLog::GetInstance().AddDesc("childWindowId: ", accessibilityProperty->GetChildWindowId()); + DumpLog::GetInstance().AddDesc("accessibilitySamePage: ", accessibilityProperty->GetAccessibilitySamePage()); + DumpLog::GetInstance().AddDesc("focusDrawTop: ", accessibilityProperty->GetFocusDrawLevel()); +} } // DFX related void JsAccessibilityManager::DumpTreeNG(bool useWindowId, uint32_t windowId, int64_t rootId, bool isDumpSimplify) @@ -4295,9 +4305,7 @@ void JsAccessibilityManager::DumpPropertyNG(int64_t nodeID) DumpAccessibilityPropertyNG(nodeInfo); auto accessibilityProperty = frameNode->GetAccessibilityProperty(); if (accessibilityProperty) { - DumpLog::GetInstance().AddDesc("offset: ", accessibilityProperty->GetScrollOffSet()); - DumpLog::GetInstance().AddDesc("childTreeId: ", accessibilityProperty->GetChildTreeId()); - DumpLog::GetInstance().AddDesc("childWindowId: ", accessibilityProperty->GetChildWindowId()); + DumpFromProperty(accessibilityProperty); } DumpLog::GetInstance().Print(0, nodeInfo.GetComponentType(), nodeInfo.GetChildCount()); } diff --git a/frameworks/core/components_ng/base/view_abstract_model_static.cpp b/frameworks/core/components_ng/base/view_abstract_model_static.cpp index 17b1d6a3e9d..98efad52c4a 100644 --- a/frameworks/core/components_ng/base/view_abstract_model_static.cpp +++ b/frameworks/core/components_ng/base/view_abstract_model_static.cpp @@ -659,6 +659,7 @@ void ViewAbstractModelStatic::SetAccessibilityVirtualNode(FrameNode* frameNode, void ViewAbstractModelStatic::DisableOnAccessibilityHover(FrameNode* frameNode) { + CHECK_NULL_VOID(frameNode); auto eventHub = frameNode->GetOrCreateInputEventHub(); CHECK_NULL_VOID(eventHub); eventHub->ClearUserOnAccessibilityHover(); @@ -667,6 +668,7 @@ void ViewAbstractModelStatic::DisableOnAccessibilityHover(FrameNode* frameNode) void ViewAbstractModelStatic::SetOnAccessibilityHover(FrameNode* frameNode, OnAccessibilityHoverFunc &&onAccessibilityHoverEventFunc) { + CHECK_NULL_VOID(frameNode); auto eventHub = frameNode->GetOrCreateInputEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetAccessibilityHoverEvent(std::move(onAccessibilityHoverEventFunc)); -- Gitee