From 2143218f3f6ef6120279e362399356e0e9b38662 Mon Sep 17 00:00:00 2001 From: kerongfeng Date: Mon, 3 Mar 2025 20:56:30 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"!708=20=E5=9B=9E=E9=80=80=20'Pull=20R?= =?UTF-8?q?equest=20!705=20:=20add=20offlinephotooutput=20for=20distri-cam?= =?UTF-8?q?era'"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 62c9a4508f388014099dc50858a0713d63f890bd, reversing changes made to 09ce4c0e48f27d4ed4c5056ace9daae3ce75c832. Signed-off-by: kerongfeng --- .../client/include/callback/dcamera_photo_callback.h | 1 + .../client/src/callback/dcamera_photo_callback.cpp | 5 +++++ .../cameraoperator/client/test/sample/dcamera_client_demo.h | 5 +++++ test/distributedcameraclienttest/dcamera_client_demo.h | 5 +++++ 4 files changed, 16 insertions(+) diff --git a/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h b/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h index 0b2706b1..b125428d 100644 --- a/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h +++ b/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h @@ -33,6 +33,7 @@ public: void OnCaptureReady(const int32_t captureId, const uint64_t timestamp) const override; void OnCaptureError(const int32_t captureId, const int32_t errorCode) const override; void OnEstimatedCaptureDuration(const int32_t duration) const override; + void OnOfflineDeliveryFinished(const int32_t captureId) const override; private: std::shared_ptr callback_; diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp index d79e4f55..a82685c1 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp @@ -59,6 +59,11 @@ void DCameraPhotoCallback::OnEstimatedCaptureDuration(const int32_t duration) co DHLOGI("enter, duration: %{public}d", duration); } +void DCameraPhotoCallback::OnOfflineDeliveryFinished(const int32_t captureId) const +{ + DHLOGI("enter, captureId: %{public}d", captureId); +} + void DCameraPhotoCallback::OnCaptureError(const int32_t captureId, const int32_t errorCode) const { DHLOGE("enter, captureId: %{public}d, errorCode: %{public}d", captureId, errorCode); diff --git a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h index 724b493a..05465c6b 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h +++ b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h @@ -239,6 +239,11 @@ public: DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %{public}d errorCode: %{public}d", captureId, errorCode); } + + void OnOfflineDeliveryFinished(const int32_t captureId) const + { + DHLOGI("DemoDCameraPhotoCallback::OnOfflineDeliveryFinished duration: %{public}d", captureId); + } }; class DemoDCameraPreviewCallback : public CameraStandard::PreviewStateCallback { diff --git a/test/distributedcameraclienttest/dcamera_client_demo.h b/test/distributedcameraclienttest/dcamera_client_demo.h index 7b24ddde..5d86b102 100644 --- a/test/distributedcameraclienttest/dcamera_client_demo.h +++ b/test/distributedcameraclienttest/dcamera_client_demo.h @@ -234,6 +234,11 @@ public: DHLOGI("DemoDCameraPhotoCallback::OnEstimatedCaptureDuration duration: %{public}d", duration); } + void OnOfflineDeliveryFinished(const int32_t captureId) const + { + DHLOGI("DemoDCameraPhotoCallback::OnOfflineDeliveryFinished duration: %{public}d", captureId); + } + void OnCaptureError(const int32_t captureId, const int32_t errorCode) const { DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %{public}d errorCode: %{public}d", -- Gitee