From 21958c3a34107f8c7ed315d6f6d3ac05e5470e8e Mon Sep 17 00:00:00 2001 From: zhongqihong Date: Fri, 29 Aug 2025 16:22:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ani=E5=A4=B4=E6=96=87=E4=BB=B6=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E6=8C=89=E5=AD=97=E5=85=B8=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhongqihong --- .../display_ani/include/display_ani_listener.h | 7 ++++--- .../display_ani/include/display_ani_utils.h | 7 ++++--- .../display_ani/src/ani_err_utils.cpp | 5 +++-- .../display_ani/src/display_ani.cpp | 9 +++------ .../display_ani/src/display_ani_listener.cpp | 3 ++- .../display_ani/src/display_ani_manager.cpp | 18 ++++++++++-------- .../display_ani/src/display_ani_utils.cpp | 9 +++++---- .../ani_extension_window_register_manager.h | 1 + .../src/ani_extension_window.cpp | 3 ++- .../src/ani_extension_window_listener.cpp | 1 + .../screen_ani/include/screen_ani_listener.h | 1 + .../screen_ani/include/screen_ani_manager.h | 6 +++--- .../screen_ani/include/screen_ani_utils.h | 1 + .../screen_ani/src/ani_err_utils.cpp | 5 +++-- .../screen_ani/src/screen_ani_listener.cpp | 4 +++- .../screen_ani/src/screen_ani_manager.cpp | 6 +++--- .../screen_ani/src/screen_ani_utils.cpp | 11 +++++------ .../include/ani_window_register_manager.h | 1 + .../include/ani_window_utils.h | 2 ++ .../window_stage_ani/src/ani_err_utils.cpp | 5 +++-- .../window_stage_ani/src/ani_window.cpp | 3 +-- .../src/ani_window_manager.cpp | 11 ++++------- .../src/ani_window_register_manager.cpp | 3 ++- .../window_stage_ani/src/ani_window_stage.cpp | 2 +- .../window_stage_ani/src/ani_window_utils.cpp | 1 + .../include/ani_scene_session_utils.h | 1 + .../src/ani_err_utils.cpp | 1 + .../src/ani_scene_session_manager.cpp | 8 +++++--- .../src/ani_scene_session_utils.cpp | 4 +++- 29 files changed, 79 insertions(+), 60 deletions(-) diff --git a/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_listener.h b/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_listener.h index 082028bf70..3a84d8b4eb 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_listener.h +++ b/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_listener.h @@ -17,11 +17,12 @@ #define OHOS_ANI_DISPLAY_LISTENER_H #include -#include "dm_common.h" -#include "refbase.h" -#include "display_manager.h" + #include "ani.h" +#include "display_manager.h" +#include "dm_common.h" #include "event_handler.h" +#include "refbase.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h b/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h index 20d54fed94..9d0d7de517 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h +++ b/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h @@ -14,15 +14,16 @@ */ #ifndef OHOS_ANI_DISPLAY_UTILS_H #define OHOS_ANI_DISPLAY_UTILS_H + #include #include "ani.h" +#include "dm_common.h" #include "display_ani.h" -#include "singleton_container.h" #include "display_manager.h" -#include "window_manager_hilog.h" -#include "dm_common.h" #include "refbase.h" +#include "singleton_container.h" +#include "window_manager_hilog.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/display_runtime/display_ani/src/ani_err_utils.cpp b/interfaces/kits/ani/display_runtime/display_ani/src/ani_err_utils.cpp index 88f4f88e5a..aef4326d97 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/src/ani_err_utils.cpp +++ b/interfaces/kits/ani/display_runtime/display_ani/src/ani_err_utils.cpp @@ -14,11 +14,12 @@ */ #include "ani_err_utils.h" -#include "display_ani_utils.h" -#include "window_manager_hilog.h" #include +#include "display_ani_utils.h" +#include "window_manager_hilog.h" + namespace OHOS::Rosen { constexpr const char* DM_ERROR_MSG_OK = "ok"; diff --git a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp index 5e9bb5b478..98f0b0fa88 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp +++ b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp @@ -12,22 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include "display_ani.h" + #include #include "ani.h" #include "ani_err_utils.h" #include "display.h" -#include "display_ani.h" #include "display_ani_manager.h" #include "display_ani_utils.h" #include "display_info.h" #include "display_manager.h" #include "dm_common.h" -#include "interop_js/arkts_esvalue.h" -#include "interop_js/arkts_interop_js_api.h" -#include "interop_js/hybridgref_ani.h" -#include "interop_js/hybridgref_napi.h" -#include "js_display.h" #include "refbase.h" #include "singleton_container.h" #include "window_manager_hilog.h" diff --git a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_listener.cpp b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_listener.cpp index 514d06d8e5..dcf27dd1ad 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_listener.cpp +++ b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_listener.cpp @@ -14,8 +14,9 @@ */ #include "display_ani_listener.h" -#include "window_manager_hilog.h" + #include "display_ani_utils.h" +#include "window_manager_hilog.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_manager.cpp b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_manager.cpp index 2fd1aba528..ab2c5ef0fe 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_manager.cpp +++ b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_manager.cpp @@ -12,22 +12,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include + +#include "display_ani_manager.h" + #include +#include #include "ani.h" -#include "display_ani_listener.h" +#include "ani_err_utils.h" +#include "display.h" #include "display_ani.h" -#include "display_ani_manager.h" +#include "display_ani_listener.h" +#include "display_ani_utils.h" #include "display_info.h" -#include "display.h" -#include "singleton_container.h" #include "display_manager.h" -#include "window_manager_hilog.h" #include "dm_common.h" -#include "display_ani_utils.h" #include "refbase.h" -#include "ani_err_utils.h" +#include "singleton_container.h" +#include "window_manager_hilog.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_utils.cpp b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_utils.cpp index d0365aaa9f..749e1a7f7d 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_utils.cpp +++ b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani_utils.cpp @@ -13,18 +13,19 @@ * limitations under the License. */ +#include "display_ani_utils.h" + #include #include "ani.h" -#include "display_ani_utils.h" +#include "display.h" #include "display_ani.h" #include "display_info.h" -#include "display.h" -#include "singleton_container.h" #include "display_manager.h" -#include "window_manager_hilog.h" #include "dm_common.h" #include "refbase.h" +#include "singleton_container.h" +#include "window_manager_hilog.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/embeddable_window_stage/include/ani_extension_window_register_manager.h b/interfaces/kits/ani/embeddable_window_stage/include/ani_extension_window_register_manager.h index ed367b67ff..620e27f027 100644 --- a/interfaces/kits/ani/embeddable_window_stage/include/ani_extension_window_register_manager.h +++ b/interfaces/kits/ani/embeddable_window_stage/include/ani_extension_window_register_manager.h @@ -17,6 +17,7 @@ #define OHOS_ANI_EXTENSION_WINDOW_REGISTER_MANAGER_H #include + #include "ani.h" #include "ani_extension_window_listener.h" #include "refbase.h" diff --git a/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window.cpp b/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window.cpp index 49f0e25abc..7eb47a2713 100644 --- a/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window.cpp +++ b/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window.cpp @@ -13,8 +13,9 @@ * limitations under the License. */ -#include "ani.h" #include "ani_extension_window.h" + +#include "ani.h" #include "ani_extension_window_register_manager.h" #include "extension_window_impl.h" #include "window_manager_hilog.h" diff --git a/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window_listener.cpp b/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window_listener.cpp index 644960ed49..64cb0cf7b5 100644 --- a/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window_listener.cpp +++ b/interfaces/kits/ani/embeddable_window_stage/src/ani_extension_window_listener.cpp @@ -16,6 +16,7 @@ #include "ani_extension_window_listener.h" #include + #include "ani.h" #include "event_handler.h" #include "event_runner.h" diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_listener.h b/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_listener.h index 23a283e5f4..3c9538fda1 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_listener.h +++ b/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_listener.h @@ -17,6 +17,7 @@ #define OHOS_ANI_SCREEN_LISTENER_H #include + #include "ani.h" #include "event_handler.h" #include "screen_manager.h" diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_manager.h b/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_manager.h index aa0d88198a..19f226ec03 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_manager.h +++ b/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_manager.h @@ -16,12 +16,12 @@ #define SCREEN_MANAGER_ANI_H #include -#include "dm_common.h" -#include "refbase.h" -#include "screen_manager.h" #include "ani.h" +#include "dm_common.h" +#include "refbase.h" #include "screen_ani_listener.h" +#include "screen_manager.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_utils.h b/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_utils.h index 352fcbffca..66c561810a 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_utils.h +++ b/interfaces/kits/ani/screen_runtime/screen_ani/include/screen_ani_utils.h @@ -14,6 +14,7 @@ */ #ifndef OHOS_ANI_SCREEN_UTILS_H #define OHOS_ANI_SCREEN_UTILS_H + #include #include "ani.h" diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/src/ani_err_utils.cpp b/interfaces/kits/ani/screen_runtime/screen_ani/src/ani_err_utils.cpp index b73569d949..5c0272b243 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/src/ani_err_utils.cpp +++ b/interfaces/kits/ani/screen_runtime/screen_ani/src/ani_err_utils.cpp @@ -14,11 +14,12 @@ */ #include "ani_err_utils.h" -#include "screen_ani_utils.h" -#include "window_manager_hilog.h" #include +#include "screen_ani_utils.h" +#include "window_manager_hilog.h" + namespace OHOS::Rosen { constexpr const char* DM_ERROR_MSG_OK = "ok"; constexpr const char* DM_ERROR_MSG_INIT_DMS_PROXY_LOCKED = "init dms proxy locked"; diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_listener.cpp b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_listener.cpp index 1debd618ce..bac714dfd5 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_listener.cpp +++ b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_listener.cpp @@ -12,9 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_ani_listener.h" -#include "window_manager_hilog.h" + #include "screen_ani_utils.h" +#include "window_manager_hilog.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp index a049799e25..f816b35157 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp +++ b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_ani_manager.h" -#include #include +#include #include "ani.h" #include "ani_err_utils.h" #include "dm_common.h" #include "refbase.h" -#include "screen_ani.h" -#include "screen_ani_utils.h" #include "screen_ani_listener.h" +#include "screen_ani_utils.h" #include "singleton_container.h" #include "window_manager_hilog.h" diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp index 0ca827744b..55ea26d686 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp +++ b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp @@ -13,18 +13,17 @@ * limitations under the License. */ +#include "screen_ani_utils.h" + #include #include "ani.h" -#include "screen_ani_utils.h" +#include "dm_common.h" +#include "refbase.h" #include "screen.h" -#include "singleton_container.h" #include "screen_manager.h" +#include "singleton_container.h" #include "window_manager_hilog.h" -#include "dm_common.h" -#include "refbase.h" -#include "screen_info.h" -#include "screen_ani.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_register_manager.h b/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_register_manager.h index 33090b5584..98b136c0a8 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_register_manager.h +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_register_manager.h @@ -18,6 +18,7 @@ #include #include + #include "ani_window_listener.h" #include "refbase.h" #include "window.h" diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_utils.h b/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_utils.h index 8c6dec6e19..bc3b2dedbd 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_utils.h +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/include/ani_window_utils.h @@ -15,7 +15,9 @@ #ifndef OHOS_ANI_WINDOW_UTILS_H #define OHOS_ANI_WINDOW_UTILS_H + #include + #include "ani.h" #include "js_window.h" #include "native_engine/native_engine.h" diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_err_utils.cpp b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_err_utils.cpp index 945f76da8d..79d5065ec3 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_err_utils.cpp +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_err_utils.cpp @@ -14,11 +14,12 @@ */ #include "ani_err_utils.h" -#include "ani_window_utils.h" -#include "window_manager_hilog.h" #include +#include "ani_window_utils.h" +#include "window_manager_hilog.h" + namespace OHOS::Rosen { constexpr const char* WM_ERROR_MSG_OK = "ok"; constexpr const char* WM_ERROR_MSG_DO_NOTHING = "do nothing"; diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window.cpp b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window.cpp index 308f3fb9c4..da6ab30480 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window.cpp +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "ani_window.h" #include @@ -31,9 +30,9 @@ #include "pixel_map.h" #include "pixel_map_taihe_ani.h" #include "window_helper.h" -#include "window_scene.h" #include "window_manager.h" #include "window_manager_hilog.h" +#include "window_scene.h" #include "wm_common.h" #include "wm_math.h" diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_manager.cpp b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_manager.cpp index ddfa527d29..105024a537 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_manager.cpp +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_manager.cpp @@ -17,21 +17,18 @@ #include +#include "ability_context.h" #include "ani.h" #include "ani_window.h" #include "ani_window_stage.h" -#include "ani_window.h" -#include "ani_window_stage.h" #include "ani_window_utils.h" +#include "permission.h" #include "singleton_container.h" +#include "window_helper.h" #include "window_manager.h" #include "window_manager_hilog.h" -#include "window_scene.h" -#include "ani_window_utils.h" -#include "ability_context.h" #include "window_option.h" -#include "window_helper.h" -#include "permission.h" +#include "window_scene.h" namespace OHOS { namespace Rosen { diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_register_manager.cpp b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_register_manager.cpp index 4bc13af260..dbb753a597 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_register_manager.cpp +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_register_manager.cpp @@ -12,9 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include "ani_window_register_manager.h" #include "ani.h" -#include "ani_window_register_manager.h" #include "singleton_container.h" #include "window_manager.h" #include "window_manager_hilog.h" diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_stage.cpp b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_stage.cpp index 093e311e82..5945bed54e 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_stage.cpp +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_stage.cpp @@ -27,8 +27,8 @@ #include "interop_js/hybridgref_ani.h" #include "interop_js/hybridgref_napi.h" #include "js_window_stage.h" -#include "window_manager_hilog.h" #include "permission.h" +#include "window_manager_hilog.h" #include "window_scene.h" using OHOS::Rosen::WindowScene; diff --git a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_utils.cpp b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_utils.cpp index 6a2f701123..048d3bc641 100644 --- a/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_utils.cpp +++ b/interfaces/kits/ani/window_runtime/window_stage_ani/src/ani_window_utils.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "ani_window_utils.h" #include diff --git a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/include/ani_scene_session_utils.h b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/include/ani_scene_session_utils.h index 4531513544..6439b85870 100644 --- a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/include/ani_scene_session_utils.h +++ b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/include/ani_scene_session_utils.h @@ -15,6 +15,7 @@ #ifndef OHOS_ANI_SCENE_SESSION_UTILS_H #define OHOS_ANI_SCENE_SESSION_UTILS_H + #include "ani.h" #include "wm_common.h" diff --git a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_err_utils.cpp b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_err_utils.cpp index ca99003521..1398d10ac6 100644 --- a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_err_utils.cpp +++ b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_err_utils.cpp @@ -14,6 +14,7 @@ */ #include "ani_err_utils.h" + #include "ani_scene_session_utils.h" #include "window_manager_hilog.h" diff --git a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_manager.cpp b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_manager.cpp index 9af3f7f33a..9a59a564ed 100644 --- a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_manager.cpp +++ b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_manager.cpp @@ -14,12 +14,14 @@ */ #include "ani_scene_session_manager.h" -#include "ani_scene_session_utils.h" + +#include + #include "ani.h" +#include "ani_scene_session_utils.h" #include "root_scene.h" -#include "wm_common.h" #include "window_manager_hilog.h" -#include +#include "wm_common.h" namespace OHOS { namespace Rosen { diff --git a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_utils.cpp b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_utils.cpp index 86b4412e8a..276f8950c7 100644 --- a/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_utils.cpp +++ b/window_scene/interfaces/kits/ani/scene_session_manager/scene_session_manager_ani/src/ani_scene_session_utils.cpp @@ -12,9 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "ani_err_utils.h" + #include "ani_scene_session_utils.h" + #include "ani.h" +#include "ani_err_utils.h" #include "window_manager_hilog.h" namespace OHOS { -- Gitee From be187972e8a9b9818fa9b610077b394435941dba Mon Sep 17 00:00:00 2001 From: zhongqihong Date: Fri, 29 Aug 2025 16:46:52 +0800 Subject: [PATCH 2/4] add Signed-off-by: zhongqihong --- .../kits/ani/display_runtime/display_ani/src/display_ani.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp index 98f0b0fa88..bec6b43c66 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp +++ b/interfaces/kits/ani/display_runtime/display_ani/src/display_ani.cpp @@ -25,6 +25,11 @@ #include "display_info.h" #include "display_manager.h" #include "dm_common.h" +#include "interop_js/arkts_esvalue.h" +#include "interop_js/arkts_interop_js_api.h" +#include "interop_js/hybridgref_ani.h" +#include "interop_js/hybridgref_napi.h" +#include "js_display.h" #include "refbase.h" #include "singleton_container.h" #include "window_manager_hilog.h" -- Gitee From 05800dc5bcb386b215789de5909c1d2b2eee750f Mon Sep 17 00:00:00 2001 From: zhongqihong Date: Fri, 29 Aug 2025 16:56:49 +0800 Subject: [PATCH 3/4] add Signed-off-by: zhongqihong --- .../ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp | 1 + .../kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp index f816b35157..cc933c4a75 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp +++ b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_manager.cpp @@ -22,6 +22,7 @@ #include "ani_err_utils.h" #include "dm_common.h" #include "refbase.h" +#include "screen_ani.h" #include "screen_ani_listener.h" #include "screen_ani_utils.h" #include "singleton_container.h" diff --git a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp index 55ea26d686..7a56816911 100644 --- a/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp +++ b/interfaces/kits/ani/screen_runtime/screen_ani/src/screen_ani_utils.cpp @@ -21,6 +21,8 @@ #include "dm_common.h" #include "refbase.h" #include "screen.h" +#include "screen_ani.h" +#include "screen_info.h" #include "screen_manager.h" #include "singleton_container.h" #include "window_manager_hilog.h" -- Gitee From 22627c38923f93028ac6a06d6188edae86e02b91 Mon Sep 17 00:00:00 2001 From: zhongqihong Date: Mon, 1 Sep 2025 05:37:57 +0000 Subject: [PATCH 4/4] update interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h. Signed-off-by: zhongqihong --- .../ani/display_runtime/display_ani/include/display_ani_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h b/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h index 9d0d7de517..11968d8148 100644 --- a/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h +++ b/interfaces/kits/ani/display_runtime/display_ani/include/display_ani_utils.h @@ -18,8 +18,8 @@ #include #include "ani.h" -#include "dm_common.h" #include "display_ani.h" +#include "dm_common.h" #include "display_manager.h" #include "refbase.h" #include "singleton_container.h" -- Gitee