From ad6797f9f8f8cb3fda01d6b2b8ec6bb592e523a8 Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Mon, 2 Dec 2024 14:40:23 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkui/window_manager/oh_window_comm.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index f2e3a08d5..7acb5a15e 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -58,6 +58,20 @@ typedef enum { SERVICE_ERROR = 2000, } WindowManager_ErrorCode; +/** + * @brief Enumerates the result types of the wm interface + * + * @since 12 + */ +enum WindowManager_ErrorCode_Test{ + /** succ. */ + OK = 0, + /** window id is invaild. */ + INVAILD_WINDOW_ID = 1000, + /** failed. */ + SERVICE_ERROR = 2000, +}; + #ifdef __cplusplus } #endif -- Gitee From 203b9e276a947a6d77c54d3cd6876c89232319b7 Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Tue, 3 Dec 2024 16:02:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkui/window_manager/oh_window_comm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index 7acb5a15e..4b8f93dc9 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -54,8 +54,6 @@ typedef enum { OK = 0, /** window id is invaild. */ INVAILD_WINDOW_ID = 1000, - /** failed. */ - SERVICE_ERROR = 2000, } WindowManager_ErrorCode; /** -- Gitee From e09916283e02ea88991f1979e0ddb79f68a5e991 Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Sat, 7 Dec 2024 10:13:32 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5(=E6=B5=8B?= =?UTF-8?q?=E8=AF=95since=E5=80=BC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkui/ace_engine/native/drag_and_drop.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index 2f68d95b0..6e95e91d0 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -124,6 +124,8 @@ typedef enum { ARKUI_DRAG_STATUS_STARTED, /** Ended. */ ARKUI_DRAG_STATUS_ENDED, + + ARKUI_DRAG_STATUS_UNKNOWN_TEST = 1, } ArkUI_DragStatus; /** -- Gitee From 646088f69cb7a86e125b0a94cbd0854ff92acc6d Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Sat, 7 Dec 2024 17:09:11 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkui/window_manager/oh_window_comm.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index 4b8f93dc9..620075473 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -53,23 +53,9 @@ typedef enum { /** succ. */ OK = 0, /** window id is invaild. */ - INVAILD_WINDOW_ID = 1000, + INVAILD_WINDOW_ID = 2000, } WindowManager_ErrorCode; -/** - * @brief Enumerates the result types of the wm interface - * - * @since 12 - */ -enum WindowManager_ErrorCode_Test{ - /** succ. */ - OK = 0, - /** window id is invaild. */ - INVAILD_WINDOW_ID = 1000, - /** failed. */ - SERVICE_ERROR = 2000, -}; - #ifdef __cplusplus } #endif -- Gitee From 78a5e25a445d875d9dd8f63b48025363b9002468 Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Sat, 7 Dec 2024 17:10:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkui/window_manager/oh_window_comm.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arkui/window_manager/oh_window_comm.h b/arkui/window_manager/oh_window_comm.h index 620075473..f2e3a08d5 100644 --- a/arkui/window_manager/oh_window_comm.h +++ b/arkui/window_manager/oh_window_comm.h @@ -53,7 +53,9 @@ typedef enum { /** succ. */ OK = 0, /** window id is invaild. */ - INVAILD_WINDOW_ID = 2000, + INVAILD_WINDOW_ID = 1000, + /** failed. */ + SERVICE_ERROR = 2000, } WindowManager_ErrorCode; #ifdef __cplusplus -- Gitee From 29d7a7f4cd50bf2b8febc62dccb02e52877be538 Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Fri, 17 Jan 2025 10:07:18 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ability/ability_runtime/child_process/native_child_process.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ability/ability_runtime/child_process/native_child_process.h b/ability/ability_runtime/child_process/native_child_process.h index a60cca635..b6c1d6528 100644 --- a/ability/ability_runtime/child_process/native_child_process.h +++ b/ability/ability_runtime/child_process/native_child_process.h @@ -44,6 +44,8 @@ extern "C" { #endif +typedef abc abc; + /** * @brief Enumerates the error codes used by the native child process module. * @since 12 -- Gitee From 0bfa37c3b593ee1f30458d38750fba173ecaa1e9 Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Tue, 21 Jan 2025 15:22:17 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../child_process/native_child_process.h | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/ability/ability_runtime/child_process/native_child_process.h b/ability/ability_runtime/child_process/native_child_process.h index b6c1d6528..1e10fcc4a 100644 --- a/ability/ability_runtime/child_process/native_child_process.h +++ b/ability/ability_runtime/child_process/native_child_process.h @@ -134,47 +134,6 @@ typedef enum Ability_NativeChildProcess_ErrCode { */ typedef void (*OH_Ability_OnNativeChildProcessStarted)(int errCode, OHIPCRemoteProxy *remoteProxy); -/** - * @brief Creates a child process, loads the specified dynamic library file, and returns the startup result - * asynchronously through a callback parameter. - * The callback notification is an independent thread. When implementing the callback function, - * pay attention to thread synchronization and do not perform time-consuming operations to avoid long-time blocking. - * - * The dynamic library specified must implement and export the following functions:\n - * 1. OHIPCRemoteStub* NativeChildProcess_OnConnect()\n - * 2. void NativeChildProcess_MainProc()\n - * - * The processing logic sequence is shown in the following pseudocode: \n - * Main process: \n - * 1. OH_Ability_CreateNativeChildProcess(libName, onProcessStartedCallback)\n - * Child process: \n - * 2. dlopen(libName)\n - * 3. dlsym("NativeChildProcess_OnConnect")\n - * 4. dlsym("NativeChildProcess_MainProc")\n - * 5. ipcRemote = NativeChildProcess_OnConnect()\n - * 6. NativeChildProcess_MainProc()\n - * Main process: \n - * 7. onProcessStartedCallback(ipcRemote, errCode)\n - * Child process: \n - * 8. The child process exits after the NativeChildProcess_MainProc() function is returned. \n - * - * @param libName Name of the dynamic library file loaded in the child process. The value cannot be nullptr. - * @param onProcessStarted Pointer to the callback function for notifying the child process startup result. - * The value cannot be nullptr. For details, see {@link OH_Ability_OnNativeChildProcessStarted}. - * @return Returns {@link NCP_NO_ERROR} if the call is successful, but the actual startup result is notified by the - * callback function.\n - * Returns {@link NCP_ERR_INVALID_PARAM} if the dynamic library name or callback function pointer is invalid.\n - * Returns {@link NCP_ERR_NOT_SUPPORTED} if the device does not support the creation of native child processes.\n - * Returns {@link NCP_ERR_MULTI_PROCESS_DISABLED} if the multi-process mode is disabled on the device.\n - * Returns {@link NCP_ERR_ALREADY_IN_CHILD} if it is not allowed to create another child process in the child process.\n - * Returns {@link NCP_ERR_MAX_CHILD_PROCESSES_REACHED} if the maximum number of native child processes is reached.\n - * For details, see {@link Ability_NativeChildProcess_ErrCode}. - * @see OH_Ability_OnNativeChildProcessStarted - * @since 12 - */ -int OH_Ability_CreateNativeChildProcess(const char* libName, - OH_Ability_OnNativeChildProcessStarted onProcessStarted); - /** * @brief The info of the file descriptors passed to child process. * @since 13 -- Gitee From 3a0d65b71225178b09c440f4dfea41cb47c488a7 Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Wed, 22 Jan 2025 10:04:38 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AbilityKit/ability_base/ability_base_common.h | 2 + .../child_process/native_child_process.h | 43 ++++++++++++++++++- arkui/ace_engine/native/drag_and_drop.h | 2 - 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/AbilityKit/ability_base/ability_base_common.h b/AbilityKit/ability_base/ability_base_common.h index 382f72910..b9e4b6537 100644 --- a/AbilityKit/ability_base/ability_base_common.h +++ b/AbilityKit/ability_base/ability_base_common.h @@ -51,6 +51,8 @@ typedef enum { ABILITY_BASE_ERROR_CODE_NO_ERROR = 0, /** @error Invalid parameters. */ ABILITY_BASE_ERROR_CODE_PARAM_INVALID = 401, + /** @error Invalid parameters. */ + ABILITY_BASE_ERROR_CODE_PARAM_INVALID_TEST = 402 } AbilityBase_ErrorCode; #ifdef __cplusplus diff --git a/ability/ability_runtime/child_process/native_child_process.h b/ability/ability_runtime/child_process/native_child_process.h index 1e10fcc4a..a60cca635 100644 --- a/ability/ability_runtime/child_process/native_child_process.h +++ b/ability/ability_runtime/child_process/native_child_process.h @@ -44,8 +44,6 @@ extern "C" { #endif -typedef abc abc; - /** * @brief Enumerates the error codes used by the native child process module. * @since 12 @@ -134,6 +132,47 @@ typedef enum Ability_NativeChildProcess_ErrCode { */ typedef void (*OH_Ability_OnNativeChildProcessStarted)(int errCode, OHIPCRemoteProxy *remoteProxy); +/** + * @brief Creates a child process, loads the specified dynamic library file, and returns the startup result + * asynchronously through a callback parameter. + * The callback notification is an independent thread. When implementing the callback function, + * pay attention to thread synchronization and do not perform time-consuming operations to avoid long-time blocking. + * + * The dynamic library specified must implement and export the following functions:\n + * 1. OHIPCRemoteStub* NativeChildProcess_OnConnect()\n + * 2. void NativeChildProcess_MainProc()\n + * + * The processing logic sequence is shown in the following pseudocode: \n + * Main process: \n + * 1. OH_Ability_CreateNativeChildProcess(libName, onProcessStartedCallback)\n + * Child process: \n + * 2. dlopen(libName)\n + * 3. dlsym("NativeChildProcess_OnConnect")\n + * 4. dlsym("NativeChildProcess_MainProc")\n + * 5. ipcRemote = NativeChildProcess_OnConnect()\n + * 6. NativeChildProcess_MainProc()\n + * Main process: \n + * 7. onProcessStartedCallback(ipcRemote, errCode)\n + * Child process: \n + * 8. The child process exits after the NativeChildProcess_MainProc() function is returned. \n + * + * @param libName Name of the dynamic library file loaded in the child process. The value cannot be nullptr. + * @param onProcessStarted Pointer to the callback function for notifying the child process startup result. + * The value cannot be nullptr. For details, see {@link OH_Ability_OnNativeChildProcessStarted}. + * @return Returns {@link NCP_NO_ERROR} if the call is successful, but the actual startup result is notified by the + * callback function.\n + * Returns {@link NCP_ERR_INVALID_PARAM} if the dynamic library name or callback function pointer is invalid.\n + * Returns {@link NCP_ERR_NOT_SUPPORTED} if the device does not support the creation of native child processes.\n + * Returns {@link NCP_ERR_MULTI_PROCESS_DISABLED} if the multi-process mode is disabled on the device.\n + * Returns {@link NCP_ERR_ALREADY_IN_CHILD} if it is not allowed to create another child process in the child process.\n + * Returns {@link NCP_ERR_MAX_CHILD_PROCESSES_REACHED} if the maximum number of native child processes is reached.\n + * For details, see {@link Ability_NativeChildProcess_ErrCode}. + * @see OH_Ability_OnNativeChildProcessStarted + * @since 12 + */ +int OH_Ability_CreateNativeChildProcess(const char* libName, + OH_Ability_OnNativeChildProcessStarted onProcessStarted); + /** * @brief The info of the file descriptors passed to child process. * @since 13 diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index 6e95e91d0..2f68d95b0 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -124,8 +124,6 @@ typedef enum { ARKUI_DRAG_STATUS_STARTED, /** Ended. */ ARKUI_DRAG_STATUS_ENDED, - - ARKUI_DRAG_STATUS_UNKNOWN_TEST = 1, } ArkUI_DragStatus; /** -- Gitee From 062455820f495f73845e709f19666d3d8ded6fbc Mon Sep 17 00:00:00 2001 From: cwx1281816 Date: Wed, 22 Jan 2025 10:34:27 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AbilityKit/ability_base/want.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AbilityKit/ability_base/want.h b/AbilityKit/ability_base/want.h index 49110a541..ef447c274 100644 --- a/AbilityKit/ability_base/want.h +++ b/AbilityKit/ability_base/want.h @@ -57,6 +57,8 @@ typedef struct AbilityBase_Element { char* moduleName; /** Indicates the name of ability. */ char* abilityName; + /** Indicates the name of ability. */ + char* abilityNameTest; } AbilityBase_Element; struct AbilityBase_Want; -- Gitee