From 37b3210027079e59a97aebbd0e28bff9deaf1259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=9C=E7=A7=8B=E5=AE=8F?= <qianqiuhong@h-partners.com>
Date: Tue, 24 Jun 2025 21:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=8B=E8=BD=AC=E8=A1=A8=E5=86=A0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 潜秋宏 <qianqiuhong@h-partners.com>
Change-Id: I239c51efd3abe5ff9f6d994dc1684c5a2248f053
---
 adapter/ohos/entrance/ace_container.cpp    | 14 +++-----------
 adapter/ohos/entrance/ace_view_ohos.cpp    |  6 +++---
 adapter/ohos/entrance/ace_view_ohos.h      |  2 +-
 adapter/preview/entrance/ace_container.cpp |  3 +--
 frameworks/core/common/container.h         |  2 +-
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/adapter/ohos/entrance/ace_container.cpp b/adapter/ohos/entrance/ace_container.cpp
index fe99bdb9f65..a7339c1d9b9 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<int32_t>(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 3671409ac93..4490a5d876c 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<MMI::PointerEvent>
     return nonPointerEventCallback_(event, std::move(markProcess));
 }
 
-bool AceViewOhos::ProcessDigitalCrownEvent(const std::shared_ptr<MMI::PointerEvent>& pointerEvent,
+void AceViewOhos::ProcessDigitalCrownEvent(const std::shared_ptr<MMI::PointerEvent>& pointerEvent,
     bool isInjected)
 {
     CrownEvent event;
@@ -567,8 +567,8 @@ bool AceViewOhos::ProcessDigitalCrownEvent(const std::shared_ptr<MMI::PointerEve
             std::chrono::duration_cast<std::chrono::microseconds>(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 5fde77b5e58..a39ad9511c2 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<MMI::PointerEvent>& pointerEvent);
 
-    bool ProcessDigitalCrownEvent(const std::shared_ptr<MMI::PointerEvent>& pointerEvent,
+    void ProcessDigitalCrownEvent(const std::shared_ptr<MMI::PointerEvent>& 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 b9fe060e006..d13846c9497 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 401afe21f51..40ae3bece7f 100755
--- a/frameworks/core/common/container.h
+++ b/frameworks/core/common/container.h
@@ -70,7 +70,7 @@ using CardViewPositionCallBack = std::function<void(int id, float offsetX, float
 using DragEventCallBack = std::function<void(const DragPointerEvent&, const DragEventAction&,
     const RefPtr<NG::FrameNode>&)>;
 using StopDragCallback = std::function<void()>;
-using CrownEventCallback = std::function<bool(const CrownEvent&, const std::function<void()>&)>;
+using CrownEventCallback = std::function<void(const CrownEvent&, const std::function<void()>&)>;
 
 class PipelineBase;
 
-- 
Gitee