openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 09:12:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!44683 多态样式以及焦点日志整改

Browse Source 
Merge pull request !44683 from 潜秋宏/0927
This commit is contained in:
openharmony_ci 2024-10-08 08:21:15 +00:00 committed by Gitee
commit 25b58e9020
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frameworks/core/components_ng/event/focus_hub.cpp
View File

@ -353,11 +353,11 @@ void FocusHub::LostFocusToViewRoot()
CHECK_NULL_VOID(curFocusView);
auto viewRootScope = curFocusView->GetViewRootScope();
CHECK_NULL_VOID(viewRootScope);
TAG_LOGI(AceLogTag::ACE_FOCUS, "Lost focus to view root: %{public}s/%{public}d",
viewRootScope->GetFrameName().c_str(), viewRootScope->GetFrameId());
TAG_LOGI(AceLogTag::ACE_FOCUS, "Lost focus to view root: %{public}s",
viewRootScope->GetFrameName().c_str());
if (!viewRootScope->IsCurrentFocus()) {
TAG_LOGI(AceLogTag::ACE_FOCUS, "View root: %{public}s/%{public}d is not on focusing.",
viewRootScope->GetFrameName().c_str(), viewRootScope->GetFrameId());
TAG_LOGI(AceLogTag::ACE_FOCUS, "View root: %{public}s is not on focusing.",
viewRootScope->GetFrameName().c_str());
return;
}
curFocusView->SetIsViewRootScopeFocused(true);
@ -2131,7 +2131,11 @@ bool FocusHub::RequestFocusImmediatelyById(const std::string& id, bool isSyncReq
CHECK_NULL_RETURN(focusManager, false);
auto focusNode = GetChildFocusNodeById(id);
if (!focusNode) {
#ifdef IS_RELEASE_VERSION
TAG_LOGI(AceLogTag::ACE_FOCUS, "Request focus id can not found.");
#else
TAG_LOGI(AceLogTag::ACE_FOCUS, "Request focus id: %{public}s can not found.", id.c_str());
#endif
focusManager->TriggerRequestFocusCallback(RequestFocusResult::NON_EXIST);
return false;
}
@ -2140,9 +2144,15 @@ bool FocusHub::RequestFocusImmediatelyById(const std::string& id, bool isSyncReq
(!isSyncRequest && !focusNode->IsFocusable())) {
result = false;
}
#ifdef IS_RELEASE_VERSION
TAG_LOGI(AceLogTag::ACE_FOCUS,
"Request focus immediately %{public}s by id: %{public}s. The node is %{public}s/%{public}d.",
isSyncRequest ? "sync" : "async", id.c_str(), focusNode->GetFrameName().c_str(), focusNode->GetFrameId());
#else
TAG_LOGI(AceLogTag::ACE_FOCUS,
"Request focus immediately %{public}s by id. The node is %{public}s/%{public}d.",
isSyncRequest ? "sync" : "async", focusNode->GetFrameName().c_str(), focusNode->GetFrameId());
#endif
if (result || !isSyncRequest) {
pipeline->AddDirtyRequestFocus(focusNode->GetFrameNode());
if (isSyncRequest) {

18
frameworks/core/components_ng/event/state_style_manager.cpp
View File

@ -65,8 +65,8 @@ const RefPtr<TouchEventImpl>& StateStyleManager::GetPressedListener()
int32_t sourceType = static_cast<int32_t>(touches.front().GetSourceDevice());
if (stateStyleMgr->IsOutOfPressedRegion(sourceType, lastPoint.GetGlobalLocation())) {
auto frameNode = stateStyleMgr->GetFrameNode();
TAG_LOGI(AceLogTag::ACE_STATE_STYLE, "Move out of node pressed region: %{public}s/%{public}d",
frameNode->GetTag().c_str(), frameNode->GetId());
TAG_LOGI(AceLogTag::ACE_STATE_STYLE, "Move out of node pressed region: %{public}s",
frameNode->GetTag().c_str());
stateStyleMgr->pointerId_.erase(lastPoint.GetFingerId());
if (stateStyleMgr->pointerId_.size() == 0) {
stateStyleMgr->ResetPressedState();
@ -81,8 +81,12 @@ const RefPtr<TouchEventImpl>& StateStyleManager::GetPressedListener()
void StateStyleManager::HandleTouchDown()
{
#ifdef IS_RELEASE_VERSION
TAG_LOGI(AceLogTag::ACE_STATE_STYLE, "Handle TouchDown event node: %{public}s", GetFrameNode()->GetTag().c_str());
#else
TAG_LOGI(AceLogTag::ACE_STATE_STYLE, "Handle TouchDown event node: %{public}s/%{public}d",
GetFrameNode()->GetTag().c_str(), GetFrameNode()->GetId());
#endif
HandleScrollingParent();
if (!hasScrollingParent_) {
UpdateCurrentUIState(UI_STATE_PRESSED);
@ -98,8 +102,13 @@ void StateStyleManager::HandleTouchDown()
void StateStyleManager::HandleTouchUp()
{
#ifdef IS_RELEASE_VERSION
TAG_LOGI(AceLogTag::ACE_STATE_STYLE, "Handle TouchUp or Cancel event node: %{public}s",
GetFrameNode()->GetTag().c_str());
#else
TAG_LOGI(AceLogTag::ACE_STATE_STYLE, "Handle TouchUp or Cancel event node: %{public}s/%{public}d",
GetFrameNode()->GetTag().c_str(), GetFrameNode()->GetId());
#endif
if (IsPressedStatePending()) {
DeletePressStyleTask();
ResetPressedPendingState();
@ -120,8 +129,13 @@ void StateStyleManager::FireStateFunc(bool isReset)
auto node = GetFrameNode();
CHECK_NULL_VOID(node);
auto nodeId = node->GetId();
#ifdef IS_RELEASE_VERSION
TAG_LOGI(AceLogTag::ACE_STATE_STYLE,"Start execution, node is %{public}s, "
"reset is %{public}d", node->GetTag().c_str(), isReset);
#else
TAG_LOGI(AceLogTag::ACE_STATE_STYLE, "Start execution, node is %{public}s/%{public}d, "
"reset is %{public}d", node->GetTag().c_str(), nodeId, isReset);
#endif
RefPtr<CustomNodeBase> customNode;
GetCustomNode(customNode, node);
if (!customNode) {