From b15010b980b1ca3ba1443e795ad2d60e8fdfd73a Mon Sep 17 00:00:00 2001 From: "zhaoyuan17@huawei.com" Date: Wed, 29 Sep 2021 13:58:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4exception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoyuan17@huawei.com --- interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp b/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp index 113a936f5ea..1209bd61422 100644 --- a/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp +++ b/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp @@ -19,7 +19,6 @@ #include "napi/native_node_api.h" #include #include -#include using namespace OHOS; using namespace OHOS::AAFwk; -- Gitee From 481acf7c51bdfccda7ef4bdeaeaf474aad12095c Mon Sep 17 00:00:00 2001 From: "zhaoyuan17@huawei.com" Date: Wed, 29 Sep 2021 15:10:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4exception-patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoyuan17@huawei.com --- .../napi/aafwk/formManager/napi_form_manager.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp b/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp index 1209bd61422..14c2dba7fec 100644 --- a/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp +++ b/interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp @@ -2156,16 +2156,16 @@ napi_value NAPI_GetAllFormsInfo(napi_env env, napi_callback_info info) [](napi_env env, void *data) { HILOG_INFO("%{public}s, napi_create_async_work running", __func__); - AsyncGetAllFormsCallbackInfo *asyncCallbackInfo = + AsyncGetAllFormsCallbackInfo *asyncCallbackInfo = (AsyncGetAllFormsCallbackInfo *)data; InnerGetAllFormsInfo(env, asyncCallbackInfo); }, [](napi_env env, napi_status status, void *data) { - HILOG_INFO("%{public}s, napi_create_async_work complete", __func__); + HILOG_INFO("%{public}s, napi_create_async_work complete", __func__); - AsyncGetAllFormsCallbackInfo *asyncCallbackInfo = - (AsyncGetAllFormsCallbackInfo *)data; + AsyncGetAllFormsCallbackInfo *asyncCallbackInfo = + (AsyncGetAllFormsCallbackInfo *)data; napi_value arrayFormInfos; napi_create_array(env, &arrayFormInfos); @@ -2461,8 +2461,8 @@ static void InnerGetFormsInfoByModule(napi_env env, AsyncGetFormsInfoByModuleCal OHOS::AppExecFwk::Ability *ability = asyncCallbackInfo->ability; bool ret = ability->GetFormsInfoByModule( - asyncCallbackInfo->bundleName, - asyncCallbackInfo->moduleName, + asyncCallbackInfo->bundleName, + asyncCallbackInfo->moduleName, asyncCallbackInfo->formInfos); if (ret) { @@ -2621,7 +2621,7 @@ napi_value NAPI_GetFormsInfoByModule(napi_env env, napi_callback_info info) [](napi_env env, void *data) { HILOG_INFO("%{public}s, promise runnning", __func__); - AsyncGetFormsInfoByModuleCallbackInfo *asyncCallbackInfo = + AsyncGetFormsInfoByModuleCallbackInfo *asyncCallbackInfo = (AsyncGetFormsInfoByModuleCallbackInfo *)data; InnerGetFormsInfoByModule(env, asyncCallbackInfo); @@ -2629,7 +2629,7 @@ napi_value NAPI_GetFormsInfoByModule(napi_env env, napi_callback_info info) [](napi_env env, napi_status status, void *data) { HILOG_INFO("%{public}s, promise complete", __func__); - AsyncGetFormsInfoByModuleCallbackInfo *asyncCallbackInfo = + AsyncGetFormsInfoByModuleCallbackInfo *asyncCallbackInfo = (AsyncGetFormsInfoByModuleCallbackInfo *)data; napi_value arrayFormInfos; -- Gitee