diff --git a/adapter/ohos/entrance/ace_container.cpp b/adapter/ohos/entrance/ace_container.cpp index fe99bdb9f65e561b4214eae809ed40e7e6d942f6..a7339c1d9b9cb08c509b95fbc24c3d76d09b9abc 100644 --- a/adapter/ohos/entrance/ace_container.cpp +++ b/adapter/ohos/entrance/ace_container.cpp @@ -1301,14 +1301,7 @@ void AceContainer::InitializeCallback() RES_TYPE_CROWN_ROTATION_STATUS, static_cast(event.action), mapPayload); } ContainerScope scope(id); - bool result = false; - auto crownTask = [context, event, &result, markProcess, id]() { - ContainerScope scope(id); - result = context->OnNonPointerEvent(event); - CHECK_NULL_VOID(markProcess); - markProcess(); - }; - auto asyncCrownTask = [context, event, markProcess, id]() { + auto crownTask = [context, event, markProcess, id]() { ContainerScope scope(id); context->OnNonPointerEvent(event); CHECK_NULL_VOID(markProcess); @@ -1317,11 +1310,10 @@ void AceContainer::InitializeCallback() auto uiTaskRunner = SingleTaskExecutor::Make(context->GetTaskExecutor(), TaskExecutor::TaskType::UI); if (uiTaskRunner.IsRunOnCurrentThread()) { crownTask(); - return result; + return; } context->GetTaskExecutor()->PostTask( - asyncCrownTask, TaskExecutor::TaskType::UI, "ArkUIAceContainerCrownEvent", PriorityType::VIP); - return result; + crownTask, TaskExecutor::TaskType::UI, "ArkUIAceContainerCrownEvent", PriorityType::VIP); }; aceView_->RegisterCrownEventCallback(crownEventCallback); diff --git a/adapter/ohos/entrance/ace_view_ohos.cpp b/adapter/ohos/entrance/ace_view_ohos.cpp index 3671409ac93afb2687b3d5c6b6e733338a0268bf..4490a5d876cda8fb86073e54a90c23a43f3edbcd 100644 --- a/adapter/ohos/entrance/ace_view_ohos.cpp +++ b/adapter/ohos/entrance/ace_view_ohos.cpp @@ -553,7 +553,7 @@ bool AceViewOhos::ProcessFocusAxisEvent(const std::shared_ptr return nonPointerEventCallback_(event, std::move(markProcess)); } -bool AceViewOhos::ProcessDigitalCrownEvent(const std::shared_ptr& pointerEvent, +void AceViewOhos::ProcessDigitalCrownEvent(const std::shared_ptr& pointerEvent, bool isInjected) { CrownEvent event; @@ -567,8 +567,8 @@ bool AceViewOhos::ProcessDigitalCrownEvent(const std::shared_ptr(event.timeStamp.time_since_epoch()).count(), enabled); }; - CHECK_NULL_RETURN(crownEventCallback_, false); - return crownEventCallback_(event, markProcess); + CHECK_NULL_VOID(crownEventCallback_); + crownEventCallback_(event, markProcess); } const void* AceViewOhos::GetNativeWindowById(uint64_t textureId) diff --git a/adapter/ohos/entrance/ace_view_ohos.h b/adapter/ohos/entrance/ace_view_ohos.h index 5fde77b5e5838fa320610757fa0d2491a84e2549..a39ad9511c24c28f929fb681a55e670223980c6c 100644 --- a/adapter/ohos/entrance/ace_view_ohos.h +++ b/adapter/ohos/entrance/ace_view_ohos.h @@ -93,7 +93,7 @@ public: bool ProcessFocusAxisEvent(const std::shared_ptr& pointerEvent); - bool ProcessDigitalCrownEvent(const std::shared_ptr& pointerEvent, + void ProcessDigitalCrownEvent(const std::shared_ptr& pointerEvent, bool isInjected = false); bool ProcessRotationEvent(float rotationValue); diff --git a/adapter/preview/entrance/ace_container.cpp b/adapter/preview/entrance/ace_container.cpp index b9fe060e0069351438f3f3695bed61052c90b1c4..d13846c94972ddefff6d4a6a554ac1c41ddf7cfa 100644 --- a/adapter/preview/entrance/ace_container.cpp +++ b/adapter/preview/entrance/ace_container.cpp @@ -389,7 +389,7 @@ void AceContainer::InitializeCallback() ContainerScope scope(id); auto context = weak.Upgrade(); if (context == nullptr) { - return false; + return; } context->GetTaskExecutor()->PostTask( [context, event, id]() { @@ -397,7 +397,6 @@ void AceContainer::InitializeCallback() context->OnNonPointerEvent(event); }, TaskExecutor::TaskType::UI, "ArkUIAceContainerCrownEvent"); - return true; }; aceView_->RegisterCrownEventCallback(crownEventCallback); diff --git a/frameworks/core/common/container.h b/frameworks/core/common/container.h index 401afe21f515512f5921e965225a306c3df111be..40ae3bece7fee2513bb090b11f2b70a5e50ec7b1 100755 --- a/frameworks/core/common/container.h +++ b/frameworks/core/common/container.h @@ -70,7 +70,7 @@ using CardViewPositionCallBack = std::function&)>; using StopDragCallback = std::function; -using CrownEventCallback = std::function&)>; +using CrownEventCallback = std::function&)>; class PipelineBase;