From c7b764531b90530d721bd43bf26d13dee79ce015 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Wed, 13 Jul 2022 16:18:55 +0800 Subject: [PATCH] fix: modify header file Signed-off-by: wangchaole --- common/include/utils/data_buffer.h | 2 ++ common/include/utils/dcamera_hitrace_adapter.h | 1 + common/include/utils/dcamera_utils_tools.h | 1 - common/src/utils/dcamera_buffer_handle.cpp | 2 ++ common/src/utils/dcamera_hitrace_adapter.cpp | 1 - common/src/utils/dcamera_sa_process_state.cpp | 1 + common/src/utils/dcamera_utils_tools.cpp | 3 +++ .../camera_sink/include/dcamera_sink_handler.h | 1 + .../camera_sink/include/dcamera_sink_handler_ipc.h | 6 +++++- .../camera_sink/include/dcamera_sink_load_callback.h | 6 ++++++ .../native_cpp/camera_sink/src/dcamera_sink_handler.cpp | 7 +++++++ .../camera_sink/src/dcamera_sink_handler_ipc.cpp | 9 +++++---- .../camera_sink/src/dcamera_sink_load_callback.cpp | 1 + .../include/callback/dcamera_source_callback_stub.h | 6 +++++- .../camera_source/include/dcamera_source_handler_ipc.h | 4 ++++ .../camera_source/include/dcamera_source_load_callback.h | 5 +++++ .../include/distributed_camera_source_proxy.h | 3 ++- .../src/callback/dcamera_source_callback_stub.cpp | 4 ++++ .../camera_source/src/dcamera_source_handler_ipc.cpp | 7 ++++--- .../camera_source/src/dcamera_source_load_callback.cpp | 1 + .../src/distributed_camera_source_proxy.cpp | 5 +++-- .../client/include/callback/dcamera_preview_callback.h | 4 +++- .../client/include/callback/dcamera_session_callback.h | 4 +++- .../client/src/callback/dcamera_preview_callback.cpp | 1 + .../client/src/callback/dcamera_session_callback.cpp | 1 + .../eventbus/dcamera_frame_trigger_event.h | 1 + .../eventbus/dcamera_photo_output_event.h | 3 +++ .../eventbus/dcamera_video_output_event.h | 3 ++- 28 files changed, 76 insertions(+), 17 deletions(-) diff --git a/common/include/utils/data_buffer.h b/common/include/utils/data_buffer.h index c884ff05..dfcb469a 100644 --- a/common/include/utils/data_buffer.h +++ b/common/include/utils/data_buffer.h @@ -18,6 +18,8 @@ #include #include +#include +#include using std::string; using std::map; diff --git a/common/include/utils/dcamera_hitrace_adapter.h b/common/include/utils/dcamera_hitrace_adapter.h index 59597b02..245437a0 100644 --- a/common/include/utils/dcamera_hitrace_adapter.h +++ b/common/include/utils/dcamera_hitrace_adapter.h @@ -16,6 +16,7 @@ #ifndef OHOS_DCAMERA_HITRACE_ADAPTER_H #define OHOS_DCAMERA_HITRACE_ADAPTER_H +#include #include #include "hitrace_meter.h" diff --git a/common/include/utils/dcamera_utils_tools.h b/common/include/utils/dcamera_utils_tools.h index bcd64cad..986ac658 100644 --- a/common/include/utils/dcamera_utils_tools.h +++ b/common/include/utils/dcamera_utils_tools.h @@ -18,7 +18,6 @@ #include #include -#include namespace OHOS { namespace DistributedHardware { diff --git a/common/src/utils/dcamera_buffer_handle.cpp b/common/src/utils/dcamera_buffer_handle.cpp index 7a1627f4..f827dda8 100644 --- a/common/src/utils/dcamera_buffer_handle.cpp +++ b/common/src/utils/dcamera_buffer_handle.cpp @@ -16,6 +16,8 @@ #include "dcamera_buffer_handle.h" #include +#include +#include #include #include "buffer_handle_utils.h" diff --git a/common/src/utils/dcamera_hitrace_adapter.cpp b/common/src/utils/dcamera_hitrace_adapter.cpp index 3ba42a9a..1f74b50a 100644 --- a/common/src/utils/dcamera_hitrace_adapter.cpp +++ b/common/src/utils/dcamera_hitrace_adapter.cpp @@ -14,7 +14,6 @@ */ #include "dcamera_hitrace_adapter.h" -#include "distributed_hardware_log.h" namespace OHOS { namespace DistributedHardware { diff --git a/common/src/utils/dcamera_sa_process_state.cpp b/common/src/utils/dcamera_sa_process_state.cpp index 00df0018..cfdd908f 100644 --- a/common/src/utils/dcamera_sa_process_state.cpp +++ b/common/src/utils/dcamera_sa_process_state.cpp @@ -16,6 +16,7 @@ #include "dcamera_sa_process_state.h" #include +#include #include "distributed_hardware_log.h" diff --git a/common/src/utils/dcamera_utils_tools.cpp b/common/src/utils/dcamera_utils_tools.cpp index abee175b..802aca79 100644 --- a/common/src/utils/dcamera_utils_tools.cpp +++ b/common/src/utils/dcamera_utils_tools.cpp @@ -15,6 +15,9 @@ #include "dcamera_utils_tools.h" +#include +#include + #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" diff --git a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h index 30223892..dc9be398 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h +++ b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h @@ -16,6 +16,7 @@ #ifndef OHOS_DCAMERA_SINK_HANDLER_H #define OHOS_DCAMERA_SINK_HANDLER_H +#include #include #include diff --git a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h index 94b660c0..faa8c73d 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h +++ b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h @@ -16,8 +16,12 @@ #ifndef OHOS_DCAMERA_SINK_HANDLER_IPC_H #define OHOS_DCAMERA_SINK_HANDLER_IPC_H -#include "idistributed_camera_sink.h" +#include + #include "single_instance.h" +#include "iremote_object.h" +#include "refbase.h" +#include "idistributed_camera_sink.h" namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_load_callback.h b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_load_callback.h index 003f90d5..637689d1 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_load_callback.h +++ b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_load_callback.h @@ -15,8 +15,14 @@ #ifndef OHOS_DCAMERA_SINk_LOAD_CALLBACK_H #define OHOS_DCAMERA_SINk_LOAD_CALLBACK_H +#include +#include + +#include "refbase.h" #include "system_ability_load_callback_stub.h" +namespace OHOS { class IRemoteObject; } + namespace OHOS { namespace DistributedHardware { class DCameraSinkLoadCallback : public SystemAbilityLoadCallbackStub { diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index 9fa16d9a..499125c7 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -15,6 +15,10 @@ #include "dcamera_sink_handler.h" +#include +#include +#include + #include "anonymous_string.h" #include "dcamera_hisysevent_adapter.h" #include "dcamera_sink_handler_ipc.h" @@ -24,6 +28,9 @@ #include "distributed_hardware_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" +#include "idistributed_camera_sink.h" +#include "isystem_ability_load_callback.h" +#include "refbase.h" namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp index c3506b6d..15014344 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp @@ -15,13 +15,14 @@ #include "dcamera_sink_handler_ipc.h" -#include "if_system_ability_manager.h" -#include "iservice_registry.h" +#include +#include -#include "anonymous_string.h" #include "distributed_camera_constants.h" -#include "distributed_camera_errno.h" #include "distributed_hardware_log.h" +#include "if_system_ability_manager.h" +#include "iservice_registry.h" +#include "iremote_broker.h" namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index b372c4ca..f7ea2632 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -19,6 +19,7 @@ #include "dcamera_sink_handler.h" #include "distributed_hardware_log.h" #include "distributed_camera_constants.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h b/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h index 6fa37803..08e85f91 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h @@ -16,10 +16,14 @@ #ifndef OHOS_DCAMERA_SOURCE_CALLBACK_STUB_H #define OHOS_DCAMERA_SOURCE_CALLBACK_STUB_H +#include #include -#include "iremote_stub.h" +#include "iremote_stub.h" #include "idcamera_source_callback.h" +#include "refbase.h" +namespace OHOS { class MessageOption; } +namespace OHOS { class MessageParcel; } namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h index d12def18..7f4042ca 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h @@ -16,7 +16,11 @@ #ifndef OHOS_DCAMERA_SOURCE_HANDLER_IPC_H #define OHOS_DCAMERA_SOURCE_HANDLER_IPC_H +#include + #include "idistributed_camera_source.h" +#include "iremote_object.h" +#include "refbase.h" #include "single_instance.h" namespace OHOS { diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_load_callback.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_load_callback.h index 458f983a..20f82506 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_load_callback.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_load_callback.h @@ -15,7 +15,12 @@ #ifndef OHOS_DCAMERA_SOURCE_LOAD_CALLBACK_H #define OHOS_DCAMERA_SOURCE_LOAD_CALLBACK_H +#include +#include + +#include "refbase.h" #include "system_ability_load_callback_stub.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h b/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h index 651f8eaa..f08f2764 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h @@ -20,8 +20,9 @@ #include "iremote_proxy.h" #include "iremote_broker.h" #include "refbase.h" - #include "idistributed_camera_source.h" +#include "idistributed_hardware_source.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp index 05fe5e7b..bd97d27d 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp @@ -16,6 +16,10 @@ #include "dcamera_source_callback_stub.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" +#include "ipc_object_stub.h" +#include "ipc_types.h" +#include "message_parcel.h" +namespace OHOS { class MessageOption; } namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp index ddd741cc..6c08f271 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp @@ -15,13 +15,14 @@ #include "dcamera_source_handler_ipc.h" +#include +#include + #include "if_system_ability_manager.h" #include "iservice_registry.h" - -#include "anonymous_string.h" #include "distributed_camera_constants.h" -#include "distributed_camera_errno.h" #include "distributed_hardware_log.h" +#include "iremote_broker.h" namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index 90150c2e..d6e52434 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -19,6 +19,7 @@ #include "dcamera_source_handler.h" #include "distributed_hardware_log.h" #include "distributed_camera_constants.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp index 33af72b0..7386f0ad 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp @@ -15,11 +15,12 @@ #include "distributed_camera_source_proxy.h" -#include "parcel.h" - #include "anonymous_string.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" +#include "iremote_object.h" +#include "message_option.h" +#include "message_parcel.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/cameraoperator/client/include/callback/dcamera_preview_callback.h b/services/cameraservice/cameraoperator/client/include/callback/dcamera_preview_callback.h index a215c184..fad4a501 100644 --- a/services/cameraservice/cameraoperator/client/include/callback/dcamera_preview_callback.h +++ b/services/cameraservice/cameraoperator/client/include/callback/dcamera_preview_callback.h @@ -16,9 +16,11 @@ #ifndef OHOS_DCAMERA_PREVIEW_CALLBACK_H #define OHOS_DCAMERA_PREVIEW_CALLBACK_H -#include "preview_output.h" +#include +#include #include "icamera_operator.h" +#include "preview_output.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/cameraoperator/client/include/callback/dcamera_session_callback.h b/services/cameraservice/cameraoperator/client/include/callback/dcamera_session_callback.h index 841a0424..07a7b533 100644 --- a/services/cameraservice/cameraoperator/client/include/callback/dcamera_session_callback.h +++ b/services/cameraservice/cameraoperator/client/include/callback/dcamera_session_callback.h @@ -16,9 +16,11 @@ #ifndef OHOS_DCAMERA_SESSION_CALLBACK_H #define OHOS_DCAMERA_SESSION_CALLBACK_H -#include "capture_session.h" +#include +#include #include "icamera_operator.h" +#include "capture_session.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp index 730a35a3..fa8b3342 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp @@ -17,6 +17,7 @@ #include "distributed_camera_constants.h" #include "distributed_hardware_log.h" +#include "dcamera_event_cmd.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp index 8785bcc1..1fa78972 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp @@ -17,6 +17,7 @@ #include "distributed_camera_constants.h" #include "distributed_hardware_log.h" +#include "dcamera_event_cmd.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h index 7024a9dd..9b1e2176 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h @@ -16,6 +16,7 @@ #ifndef OHOS_DCAMERA_FRAME_TRIGER_EVENT_H #define OHOS_DCAMERA_FRAME_TRIGER_EVENT_H +#include #include "event.h" namespace OHOS { diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h index d42e84fa..6d17dcf0 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h @@ -18,6 +18,9 @@ #include "event.h" +#include +#include + #include "data_buffer.h" namespace OHOS { diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h index f0cb6382..262c22da 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h @@ -16,8 +16,9 @@ #ifndef OHOS_DCAMERA_VIDEO_OUTPUT_EVENT_H #define OHOS_DCAMERA_VIDEO_OUTPUT_EVENT_H -#include "event.h" +#include +#include "event.h" #include "data_buffer.h" namespace OHOS { -- Gitee