diff --git a/adapter/ohos/osal/js_accessibility_manager.cpp b/adapter/ohos/osal/js_accessibility_manager.cpp index b3bad14f379d7473a0eede2a464e9fd43be4faa0..41a21aba9096b71790e9a8529421b932610236e3 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 17b1d6a3e9da633170f8dd9df7dfb46a08b23bfb..98efad52c4a70efe1fa7e0883f62941683b9310b 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));