From 698b5e39905378e6fcfe2db7d18a67e9f9e5fe13 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Wed, 24 Apr 2024 16:18:29 +0800 Subject: [PATCH 1/3] add new api Signed-off-by: hwzhangchuang --- .../include/distributed_input_handler.h | 1 + .../src/distributed_input_handler.cpp | 5 +++++ .../include/distributed_input_source_handler.h | 4 ++++ .../src/distributed_input_source_handler.cpp | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/inputdevicehandler/include/distributed_input_handler.h b/inputdevicehandler/include/distributed_input_handler.h index c41d095..3ec7e17 100644 --- a/inputdevicehandler/include/distributed_input_handler.h +++ b/inputdevicehandler/include/distributed_input_handler.h @@ -41,6 +41,7 @@ class DistributedInputHandler : public IHardwareHandler { DECLARE_SINGLE_INSTANCE_BASE(DistributedInputHandler); public: API_EXPORT int32_t Initialize() override; + API_EXPORT virtual std::vector QueryMeta() override; API_EXPORT virtual std::vector Query() override; API_EXPORT virtual std::map QueryExtraInfo() override; API_EXPORT bool IsSupportPlugin() override; diff --git a/inputdevicehandler/src/distributed_input_handler.cpp b/inputdevicehandler/src/distributed_input_handler.cpp index 3d6aa41..3beb137 100644 --- a/inputdevicehandler/src/distributed_input_handler.cpp +++ b/inputdevicehandler/src/distributed_input_handler.cpp @@ -110,6 +110,11 @@ void DistributedInputHandler::FindDevicesInfoByDhId( } } +std::vector DistributedInputHandler::QueryMeta() +{ + return {}; +} + std::vector DistributedInputHandler::Query() { std::vector retInfos; diff --git a/sourcehandler/include/distributed_input_source_handler.h b/sourcehandler/include/distributed_input_source_handler.h index c496921..de9587e 100644 --- a/sourcehandler/include/distributed_input_source_handler.h +++ b/sourcehandler/include/distributed_input_source_handler.h @@ -45,6 +45,10 @@ public: std::shared_ptr callback) override; int32_t ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) override; + void RegisterBusinessStateListener(std::shared_ptr listener) override; + void UnRegisterBusinessStateListener() override; + void RegisterDataSyncTriggerListener(std::shared_ptr listener) override; + void UnRegisterDataSyncTriggerListener() override; void FinishStartSA(const std::string ¶ms, const sptr &remoteObject); void OnRemoteSourceSvrDied(const wptr &remote); diff --git a/sourcehandler/src/distributed_input_source_handler.cpp b/sourcehandler/src/distributed_input_source_handler.cpp index 4008004..45cf95e 100644 --- a/sourcehandler/src/distributed_input_source_handler.cpp +++ b/sourcehandler/src/distributed_input_source_handler.cpp @@ -111,6 +111,24 @@ int32_t DistributedInputSourceHandler::ConfigDistributedHardware(const std::stri return DH_SUCCESS; } +void DistributedInputSourceHandler::RegisterBusinessStateListener(std::shared_ptr listener) +{ + (void)listener; +} + +void DistributedInputSourceHandler::UnRegisterBusinessStateListener() +{ +} + +void DistributedInputSourceHandler::RegisterDataSyncTriggerListener(std::shared_ptr listener) +{ + (void)listener; +} + +void DistributedInputSourceHandler::UnRegisterDataSyncTriggerListener() +{ +} + void DistributedInputSourceHandler::SALoadSourceCb::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const OHOS::sptr &remoteObject) { -- Gitee From 7d4c8e7cc1fa2cd4cbb924edccb627be73b03333 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Thu, 25 Apr 2024 11:19:32 +0800 Subject: [PATCH 2/3] modify code review Signed-off-by: hwzhangchuang --- sourcehandler/include/distributed_input_source_handler.h | 6 +++--- sourcehandler/src/distributed_input_source_handler.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sourcehandler/include/distributed_input_source_handler.h b/sourcehandler/include/distributed_input_source_handler.h index de9587e..7afa813 100644 --- a/sourcehandler/include/distributed_input_source_handler.h +++ b/sourcehandler/include/distributed_input_source_handler.h @@ -45,10 +45,10 @@ public: std::shared_ptr callback) override; int32_t ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) override; - void RegisterBusinessStateListener(std::shared_ptr listener) override; - void UnRegisterBusinessStateListener() override; + void RegisterDistributedHardwareStateListener(std::shared_ptr listener) override; + void UnregisterDistributedHardwareStateListener() override; void RegisterDataSyncTriggerListener(std::shared_ptr listener) override; - void UnRegisterDataSyncTriggerListener() override; + void UnregisterDataSyncTriggerListener() override; void FinishStartSA(const std::string ¶ms, const sptr &remoteObject); void OnRemoteSourceSvrDied(const wptr &remote); diff --git a/sourcehandler/src/distributed_input_source_handler.cpp b/sourcehandler/src/distributed_input_source_handler.cpp index 45cf95e..a414f15 100644 --- a/sourcehandler/src/distributed_input_source_handler.cpp +++ b/sourcehandler/src/distributed_input_source_handler.cpp @@ -111,12 +111,12 @@ int32_t DistributedInputSourceHandler::ConfigDistributedHardware(const std::stri return DH_SUCCESS; } -void DistributedInputSourceHandler::RegisterBusinessStateListener(std::shared_ptr listener) +void DistributedInputSourceHandler::RegisterDistributedHardwareStateListener(std::shared_ptr listener) { (void)listener; } -void DistributedInputSourceHandler::UnRegisterBusinessStateListener() +void DistributedInputSourceHandler::UnregisterDistributedHardwareStateListener() { } @@ -125,7 +125,7 @@ void DistributedInputSourceHandler::RegisterDataSyncTriggerListener(std::shared_ (void)listener; } -void DistributedInputSourceHandler::UnRegisterDataSyncTriggerListener() +void DistributedInputSourceHandler::UnregisterDataSyncTriggerListener() { } -- Gitee From 24d660e6948f28d454669956dfa15099443abc56 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Thu, 25 Apr 2024 14:05:29 +0800 Subject: [PATCH 3/3] modify code reivew Signed-off-by: hwzhangchuang --- sourcehandler/include/distributed_input_source_handler.h | 2 +- sourcehandler/src/distributed_input_source_handler.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sourcehandler/include/distributed_input_source_handler.h b/sourcehandler/include/distributed_input_source_handler.h index 7afa813..9ed6ed8 100644 --- a/sourcehandler/include/distributed_input_source_handler.h +++ b/sourcehandler/include/distributed_input_source_handler.h @@ -45,7 +45,7 @@ public: std::shared_ptr callback) override; int32_t ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) override; - void RegisterDistributedHardwareStateListener(std::shared_ptr listener) override; + void RegisterDistributedHardwareStateListener(std::shared_ptr listener) override; void UnregisterDistributedHardwareStateListener() override; void RegisterDataSyncTriggerListener(std::shared_ptr listener) override; void UnregisterDataSyncTriggerListener() override; diff --git a/sourcehandler/src/distributed_input_source_handler.cpp b/sourcehandler/src/distributed_input_source_handler.cpp index a414f15..5650deb 100644 --- a/sourcehandler/src/distributed_input_source_handler.cpp +++ b/sourcehandler/src/distributed_input_source_handler.cpp @@ -111,7 +111,8 @@ int32_t DistributedInputSourceHandler::ConfigDistributedHardware(const std::stri return DH_SUCCESS; } -void DistributedInputSourceHandler::RegisterDistributedHardwareStateListener(std::shared_ptr listener) +void DistributedInputSourceHandler::RegisterDistributedHardwareStateListener( + std::shared_ptr listener) { (void)listener; } -- Gitee