From bf6ff760275f64c8435c909e51d31be0beb386cf Mon Sep 17 00:00:00 2001 From: zhangguyuan Date: Tue, 16 Mar 2021 22:11:57 +0800 Subject: [PATCH 1/3] fix utils include path Change-Id: I2ea0471b9507558cf96cebbca08a01e6659ceb20 --- cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp | 2 +- gallery/src/gallery_ability_slice.cpp | 2 +- gallery/src/picture_ability_slice.cpp | 2 +- gallery/src/player_ability_slice.cpp | 2 +- launcher/launcher/src/main/cpp/main_ability_slice.h | 2 +- launcher/launcher/src/main/cpp/view_group_page.h | 2 +- setting/setting/src/main/cpp/app_ability_slice.cpp | 2 +- setting/setting/src/main/cpp/app_ability_slice.h | 2 +- setting/setting/src/main/cpp/app_info_ability_slice.cpp | 2 +- setting/setting/src/main/cpp/app_info_ability_slice.h | 2 +- setting/setting/src/main/cpp/main_ability_slice.cpp | 2 +- setting/setting/src/main/cpp/main_ability_slice.h | 2 +- setting/setting/src/main/cpp/setting_about_ability_slice.cpp | 2 +- setting/setting/src/main/cpp/setting_about_ability_slice.h | 2 +- setting/setting/src/main/cpp/setting_display_ability_slice.cpp | 2 +- setting/setting/src/main/cpp/setting_display_ability_slice.h | 2 +- setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp | 2 +- setting/setting/src/main/cpp/setting_wifi_ability_slice.h | 2 +- .../src/main/cpp/setting_wifi_input_password_ability_slice.cpp | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp index 5cbfdcf..8141e01 100755 --- a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp +++ b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp @@ -16,7 +16,7 @@ #include "camera_ability_slice.h" #include #include -#include +#include "gfx_utils/color.h" #include #include "ability_manager.h" diff --git a/gallery/src/gallery_ability_slice.cpp b/gallery/src/gallery_ability_slice.cpp index 5fadc47..f1a0699 100755 --- a/gallery/src/gallery_ability_slice.cpp +++ b/gallery/src/gallery_ability_slice.cpp @@ -18,7 +18,7 @@ #include "ability_manager.h" #include "picture_ability_slice.h" -#include "file.h" +#include "gfx_utils/file.h" #include "securec.h" namespace OHOS { diff --git a/gallery/src/picture_ability_slice.cpp b/gallery/src/picture_ability_slice.cpp index 63e26e1..51b439b 100755 --- a/gallery/src/picture_ability_slice.cpp +++ b/gallery/src/picture_ability_slice.cpp @@ -15,7 +15,7 @@ #include "picture_ability_slice.h" #include "ability_env.h" -#include "file.h" +#include "gfx_utils/file.h" #include "gallery_config.h" #include "securec.h" diff --git a/gallery/src/player_ability_slice.cpp b/gallery/src/player_ability_slice.cpp index 4e943b6..9418734 100755 --- a/gallery/src/player_ability_slice.cpp +++ b/gallery/src/player_ability_slice.cpp @@ -20,7 +20,7 @@ #include "ability_env.h" #include "ability_manager.h" #include "components/ui_image_view.h" -#include "file.h" +#include "gfx_utils/file.h" using OHOS::Media::Player; using OHOS::Media::Source; diff --git a/launcher/launcher/src/main/cpp/main_ability_slice.h b/launcher/launcher/src/main/cpp/main_ability_slice.h index c34caac..f6ca292 100755 --- a/launcher/launcher/src/main/cpp/main_ability_slice.h +++ b/launcher/launcher/src/main/cpp/main_ability_slice.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include "gfx_utils/list.h" #include "event_listener.h" #include "swipe_view.h" diff --git a/launcher/launcher/src/main/cpp/view_group_page.h b/launcher/launcher/src/main/cpp/view_group_page.h index 1a9bcc3..b4d29d5 100755 --- a/launcher/launcher/src/main/cpp/view_group_page.h +++ b/launcher/launcher/src/main/cpp/view_group_page.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include "gfx_utils/list.h" #include "ui_config.h" #include "app_info.h" diff --git a/setting/setting/src/main/cpp/app_ability_slice.cpp b/setting/setting/src/main/cpp/app_ability_slice.cpp index 36d8778..e5873ed 100755 --- a/setting/setting/src/main/cpp/app_ability_slice.cpp +++ b/setting/setting/src/main/cpp/app_ability_slice.cpp @@ -14,7 +14,7 @@ */ #include "app_ability_slice.h" -#include "style.h" +#include "gfx_utils/style.h" namespace OHOS { REGISTER_AS(AppAbilitySlice) diff --git a/setting/setting/src/main/cpp/app_ability_slice.h b/setting/setting/src/main/cpp/app_ability_slice.h index e657a33..075ba45 100755 --- a/setting/setting/src/main/cpp/app_ability_slice.h +++ b/setting/setting/src/main/cpp/app_ability_slice.h @@ -29,7 +29,7 @@ #include "components/ui_toggle_button.h" #include "element_name.h" #include "event_listener.h" -#include "list.h" +#include "gfx_utils/list.h" #include "module_info.h" #include "setting_utils.h" #include "want.h" diff --git a/setting/setting/src/main/cpp/app_info_ability_slice.cpp b/setting/setting/src/main/cpp/app_info_ability_slice.cpp index 45f5096..16c34ad 100755 --- a/setting/setting/src/main/cpp/app_info_ability_slice.cpp +++ b/setting/setting/src/main/cpp/app_info_ability_slice.cpp @@ -14,7 +14,7 @@ */ #include "app_info_ability_slice.h" -#include "style.h" +#include "gfx_utils/style.h" namespace OHOS { REGISTER_AS(AppInfoAbilitySlice) diff --git a/setting/setting/src/main/cpp/app_info_ability_slice.h b/setting/setting/src/main/cpp/app_info_ability_slice.h index dd8567a..b1a6e80 100755 --- a/setting/setting/src/main/cpp/app_info_ability_slice.h +++ b/setting/setting/src/main/cpp/app_info_ability_slice.h @@ -29,7 +29,7 @@ #include "components/ui_toggle_button.h" #include "element_name.h" #include "event_listener.h" -#include "list.h" +#include "gfx_utils/list.h" #include "module_info.h" #include "setting_utils.h" #include "want.h" diff --git a/setting/setting/src/main/cpp/main_ability_slice.cpp b/setting/setting/src/main/cpp/main_ability_slice.cpp index 0f80f35..f7962ee 100755 --- a/setting/setting/src/main/cpp/main_ability_slice.cpp +++ b/setting/setting/src/main/cpp/main_ability_slice.cpp @@ -23,7 +23,7 @@ #include "module_info.h" #include "element_name.h" #include "wpa_work.h" -#include "style.h" +#include "gfx_utils/style.h" #include #include diff --git a/setting/setting/src/main/cpp/main_ability_slice.h b/setting/setting/src/main/cpp/main_ability_slice.h index 3af36af..14fbefe 100755 --- a/setting/setting/src/main/cpp/main_ability_slice.h +++ b/setting/setting/src/main/cpp/main_ability_slice.h @@ -19,7 +19,7 @@ #include #include "ability_loader.h" #include "event_listener.h" -#include "list.h" +#include "gfx_utils/list.h" #include "components/ui_image_view.h" #include "components/ui_scroll_view.h" #include "components/ui_label_button.h" diff --git a/setting/setting/src/main/cpp/setting_about_ability_slice.cpp b/setting/setting/src/main/cpp/setting_about_ability_slice.cpp index cd8be1a..4f6499e 100755 --- a/setting/setting/src/main/cpp/setting_about_ability_slice.cpp +++ b/setting/setting/src/main/cpp/setting_about_ability_slice.cpp @@ -14,7 +14,7 @@ */ #include "setting_about_ability_slice.h" -#include "style.h" +#include "gfx_utils/style.h" namespace OHOS { REGISTER_AS(SettingAboutAbilitySlice) diff --git a/setting/setting/src/main/cpp/setting_about_ability_slice.h b/setting/setting/src/main/cpp/setting_about_ability_slice.h index 921512b..54d70c9 100755 --- a/setting/setting/src/main/cpp/setting_about_ability_slice.h +++ b/setting/setting/src/main/cpp/setting_about_ability_slice.h @@ -28,7 +28,7 @@ #include "components/ui_toggle_button.h" #include "element_name.h" #include "event_listener.h" -#include "list.h" +#include "gfx_utils/list.h" #include "module_info.h" #include "parameter.h" #include "setting_utils.h" diff --git a/setting/setting/src/main/cpp/setting_display_ability_slice.cpp b/setting/setting/src/main/cpp/setting_display_ability_slice.cpp index e89ace0..77b83a1 100755 --- a/setting/setting/src/main/cpp/setting_display_ability_slice.cpp +++ b/setting/setting/src/main/cpp/setting_display_ability_slice.cpp @@ -16,7 +16,7 @@ #include "setting_display_ability_slice.h" #include #include -#include "style.h" +#include "gfx_utils/style.h" namespace OHOS { REGISTER_AS(SettingDisplayAbilitySlice) diff --git a/setting/setting/src/main/cpp/setting_display_ability_slice.h b/setting/setting/src/main/cpp/setting_display_ability_slice.h index e351b2f..7619fbe 100755 --- a/setting/setting/src/main/cpp/setting_display_ability_slice.h +++ b/setting/setting/src/main/cpp/setting_display_ability_slice.h @@ -29,7 +29,7 @@ #include "components/ui_scroll_view.h" #include "components/ui_toggle_button.h" #include "event_listener.h" -#include "list.h" +#include "gfx_utils/list.h" #include "parameter.h" #include "setting_utils.h" diff --git a/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp b/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp index c194f44..19622d2 100755 --- a/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp +++ b/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp @@ -16,7 +16,7 @@ #include "setting_wifi_ability_slice.h" #include #include -#include "style.h" +#include "gfx_utils/style.h" namespace OHOS { REGISTER_AS(SettingWifiAbilitySlice) diff --git a/setting/setting/src/main/cpp/setting_wifi_ability_slice.h b/setting/setting/src/main/cpp/setting_wifi_ability_slice.h index dad9ddd..71d8d32 100755 --- a/setting/setting/src/main/cpp/setting_wifi_ability_slice.h +++ b/setting/setting/src/main/cpp/setting_wifi_ability_slice.h @@ -27,7 +27,7 @@ #include "components/ui_scroll_view.h" #include "components/ui_toggle_button.h" #include "event_listener.h" -#include "list.h" +#include "gfx_utils/list.h" #include "parameter.h" #include "pthread.h" #include "setting_utils.h" diff --git a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp index 109aa92..4b8ecba 100755 --- a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp +++ b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp @@ -14,7 +14,7 @@ */ #include -#include "style.h" +#include "gfx_utils/style.h" namespace OHOS { REGISTER_AS(SettingWifiInputPasswordAbilitySlice) -- Gitee From 26552954371a5b74d149f8348a264748bd77d114 Mon Sep 17 00:00:00 2001 From: zhangguyuan Date: Thu, 18 Mar 2021 15:30:48 +0800 Subject: [PATCH 2/3] fix utils include path Change-Id: Id4a44b27d0928c237d9761c204eab95392f13e86 --- .../src/main/cpp/camera_ability_slice.cpp | 2 +- gallery/src/picture_ability_slice.cpp | 2 +- .../src/main/cpp/main_ability_slice.h | 2 +- .../setting/src/main/cpp/main_ability_slice.h | 25 +++++++++---------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp index 8141e01..ef76f88 100755 --- a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp +++ b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp @@ -16,10 +16,10 @@ #include "camera_ability_slice.h" #include #include -#include "gfx_utils/color.h" #include #include "ability_manager.h" +#include "gfx_utils/color.h" #include "ui_config.h" #include "securec.h" diff --git a/gallery/src/picture_ability_slice.cpp b/gallery/src/picture_ability_slice.cpp index 51b439b..3a74bdb 100755 --- a/gallery/src/picture_ability_slice.cpp +++ b/gallery/src/picture_ability_slice.cpp @@ -15,8 +15,8 @@ #include "picture_ability_slice.h" #include "ability_env.h" -#include "gfx_utils/file.h" #include "gallery_config.h" +#include "gfx_utils/file.h" #include "securec.h" namespace OHOS { diff --git a/launcher/launcher/src/main/cpp/main_ability_slice.h b/launcher/launcher/src/main/cpp/main_ability_slice.h index f6ca292..e7adda8 100755 --- a/launcher/launcher/src/main/cpp/main_ability_slice.h +++ b/launcher/launcher/src/main/cpp/main_ability_slice.h @@ -24,9 +24,9 @@ #include #include #include -#include "gfx_utils/list.h" #include "event_listener.h" +#include "gfx_utils/list.h" #include "swipe_view.h" #include "ui_config.h" diff --git a/setting/setting/src/main/cpp/main_ability_slice.h b/setting/setting/src/main/cpp/main_ability_slice.h index 14fbefe..91d7639 100755 --- a/setting/setting/src/main/cpp/main_ability_slice.h +++ b/setting/setting/src/main/cpp/main_ability_slice.h @@ -16,28 +16,27 @@ #ifndef OHOS_MAIN_ABILITY_SLICE_H #define OHOS_MAIN_ABILITY_SLICE_H -#include +#include "ability_info.h" #include "ability_loader.h" -#include "event_listener.h" -#include "gfx_utils/list.h" +#include "ability_manager.h" +#include "ability_slice.h" +#include "bundle_manager.h" #include "components/ui_image_view.h" -#include "components/ui_scroll_view.h" -#include "components/ui_label_button.h" #include "components/ui_label.h" +#include "components/ui_label_button.h" #include "components/ui_list.h" +#include "components/ui_scroll_view.h" #include "components/ui_toggle_button.h" -#include "bundle_manager.h" -#include "ability_slice.h" -#include "module_info.h" -#include "ability_info.h" #include "element_name.h" -#include "want.h" -#include "ability_manager.h" +#include "event_listener.h" +#include "gfx_utils/list.h" +#include "module_info.h" #include "parameter.h" +#include "pthread.h" #include "setting_utils.h" +#include "want.h" #include "wpa_work.h" -#include "pthread.h" - +#include namespace OHOS { class MainAbilitySlice : public AbilitySlice { -- Gitee From f31eff86f311f2da6a332c95731a17d6a2fc84b9 Mon Sep 17 00:00:00 2001 From: zhangguyuan Date: Thu, 18 Mar 2021 17:06:16 +0800 Subject: [PATCH 3/3] fix utils include path Change-Id: Ie758baa14a0ced9a326cf79c9f05c03ec1dfd53f --- setting/setting/src/main/cpp/main_ability_slice.h | 3 ++- .../setting/src/main/cpp/setting_display_ability_slice.h | 2 +- setting/setting/src/main/cpp/setting_wifi_ability_slice.h | 2 +- .../main/cpp/setting_wifi_input_password_ability_slice.h | 7 ++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/setting/setting/src/main/cpp/main_ability_slice.h b/setting/setting/src/main/cpp/main_ability_slice.h index 91d7639..9538da4 100755 --- a/setting/setting/src/main/cpp/main_ability_slice.h +++ b/setting/setting/src/main/cpp/main_ability_slice.h @@ -16,6 +16,8 @@ #ifndef OHOS_MAIN_ABILITY_SLICE_H #define OHOS_MAIN_ABILITY_SLICE_H +#include + #include "ability_info.h" #include "ability_loader.h" #include "ability_manager.h" @@ -36,7 +38,6 @@ #include "setting_utils.h" #include "want.h" #include "wpa_work.h" -#include namespace OHOS { class MainAbilitySlice : public AbilitySlice { diff --git a/setting/setting/src/main/cpp/setting_display_ability_slice.h b/setting/setting/src/main/cpp/setting_display_ability_slice.h index 7619fbe..0642257 100755 --- a/setting/setting/src/main/cpp/setting_display_ability_slice.h +++ b/setting/setting/src/main/cpp/setting_display_ability_slice.h @@ -21,7 +21,6 @@ #include #include -#include "samgr_lite.h" #include "ability_loader.h" #include "components/ui_label.h" #include "components/ui_label_button.h" @@ -31,6 +30,7 @@ #include "event_listener.h" #include "gfx_utils/list.h" #include "parameter.h" +#include "samgr_lite.h" #include "setting_utils.h" namespace OHOS { diff --git a/setting/setting/src/main/cpp/setting_wifi_ability_slice.h b/setting/setting/src/main/cpp/setting_wifi_ability_slice.h index 71d8d32..577292c 100755 --- a/setting/setting/src/main/cpp/setting_wifi_ability_slice.h +++ b/setting/setting/src/main/cpp/setting_wifi_ability_slice.h @@ -21,6 +21,7 @@ #include #include "ability_loader.h" +#include "common/task.h" #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_list.h" @@ -32,7 +33,6 @@ #include "pthread.h" #include "setting_utils.h" #include "wpa_work.h" -#include "common/task.h" namespace OHOS { class TestBtnOnStateChangeListener : public OHOS::UICheckBox::OnChangeListener, public OHOS::UIView::OnClickListener { diff --git a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h index 0493e05..03f86e3 100755 --- a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h +++ b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h @@ -15,8 +15,10 @@ #ifndef OHOS_SETTING_WIFI_INPUT_PASSWORD_ABILITY_SLICE_H #define OHOS_SETTING_WIFI_INPUT_PASSWORD_ABILITY_SLICE_H -#include "components/ui_checkbox.h" + #include "ability_loader.h" +#include "common/task.h" +#include "components/ui_checkbox.h" #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" @@ -26,9 +28,8 @@ #include "event_listener.h" #include "parameter.h" #include "setting_utils.h" -#include "wpa_work.h" -#include "common/task.h" #include "setting_wifi_input_password_ability_slice.h" +#include "wpa_work.h" namespace OHOS { class SettingWifiInputPasswordAbilitySlice : public AbilitySlice { -- Gitee