From d5ccf12594dfd5de05d2005dca55730fe9ba3884 Mon Sep 17 00:00:00 2001 From: dl Date: Wed, 6 Apr 2022 16:48:12 +0800 Subject: [PATCH 1/3] add add unregister plugin listener Signed-off-by: dl --- .../cameraoperator/handler/include/dcamera_handler.h | 1 + .../cameraoperator/handler/src/dcamera_handler.cpp | 6 ++++++ .../cameraoperator/handler/src/dcamera_handler_common.cpp | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h b/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h index 9b6d5923..0276319e 100644 --- a/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h +++ b/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h @@ -43,6 +43,7 @@ public: std::map QueryExtraInfo() override; bool IsSupportPlugin() override; void RegisterPluginListener(std::shared_ptr listener) override; + void UnRegisterPluginListener() override; std::vector GetCameras(); diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp index eb752783..50ac1905 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp @@ -96,6 +96,12 @@ void DCameraHandler::RegisterPluginListener(std::shared_ptr list pluginListener_ = listener; } +void DCameraHandler::UnRegisterPluginListener() +{ + DHLOGI("DCameraHandler::UnRegisterPluginListener"); + listener == nullptr; +} + std::vector DCameraHandler::GetCameras() { std::vector cameras; diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp index 6836404a..ca79392e 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp @@ -96,6 +96,12 @@ void DCameraHandler::RegisterPluginListener(std::shared_ptr list pluginListener_ = listener; } +void DCameraHandler::UnRegisterPluginListener() +{ + DHLOGI("DCameraHandler::UnRegisterPluginListener"); + listener == nullptr; +} + std::vector DCameraHandler::GetCameras() { std::vector cameras; -- Gitee From 211a6af2ecdbdedba67714d45d09bfa94ce61a08 Mon Sep 17 00:00:00 2001 From: dl Date: Wed, 6 Apr 2022 16:53:54 +0800 Subject: [PATCH 2/3] add add unregister plugin listener Signed-off-by: dl --- .../cameraoperator/handler/src/dcamera_handler.cpp | 2 +- .../cameraoperator/handler/src/dcamera_handler_common.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp index 50ac1905..235e4260 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp @@ -99,7 +99,7 @@ void DCameraHandler::RegisterPluginListener(std::shared_ptr list void DCameraHandler::UnRegisterPluginListener() { DHLOGI("DCameraHandler::UnRegisterPluginListener"); - listener == nullptr; + pluginListener_ == nullptr; } std::vector DCameraHandler::GetCameras() diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp index ca79392e..f06ce641 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp @@ -99,7 +99,7 @@ void DCameraHandler::RegisterPluginListener(std::shared_ptr list void DCameraHandler::UnRegisterPluginListener() { DHLOGI("DCameraHandler::UnRegisterPluginListener"); - listener == nullptr; + pluginListener_ == nullptr; } std::vector DCameraHandler::GetCameras() -- Gitee From 111338f18b8b64b1ccf256dc84957b2f6e0f66ad Mon Sep 17 00:00:00 2001 From: dl Date: Wed, 6 Apr 2022 17:30:27 +0800 Subject: [PATCH 3/3] add add unregister plugin listener Signed-off-by: dl --- .../cameraoperator/handler/src/dcamera_handler.cpp | 2 +- .../cameraoperator/handler/src/dcamera_handler_common.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp index 235e4260..495323b9 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp @@ -99,7 +99,7 @@ void DCameraHandler::RegisterPluginListener(std::shared_ptr list void DCameraHandler::UnRegisterPluginListener() { DHLOGI("DCameraHandler::UnRegisterPluginListener"); - pluginListener_ == nullptr; + pluginListener_ = nullptr; } std::vector DCameraHandler::GetCameras() diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp index f06ce641..009be60b 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp @@ -99,7 +99,7 @@ void DCameraHandler::RegisterPluginListener(std::shared_ptr list void DCameraHandler::UnRegisterPluginListener() { DHLOGI("DCameraHandler::UnRegisterPluginListener"); - pluginListener_ == nullptr; + pluginListener_ = nullptr; } std::vector DCameraHandler::GetCameras() -- Gitee