From 26ae5d6e78406faad211fd31b9e92ff657ba3b89 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 12 Jul 2022 15:11:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?screen=20=E5=A4=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- common/src/dscreen_hisysevent.cpp | 2 +- .../native_cpp/screen_sink/src/dscreen_sink_proxy.cpp | 4 +++- .../screen_source/src/callback/dscreen_source_callback.cpp | 2 ++ .../native_cpp/screen_source/src/dscreen_source_proxy.cpp | 5 ++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/src/dscreen_hisysevent.cpp b/common/src/dscreen_hisysevent.cpp index 102ab480..3700119d 100644 --- a/common/src/dscreen_hisysevent.cpp +++ b/common/src/dscreen_hisysevent.cpp @@ -14,7 +14,7 @@ */ #include "dscreen_hisysevent.h" -#include +#include "hisysevent.h" #include "dscreen_errcode.h" #include "dscreen_log.h" diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp index a6d1e999..b2e30981 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp @@ -15,7 +15,9 @@ #include "dscreen_sink_proxy.h" -#include "parcel.h" +#include "iremote_object.h" +#include "message_option.h" +#include "message_parcel.h" #include "dscreen_errcode.h" #include "dscreen_log.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp index 038f6c19..ebb8ad58 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp @@ -15,6 +15,8 @@ #include "dscreen_source_callback.h" +#include "utility" + #include "dscreen_errcode.h" #include "dscreen_log.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp index 5f0bad83..f4ab20d0 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp @@ -15,7 +15,10 @@ #include "dscreen_source_proxy.h" -#include "parcel.h" +#include "idscreen_source_callback.h" +#include "iremote_object.h" +#include "message_option.h" +#include "message_parcel.h" #include "dscreen_errcode.h" #include "dscreen_log.h" -- Gitee From 5fa18237dfdc7000d89bfbecc8ada76dce04fa57 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Wed, 13 Jul 2022 17:00:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E5=A4=B4=E6=96=87=E4=BB=B6=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- common/include/dscreen_hisysevent.h | 2 -- common/include/dscreen_util.h | 1 + common/src/dscreen_hisysevent.cpp | 1 + common/src/dscreen_sa_process_state.cpp | 2 ++ common/src/dscreen_util.cpp | 3 ++- .../include/callback/dscreen_sink_load_callback.h | 5 +++++ .../screen_sink/include/dscreen_sink_handler.h | 3 +++ .../native_cpp/screen_sink/include/dscreen_sink_proxy.h | 4 ++++ .../src/callback/dscreen_sink_load_callback.cpp | 4 ++-- .../native_cpp/screen_sink/src/dscreen_sink_handler.cpp | 7 +++++++ .../include/callback/dscreen_source_callback.h | 2 ++ .../include/callback/dscreen_source_callback_stub.h | 4 ++++ .../include/callback/dscreen_source_load_callback.h | 5 +++++ .../screen_source/include/dscreen_source_handler.h | 5 +++++ .../screen_source/include/dscreen_source_proxy.h | 8 ++++++-- .../src/callback/dscreen_source_callback.cpp | 2 -- .../src/callback/dscreen_source_callback_stub.cpp | 7 +++++++ .../src/callback/dscreen_source_load_callback.cpp | 3 +-- .../screen_source/src/dscreen_source_handler.cpp | 9 +++++++++ services/common/utils/src/video_param.cpp | 1 - 20 files changed, 66 insertions(+), 12 deletions(-) diff --git a/common/include/dscreen_hisysevent.h b/common/include/dscreen_hisysevent.h index b16b102a..b403a37e 100644 --- a/common/include/dscreen_hisysevent.h +++ b/common/include/dscreen_hisysevent.h @@ -18,8 +18,6 @@ #include -#include "hisysevent.h" - namespace OHOS { namespace DistributedHardware { const std::string DSCREEN_INIT_FAIL = "DSCREEN_INIT_FAIL"; diff --git a/common/include/dscreen_util.h b/common/include/dscreen_util.h index aea24399..5b642c9c 100644 --- a/common/include/dscreen_util.h +++ b/common/include/dscreen_util.h @@ -16,6 +16,7 @@ #ifndef OHOS_DSCREEN_UTIL_H #define OHOS_DSCREEN_UTIL_H +#include #include namespace OHOS { diff --git a/common/src/dscreen_hisysevent.cpp b/common/src/dscreen_hisysevent.cpp index 3700119d..aafa6827 100644 --- a/common/src/dscreen_hisysevent.cpp +++ b/common/src/dscreen_hisysevent.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "dscreen_hisysevent.h" #include "hisysevent.h" diff --git a/common/src/dscreen_sa_process_state.cpp b/common/src/dscreen_sa_process_state.cpp index ae8f53ee..8f052d23 100644 --- a/common/src/dscreen_sa_process_state.cpp +++ b/common/src/dscreen_sa_process_state.cpp @@ -15,6 +15,8 @@ #include "dscreen_sa_process_state.h" +#include +#include #include #include "dscreen_constants.h" diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp index bd380199..21703d55 100644 --- a/common/src/dscreen_util.cpp +++ b/common/src/dscreen_util.cpp @@ -15,10 +15,11 @@ #include "dscreen_util.h" +#include +#include #include #include #include -#include #include #include "softbus_bus_center.h" diff --git a/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h b/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h index 92496721..c3dddfd3 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h +++ b/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h @@ -16,8 +16,13 @@ #ifndef OHOS_DSCREEN_SINK_LOAD_CALLBACK_H #define OHOS_DSCREEN_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 DScreenSinkLoadCallback : public SystemAbilityLoadCallbackStub { diff --git a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h index 400e5106..ad55d8f8 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h +++ b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h @@ -17,9 +17,12 @@ #define OHOS_DSCREEN_SINK_HANDLER_H #include +#include #include #include "idistributed_hardware_sink.h" +#include "iremote_object.h" +#include "refbase.h" #include "single_instance.h" #include "idscreen_sink.h" diff --git a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h index ca69db10..34e9d14b 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h +++ b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h @@ -16,11 +16,15 @@ #ifndef OHOS_DSCREEN_SINK_PROXY_H #define OHOS_DSCREEN_SINK_PROXY_H +#include + #include "iremote_broker.h" #include "iremote_proxy.h" +#include "refbase.h" #include "idscreen_sink.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { class DScreenSinkProxy : public IRemoteProxy { diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp index caec8439..bb6b0aa0 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp @@ -12,9 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dscreen_sink_load_callback.h" -#include +#include "dscreen_sink_load_callback.h" #include "dscreen_constants.h" #include "dscreen_errcode.h" @@ -22,6 +21,7 @@ #include "dscreen_log.h" #include "dscreen_sink_handler.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { DScreenSinkLoadCallback::DScreenSinkLoadCallback( diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp index c6bc4f3b..33884aac 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp @@ -15,8 +15,15 @@ #include "dscreen_sink_handler.h" +#include +#include + +#include "errors.h" +#include "hitrace_meter.h" +#include "iremote_broker.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" +#include "isystem_ability_load_callback.h" #include "dscreen_constants.h" #include "dscreen_errcode.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h index 3eb89dda..f7bc172d 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h @@ -16,7 +16,9 @@ #ifndef OHOS_DSCREEN_SOURCE_CALLBACK_H #define OHOS_DSCREEN_SOURCE_CALLBACK_H +#include #include +#include #include "idistributed_hardware_source.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h index f85c25e0..a63a5560 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h @@ -16,12 +16,16 @@ #ifndef OHOS_DSCREEN_SOURCE_CALLBACK_STUB_H #define OHOS_DSCREEN_SOURCE_CALLBACK_STUB_H +#include #include #include "iremote_stub.h" +#include "refbase.h" #include "idscreen_source_callback.h" +namespace OHOS { class MessageOption; } +namespace OHOS { class MessageParcel; } namespace OHOS { namespace DistributedHardware { class DScreenSourceCallbackStub : public IRemoteStub { diff --git a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h index 17688f1b..e8420e23 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h @@ -16,8 +16,13 @@ #ifndef OHOS_DSCREEN_SOURCE_LOAD_CALLBACK_H #define OHOS_DSCREEN_SOURCE_LOAD_CALLBACK_H +#include +#include + +#include "refbase.h" #include "system_ability_load_callback_stub.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { class DScreenSourceLoadCallback : public SystemAbilityLoadCallbackStub { 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 a602ab61..bcb40034 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 @@ -17,8 +17,13 @@ #define OHOS_DSCREEN_SOURCE_HANDLER_H #include +#include +#include #include +#include "iremote_object.h" +#include "refbase.h" + #include "dscreen_source_callback.h" #include "idscreen_source.h" #include "idistributed_hardware_source.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h index a0d84ba0..13c3df82 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h @@ -16,11 +16,15 @@ #ifndef OHOS_DSCREEN_SOURCE_PROXY_H #define OHOS_DSCREEN_SOURCE_PROXY_H +#include + +#include "idistributed_hardware_source.h" +#include "idscreen_source.h" #include "iremote_broker.h" #include "iremote_proxy.h" -#include "idscreen_source.h" -#include "idistributed_hardware_source.h" +#include "refbase.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { class DScreenSourceProxy : public IRemoteProxy { diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp index ebb8ad58..038f6c19 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp @@ -15,8 +15,6 @@ #include "dscreen_source_callback.h" -#include "utility" - #include "dscreen_errcode.h" #include "dscreen_log.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp index 4ec6a3f7..00b55fe1 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp @@ -15,9 +15,16 @@ #include "dscreen_source_callback_stub.h" +#include + +#include "idscreen_source_callback.h" +#include "ipc_types.h" +#include "message_parcel.h" + #include "dscreen_errcode.h" #include "dscreen_log.h" +namespace OHOS { class MessageOption; } namespace OHOS { namespace DistributedHardware { DScreenSourceCallbackStub::DScreenSourceCallbackStub() diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp index 28bac922..a4e4e571 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp @@ -14,14 +14,13 @@ */ #include "dscreen_source_load_callback.h" -#include - #include "dscreen_constants.h" #include "dscreen_errcode.h" #include "dscreen_hisysevent.h" #include "dscreen_log.h" #include "dscreen_source_handler.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { DScreenSourceLoadCallback::DScreenSourceLoadCallback( 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 06894f94..73d8509c 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 @@ -15,7 +15,16 @@ #include "dscreen_source_handler.h" +#include +#include +#include + +#include "errors.h" +#include "hitrace_meter.h" +#include "idscreen_source_callback.h" #include "if_system_ability_manager.h" +#include "iremote_broker.h" +#include "isystem_ability_load_callback.h" #include "iservice_registry.h" #include "dscreen_constants.h" diff --git a/services/common/utils/src/video_param.cpp b/services/common/utils/src/video_param.cpp index 7ff83cee..0b6d2b9f 100644 --- a/services/common/utils/src/video_param.cpp +++ b/services/common/utils/src/video_param.cpp @@ -15,7 +15,6 @@ #include "video_param.h" #include "dscreen_constants.h" -#include "dscreen_errcode.h" using json = nlohmann::json; -- Gitee