From 330f3bd0c39154ae386388595eff147818bc9e80 Mon Sep 17 00:00:00 2001
From: xiahaiqin <xiahaiqin1@huawei.com>
Date: Tue, 12 Jul 2022 19:27:06 +0800
Subject: [PATCH] adapt window mofidy for input listener

Signed-off-by: xiahaiqin <xiahaiqin1@huawei.com>
Change-Id: Iac068c04bcb557fd2b983b8cbe67eab1e4d24dce
---
 .../include/screen_client_window_adapter.h          | 13 ++++++++-----
 .../src/screen_client_window_adapter.cpp            | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/services/screenclient/include/screen_client_window_adapter.h b/services/screenclient/include/screen_client_window_adapter.h
index 9b68277e..5b90b54d 100644
--- a/services/screenclient/include/screen_client_window_adapter.h
+++ b/services/screenclient/include/screen_client_window_adapter.h
@@ -22,7 +22,9 @@
 #include <memory>
 #include <refbase.h>
 
-#include "i_input_event_consumer.h"
+#include "axis_event.h"
+#include "key_event.h"
+#include "pointer_event.h"
 #include "single_instance.h"
 #include "surface.h"
 #include "window.h"
@@ -47,12 +49,13 @@ private:
     std::mutex windowIdMapMutex_;
 };
 
-class ScreenClientInputEventListener : public MMI::IInputEventConsumer {
+class ScreenClientInputEventListener : public Rosen::IInputEventConsumer {
 public:
     ScreenClientInputEventListener() = default;
-    void OnInputEvent(std::shared_ptr<MMI::PointerEvent> pointerEvent) const override;
-    void OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) const override;
-    void OnInputEvent(std::shared_ptr<MMI::AxisEvent> axisEvent) const override;
+    ~ScreenClientInputEventListener() override = default;
+    bool OnInputEvent(const std::shared_ptr<MMI::PointerEvent>& pointerEvent) const override;
+    bool OnInputEvent(const std::shared_ptr<MMI::KeyEvent>& keyEvent) const override;
+    bool OnInputEvent(const std::shared_ptr<MMI::AxisEvent>& axisEvent) const override;
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/screenclient/src/screen_client_window_adapter.cpp b/services/screenclient/src/screen_client_window_adapter.cpp
index 8b61b2f6..3c57930f 100644
--- a/services/screenclient/src/screen_client_window_adapter.cpp
+++ b/services/screenclient/src/screen_client_window_adapter.cpp
@@ -72,9 +72,9 @@ sptr<Surface> ScreenClientWindowAdapter::CreateWindow(std::shared_ptr<WindowProp
         DHLOGE("surface is nullptr");
         return nullptr;
     }
-    std::shared_ptr<MMI::IInputEventConsumer> listener =
+    std::shared_ptr<Rosen::IInputEventConsumer> listener =
         std::make_shared<ScreenClientInputEventListener>(ScreenClientInputEventListener());
-    window->AddInputEventListener(listener);
+    window->SetInputEventConsumer(listener);
     DHLOGD("Create window name is %s.", windowName.c_str());
     if (OHOS::Rosen::WMError::WM_OK != window->Resize(windowProperty->width, windowProperty->height)) {
         window->Destroy();
@@ -195,22 +195,25 @@ int32_t ScreenClientWindowAdapter::RemoveWindow(int32_t windowId)
     return DH_SUCCESS;
 }
 
-void ScreenClientInputEventListener::OnInputEvent(std::shared_ptr<MMI::PointerEvent> pointerEvent) const
+bool ScreenClientInputEventListener::OnInputEvent(const std::shared_ptr<MMI::PointerEvent>& pointerEvent) const
 {
     DHLOGI("onInputEvent, pointerEvent");
     pointerEvent->MarkProcessed();
+    return true;
 }
 
-void ScreenClientInputEventListener::OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) const
+bool ScreenClientInputEventListener::OnInputEvent(const std::shared_ptr<MMI::KeyEvent>& keyEvent) const
 {
     DHLOGI("onInputEvent, keyEvent");
     keyEvent->MarkProcessed();
+    return true;
 }
 
-void ScreenClientInputEventListener::OnInputEvent(std::shared_ptr<MMI::AxisEvent> axisEvent) const
+bool ScreenClientInputEventListener::OnInputEvent(const std::shared_ptr<MMI::AxisEvent>& axisEvent) const
 {
     DHLOGI("onInputEvent, axisEvent");
     axisEvent->MarkProcessed();
+    return true;
 }
 } // namespace DistributedHardware
 } // namespace OHOS
\ No newline at end of file
-- 
Gitee