From 72d34046f6f94412611c3744a0ed139c2db4f239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 12 Aug 2025 11:14:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 57 +++++++++++++++++++++++++++ arkui/window_manager/oh_window_comm.h | 26 ++++++++++++ 2 files changed, 83 insertions(+) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index 347d10002..9be20b74b 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -289,6 +289,63 @@ void OH_WindowManager_ReleaseAllWindowLayoutInfoList(WindowManager_Rect* windowL int32_t OH_WindowManager_InjectTouchEvent( int32_t windowId, Input_TouchEvent* touchEvent, int32_t windowX, int32_t windowY); +/** + * @brief Get all main window information, including screen id, window id and window label. + * + * @param infoList main window info list. + * @param mainWindowInfoSize size of info list. + * @return Returns the status code of the execution. + * {@link WS_OK} the function call is successful. + * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. + * {@link WINDOW_MANAGER_ERRORCODE_DEVICE_NOT_SUPPORTED} capability not supported. + * {@link WINDOW_MANAGER_ERRORCODE_SYSTEM_ABNORMAL} the window manager service works abnormally. + * @since 21 + */ +WindowManager_ErrorCode OH_NativeWindowManager_GetAllMainWindowInfo( + WindowManager_MainWindowInfo** infoList, size_t* mainWindowInfoSize); + +/** + * @brief Release all main window information. + * + * @param infoList Pointer to the main window info list. + * @param mainWindowInfoSize size of info list. + * @return Returns the status code of the execution. + * {@link WS_OK} the function call is successful. + * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. + * {@link WINDOW_MANAGER_ERRORCODE_DEVICE_NOT_SUPPORTED} capability not supported. + * @since 21 + */ +WindowManager_ErrorCode OH_NativeWindowManager_ReleaseAllMainWindowInfo( + WindowManager_MainWindowInfo* infoList); + +/** + * @brief Get callback interface for capturing a screenshot of a specified window. + * + * @param snapshotPixelMapList list of windows' snapshot + * @param snapshotListSize size of snapshotPixelMapList + * @return Returns the status code of the execution. + * {@link WS_OK} the function call is successful. + * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. + * {@link WINDOW_MANAGER_ERRORCODE_DEVICE_NOT_SUPPORTED} capability not supported. + * {@link WINDOW_MANAGER_ERRORCODE_SYSTEM_ABNORMAL} the window manager service works abnormally. + * @since 21 + */ +typedef void (*OH_NativeWindowManager_MainWindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, + size_t snapshotListSize) + +/** + * @brief Release all main window information. + * + * @param snapshotPixelMapList list of windows' snapshot. + * @return Returns the status code of the execution. + * {@link WS_OK} the function call is successful. + * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. + * {@link WINDOW_MANAGER_ERRORCODE_DEVICE_NOT_SUPPORTED} capability not supported. + * @since 21 + */ +WindowManager_ErrorCode OH_NativeWindowManager_ReleaseMainWindowSnapshot( + const OH_PixelmapNative* snapshotPixelMapList); + #ifdef __cplusplus } #endif diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index 152c9a318..5f20b710a 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -229,6 +229,32 @@ typedef struct { WindowManager_Rect bottomRect; } WindowManager_AvoidArea; +/** + * @brief Main window info + * + * @since 21 + */ +typedef struct { + /** Display id of the window. */ + int64_t displayId; + /** Window id. */ + int32_t windowId;; + /** Showing state of the window. */ + bool showing; + /** Label of the window. */ + const char* label; +} WindowManager_MainWindowInfo; + +/** + * @brief Window snapshot config info + * + * @since 21 + */ +typedef struct { + /** Use cached windows' snapshot. */ + bool useCache; +} WindowManager_WindowSnapshotConfig; + #ifdef __cplusplus } #endif -- Gitee From e0722b0110d106091a3d6a53ec0c47c36368a009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 12 Aug 2025 15:35:40 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9812-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 43 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index 9be20b74b..ecc7d5420 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -290,10 +290,10 @@ int32_t OH_WindowManager_InjectTouchEvent( int32_t windowId, Input_TouchEvent* touchEvent, int32_t windowX, int32_t windowY); /** - * @brief Get all main window information, including screen id, window id and window label. + * @brief Get all main window info on device. * - * @param infoList main window info list. - * @param mainWindowInfoSize size of info list. + * @param infoList Indicates the pointer to a main window info list. + * @param mainWindowInfoSize The size of main window info list. * @return Returns the status code of the execution. * {@link WS_OK} the function call is successful. * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. @@ -305,46 +305,47 @@ WindowManager_ErrorCode OH_NativeWindowManager_GetAllMainWindowInfo( WindowManager_MainWindowInfo** infoList, size_t* mainWindowInfoSize); /** - * @brief Release all main window information. + * @brief Release all main window info list. * * @param infoList Pointer to the main window info list. - * @param mainWindowInfoSize size of info list. + * @since 21 + */ +void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInfo* infoList); + +/** + * @brief Get snapshot of the window with the specified id. + * + * @param windowIdList Main window id list for getting snapshot. + * @param windowIdListSize Size of main window id list. + * @param config Configuration for getting snapshot. + * @param callback Snapshot callback object. * @return Returns the status code of the execution. * {@link WS_OK} the function call is successful. * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. * {@link WINDOW_MANAGER_ERRORCODE_DEVICE_NOT_SUPPORTED} capability not supported. + * {@link WINDOW_MANAGER_ERRORCODE_SYSTEM_ABNORMAL} the window manager service works abnormally. * @since 21 */ -WindowManager_ErrorCode OH_NativeWindowManager_ReleaseAllMainWindowInfo( - WindowManager_MainWindowInfo* infoList); +WindowManager_ErrorCode OH_NativeWindowManager_GetMainWindowSnapshot(int32_t* windowIdList, size_t windowIdListSize, + WindowManager_WindowSnapshotConfig config, OH_NativeWindowManager_WindowSnapshotCallback callback); /** - * @brief Get callback interface for capturing a screenshot of a specified window. + * @brief Callback interface for getting main windows' snapshot. * * @param snapshotPixelMapList list of windows' snapshot * @param snapshotListSize size of snapshotPixelMapList - * @return Returns the status code of the execution. - * {@link WS_OK} the function call is successful. - * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. - * {@link WINDOW_MANAGER_ERRORCODE_DEVICE_NOT_SUPPORTED} capability not supported. - * {@link WINDOW_MANAGER_ERRORCODE_SYSTEM_ABNORMAL} the window manager service works abnormally. * @since 21 */ typedef void (*OH_NativeWindowManager_MainWindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, size_t snapshotListSize) /** - * @brief Release all main window information. + * @brief Release main window snapshot list. * - * @param snapshotPixelMapList list of windows' snapshot. - * @return Returns the status code of the execution. - * {@link WS_OK} the function call is successful. - * {@link WINDOW_MANAGER_ERRORCODE_NO_PERMISSION} permission verification failed. - * {@link WINDOW_MANAGER_ERRORCODE_DEVICE_NOT_SUPPORTED} capability not supported. + * @param snapshotPixelMapList Indicates the pointer of a windows' snapshot list. * @since 21 */ -WindowManager_ErrorCode OH_NativeWindowManager_ReleaseMainWindowSnapshot( - const OH_PixelmapNative* snapshotPixelMapList); +void OH_NativeWindowManager_ReleaseMainWindowSnapshot(const OH_PixelmapNative* snapshotPixelMapList); #ifdef __cplusplus } -- Gitee From 1ecba91e11e74fbb62adb8c8c12b131623876d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 12 Aug 2025 16:10:23 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9812-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index ecc7d5420..aae1a6bfb 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -292,6 +292,7 @@ int32_t OH_WindowManager_InjectTouchEvent( /** * @brief Get all main window info on device. * + * @permission {ohos.permission.CUSTOM_SCREEN_CAPTURE} * @param infoList Indicates the pointer to a main window info list. * @param mainWindowInfoSize The size of main window info list. * @return Returns the status code of the execution. @@ -315,6 +316,7 @@ void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInf /** * @brief Get snapshot of the window with the specified id. * + * @permission {ohos.permission.CUSTOM_SCREEN_CAPTURE} * @param windowIdList Main window id list for getting snapshot. * @param windowIdListSize Size of main window id list. * @param config Configuration for getting snapshot. -- Gitee From 864163d1bfa89235064fe56f76ad32897f636850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 12 Aug 2025 16:27:45 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9812-3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index aae1a6bfb..b01e9ba10 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -292,7 +292,7 @@ int32_t OH_WindowManager_InjectTouchEvent( /** * @brief Get all main window info on device. * - * @permission {ohos.permission.CUSTOM_SCREEN_CAPTURE} + * @permission {@code ohos.permission.CUSTOM_SCREEN_CAPTURE} * @param infoList Indicates the pointer to a main window info list. * @param mainWindowInfoSize The size of main window info list. * @return Returns the status code of the execution. @@ -316,7 +316,7 @@ void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInf /** * @brief Get snapshot of the window with the specified id. * - * @permission {ohos.permission.CUSTOM_SCREEN_CAPTURE} + * @permission {@code ohos.permission.CUSTOM_SCREEN_CAPTURE} * @param windowIdList Main window id list for getting snapshot. * @param windowIdListSize Size of main window id list. * @param config Configuration for getting snapshot. -- Gitee From 1352bbcc393321a111a737d428c2e6fc13c39553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 12 Aug 2025 16:30:11 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9812-4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index b01e9ba10..6ecadcbfa 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -314,7 +314,7 @@ WindowManager_ErrorCode OH_NativeWindowManager_GetAllMainWindowInfo( void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInfo* infoList); /** - * @brief Get snapshot of the window with the specified id. + * @brief Get snapshot of the specified windows. * * @permission {@code ohos.permission.CUSTOM_SCREEN_CAPTURE} * @param windowIdList Main window id list for getting snapshot. -- Gitee From 6a22e9283d807aa9ba0c1a9aeed6db578cb50854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 12 Aug 2025 17:10:37 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9812-5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index 6ecadcbfa..059fafc41 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -334,8 +334,8 @@ WindowManager_ErrorCode OH_NativeWindowManager_GetMainWindowSnapshot(int32_t* wi /** * @brief Callback interface for getting main windows' snapshot. * - * @param snapshotPixelMapList list of windows' snapshot - * @param snapshotListSize size of snapshotPixelMapList + * @param snapshotPixelMapList List of windows' snapshot + * @param snapshotListSize Size of snapshotPixelMapList * @since 21 */ typedef void (*OH_NativeWindowManager_MainWindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, -- Gitee From 5481cf937b8b80728fc60312df18da78630e558a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 12 Aug 2025 17:43:14 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9812-6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index 059fafc41..e75ecd3d1 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -313,6 +313,16 @@ WindowManager_ErrorCode OH_NativeWindowManager_GetAllMainWindowInfo( */ void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInfo* infoList); +/** + * @brief Callback interface for getting main windows' snapshot. + * + * @param snapshotPixelMapList List of windows' snapshot + * @param snapshotListSize Size of snapshotPixelMapList + * @since 21 + */ +typedef void (*OH_NativeWindowManager_WindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, + size_t snapshotListSize); + /** * @brief Get snapshot of the specified windows. * @@ -331,16 +341,6 @@ void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInf WindowManager_ErrorCode OH_NativeWindowManager_GetMainWindowSnapshot(int32_t* windowIdList, size_t windowIdListSize, WindowManager_WindowSnapshotConfig config, OH_NativeWindowManager_WindowSnapshotCallback callback); -/** - * @brief Callback interface for getting main windows' snapshot. - * - * @param snapshotPixelMapList List of windows' snapshot - * @param snapshotListSize Size of snapshotPixelMapList - * @since 21 - */ -typedef void (*OH_NativeWindowManager_MainWindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, - size_t snapshotListSize) - /** * @brief Release main window snapshot list. * -- Gitee From e5368946c25cd0463877a2a7e9c0961bec40b61d Mon Sep 17 00:00:00 2001 From: ki_ja Date: Tue, 12 Aug 2025 13:48:38 +0000 Subject: [PATCH 08/12] update arkui/window_manager/oh_window.h. Signed-off-by: ki_ja --- arkui/window_manager/oh_window.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index e75ecd3d1..618411973 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -302,7 +302,7 @@ int32_t OH_WindowManager_InjectTouchEvent( * {@link WINDOW_MANAGER_ERRORCODE_SYSTEM_ABNORMAL} the window manager service works abnormally. * @since 21 */ -WindowManager_ErrorCode OH_NativeWindowManager_GetAllMainWindowInfo( +int32_t OH_WindowManager_GetAllMainWindowInfo( WindowManager_MainWindowInfo** infoList, size_t* mainWindowInfoSize); /** @@ -311,7 +311,7 @@ WindowManager_ErrorCode OH_NativeWindowManager_GetAllMainWindowInfo( * @param infoList Pointer to the main window info list. * @since 21 */ -void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInfo* infoList); +void OH_WindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInfo* infoList); /** * @brief Callback interface for getting main windows' snapshot. @@ -320,7 +320,7 @@ void OH_NativeWindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInf * @param snapshotListSize Size of snapshotPixelMapList * @since 21 */ -typedef void (*OH_NativeWindowManager_WindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, +typedef void (*OH_WindowManager_WindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, size_t snapshotListSize); /** @@ -338,8 +338,8 @@ typedef void (*OH_NativeWindowManager_WindowSnapshotCallback)(const OH_PixelmapN * {@link WINDOW_MANAGER_ERRORCODE_SYSTEM_ABNORMAL} the window manager service works abnormally. * @since 21 */ -WindowManager_ErrorCode OH_NativeWindowManager_GetMainWindowSnapshot(int32_t* windowIdList, size_t windowIdListSize, - WindowManager_WindowSnapshotConfig config, OH_NativeWindowManager_WindowSnapshotCallback callback); +int32_t OH_WindowManager_GetMainWindowSnapshot(int32_t* windowIdList, size_t windowIdListSize, + WindowManager_WindowSnapshotConfig config, OH_WindowManager_WindowSnapshotCallback callback); /** * @brief Release main window snapshot list. @@ -347,7 +347,7 @@ WindowManager_ErrorCode OH_NativeWindowManager_GetMainWindowSnapshot(int32_t* wi * @param snapshotPixelMapList Indicates the pointer of a windows' snapshot list. * @since 21 */ -void OH_NativeWindowManager_ReleaseMainWindowSnapshot(const OH_PixelmapNative* snapshotPixelMapList); +void OH_WindowManager_ReleaseMainWindowSnapshot(const OH_PixelmapNative* snapshotPixelMapList); #ifdef __cplusplus } -- Gitee From 3b004e38fb6e124225bf6e790826451ab5c02409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Wed, 13 Aug 2025 08:40:05 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9813-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window_comm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index 5f20b710a..46be3abab 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -236,7 +236,7 @@ typedef struct { */ typedef struct { /** Display id of the window. */ - int64_t displayId; + uint64_t displayId; /** Window id. */ int32_t windowId;; /** Showing state of the window. */ -- Gitee From d221c5c51a148a85da64c948ee5b345f747f18ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Tue, 26 Aug 2025 09:28:31 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window_comm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index 46be3abab..ad05a1695 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -238,7 +238,7 @@ typedef struct { /** Display id of the window. */ uint64_t displayId; /** Window id. */ - int32_t windowId;; + int32_t windowId; /** Showing state of the window. */ bool showing; /** Label of the window. */ -- Gitee From 52a44a3463d6abe54a1918b4107980c903689eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Wed, 27 Aug 2025 11:06:51 +0800 Subject: [PATCH 11/12] =?UTF-8?q?0827=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index 618411973..19d2de529 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -292,7 +292,7 @@ int32_t OH_WindowManager_InjectTouchEvent( /** * @brief Get all main window info on device. * - * @permission {@code ohos.permission.CUSTOM_SCREEN_CAPTURE} + * @permission ohos.permission.CUSTOM_SCREEN_CAPTURE * @param infoList Indicates the pointer to a main window info list. * @param mainWindowInfoSize The size of main window info list. * @return Returns the status code of the execution. @@ -319,14 +319,14 @@ void OH_WindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInfo* inf * @param snapshotPixelMapList List of windows' snapshot * @param snapshotListSize Size of snapshotPixelMapList * @since 21 - */ -typedef void (*OH_WindowManager_WindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, + */ +typedef struct (*OH_WindowManager_WindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, size_t snapshotListSize); /** * @brief Get snapshot of the specified windows. * - * @permission {@code ohos.permission.CUSTOM_SCREEN_CAPTURE} + * @permission ohos.permission.CUSTOM_SCREEN_CAPTURE * @param windowIdList Main window id list for getting snapshot. * @param windowIdListSize Size of main window id list. * @param config Configuration for getting snapshot. -- Gitee From d3bcc582c865c96068079757f78201995bd14d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A0=91=E5=B1=B1?= Date: Wed, 27 Aug 2025 11:28:35 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈树山 --- arkui/window_manager/oh_window.h | 4 ++-- arkui/window_manager/oh_window_comm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arkui/window_manager/oh_window.h b/arkui/window_manager/oh_window.h index 19d2de529..6bd58b82a 100644 --- a/arkui/window_manager/oh_window.h +++ b/arkui/window_manager/oh_window.h @@ -320,13 +320,13 @@ void OH_WindowManager_ReleaseAllMainWindowInfo(WindowManager_MainWindowInfo* inf * @param snapshotListSize Size of snapshotPixelMapList * @since 21 */ -typedef struct (*OH_WindowManager_WindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, +typedef void (*OH_WindowManager_WindowSnapshotCallback)(const OH_PixelmapNative* snapshotPixelMapList, size_t snapshotListSize); /** * @brief Get snapshot of the specified windows. * - * @permission ohos.permission.CUSTOM_SCREEN_CAPTURE + * @permission @code ohos.permission.CUSTOM_SCREEN_CAPTURE * @param windowIdList Main window id list for getting snapshot. * @param windowIdListSize Size of main window id list. * @param config Configuration for getting snapshot. diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index ad05a1695..46be3abab 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -238,7 +238,7 @@ typedef struct { /** Display id of the window. */ uint64_t displayId; /** Window id. */ - int32_t windowId; + int32_t windowId;; /** Showing state of the window. */ bool showing; /** Label of the window. */ -- Gitee