From 63c8aa0e16993aa4cb17e6ef3bbe6706170bdc13 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Wed, 24 Apr 2024 16:18:44 +0800 Subject: [PATCH 1/3] add new api Signed-off-by: hwzhangchuang --- .../include/dscreen_source_handler.h | 4 ++++ .../src/dscreen_source_handler.cpp | 18 ++++++++++++++++++ screenhandler/include/dscreen_handler.h | 1 + screenhandler/src/dscreen_handler.cpp | 5 +++++ 4 files changed, 28 insertions(+) diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h index f57835a3..712737cc 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h @@ -42,6 +42,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 OnRemoteSourceSvrDied(const wptr &remote); void FinishStartSA(const std::string ¶ms, const sptr &remoteObject); private: diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index d9cefe26..42a2531d 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -200,6 +200,24 @@ int32_t DScreenSourceHandler::ConfigDistributedHardware(const std::string &devId return DH_SUCCESS; } +void DScreenSourceHandler::RegisterBusinessStateListener(std::shared_ptr listener) +{ + (void)listener; +} + +void DScreenSourceHandler::UnRegisterBusinessStateListener() +{ +} + +void DScreenSourceHandler::RegisterDataSyncTriggerListener(std::shared_ptr listener) +{ + (void)listener; +} + +void DScreenSourceHandler::UnRegisterDataSyncTriggerListener() +{ +} + void DScreenSourceHandler::DScreenSourceSvrRecipient::OnRemoteDied(const wptr &remote) { if (remote == nullptr) { diff --git a/screenhandler/include/dscreen_handler.h b/screenhandler/include/dscreen_handler.h index 272fb260..fb7b7e06 100644 --- a/screenhandler/include/dscreen_handler.h +++ b/screenhandler/include/dscreen_handler.h @@ -35,6 +35,7 @@ class DScreenHandler : public IHardwareHandler { DECLARE_SINGLE_INSTANCE_BASE(DScreenHandler); public: int32_t Initialize() override; + std::vector QueryMeta() override; std::vector Query() override; std::map QueryExtraInfo() override; bool IsSupportPlugin() override; diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp index ae9fb810..d4c0ecf9 100644 --- a/screenhandler/src/dscreen_handler.cpp +++ b/screenhandler/src/dscreen_handler.cpp @@ -125,6 +125,11 @@ void DScreenHandler::UnPluginHardware(const std::string &dhId) } } +std::vector DScreenHandler::QueryMeta() +{ + return {}; +} + std::vector DScreenHandler::Query() { DHLOGI("DScreenHandler query hardware info"); -- Gitee From 43208b3c5917c4f243b21d69d067dd47b6b8f97f Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Thu, 25 Apr 2024 11:19:51 +0800 Subject: [PATCH 2/3] modify code review Signed-off-by: hwzhangchuang --- .../screen_source/include/dscreen_source_handler.h | 6 +++--- .../native_cpp/screen_source/src/dscreen_source_handler.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h index 712737cc..13f799e7 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h @@ -42,10 +42,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 OnRemoteSourceSvrDied(const wptr &remote); void FinishStartSA(const std::string ¶ms, const sptr &remoteObject); private: diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index 42a2531d..d5d3fac6 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -200,12 +200,12 @@ int32_t DScreenSourceHandler::ConfigDistributedHardware(const std::string &devId return DH_SUCCESS; } -void DScreenSourceHandler::RegisterBusinessStateListener(std::shared_ptr listener) +void DScreenSourceHandler::RegisterDistributedHardwareStateListener(std::shared_ptr listener) { (void)listener; } -void DScreenSourceHandler::UnRegisterBusinessStateListener() +void DScreenSourceHandler::UnregisterDistributedHardwareStateListener() { } @@ -214,7 +214,7 @@ void DScreenSourceHandler::RegisterDataSyncTriggerListener(std::shared_ptr Date: Thu, 25 Apr 2024 14:04:16 +0800 Subject: [PATCH 3/3] modify code reivew Signed-off-by: hwzhangchuang --- .../native_cpp/screen_source/include/dscreen_source_handler.h | 2 +- .../native_cpp/screen_source/src/dscreen_source_handler.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h index 13f799e7..a5591d02 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h @@ -42,7 +42,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/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index d5d3fac6..e1a58f1f 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -200,7 +200,8 @@ int32_t DScreenSourceHandler::ConfigDistributedHardware(const std::string &devId return DH_SUCCESS; } -void DScreenSourceHandler::RegisterDistributedHardwareStateListener(std::shared_ptr listener) +void DScreenSourceHandler::RegisterDistributedHardwareStateListener( + std::shared_ptr listener) { (void)listener; } -- Gitee