From f1eb286dcb7a55b26f4ca87b8b7ff1653f7af4e7 Mon Sep 17 00:00:00 2001 From: BrainL Date: Mon, 3 Feb 2025 14:16:47 +0800 Subject: [PATCH] =?UTF-8?q?dfs=5Fservice=20IDL=E5=8C=96=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL Change-Id: I613b8a2262362dfd1144b5a7c5f0f9859ad900d2 --- interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp | 8 ++++++-- interfaces/kits/js/src/mod_fs/properties/connectdfs.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp index c3dc7fd..6bb9bf3 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp @@ -33,6 +33,9 @@ namespace FileManagement { namespace ModuleFileIO { namespace fs = std::filesystem; +const int ERR_NOEER = 0; +const int ERR_NULLPTR = -1; + ConnectDfsCB *ConnectDfs::CreateConnectDfsCBCBInfo(napi_env &env) { HILOGI("CreateConnectDfsCBCBInfo called"); @@ -283,14 +286,14 @@ void UvWorkAfterOnStaus(ConnectDfsCB *connectDfsCB) HILOGI("UvWorkAfterOnStaus end"); } -void NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) +int32_t NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) { HILOGI("NAPIDfsListener::OnStatus called"); auto connectDfsCB = new (std::nothrow) ConnectDfsCB; if (connectDfsCB == nullptr) { HILOGE("NAPIDfsListener::OnStatus, connectDfsCb == nullptr"); - return; + return ERR_NULLPTR; } connectDfsCB->cbBase.cbInfo.env = env_; if (onStatusRef_ != nullptr) { @@ -310,6 +313,7 @@ void NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) connectDfsCB = nullptr; } HILOGI("NAPIDfsListener::OnStatus end"); + return ERR_NOEER; } } // namespace ModuleFileIO diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.h b/interfaces/kits/js/src/mod_fs/properties/connectdfs.h index 42438ad..1a100fa 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.h +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.h @@ -34,6 +34,7 @@ namespace ModuleFileIO { using namespace std; using namespace OHOS::FileManagement::LibN; using namespace OHOS::AppExecFwk; +using namespace OHOS::Storage::DistributedFile; napi_value WrapInt32(napi_env &env, int32_t num, const std::string ¶mName); napi_value WrapString(napi_env &env, const std::string ¶m, const std::string ¶mName); @@ -57,7 +58,7 @@ struct DfsConnectCB { class NAPIDfsListener : public FileDfsListenerStub { public: - void OnStatus(const std::string &networkId, int32_t status) override; + int32_t OnStatus(const std::string &networkId, int32_t status) override; void SetConnectDfsEnv(const napi_env &env); void SetConnectDfsCBRef(const napi_ref &ref); void SetConnectDfsPromiseRef(const napi_deferred &promiseDeferred); -- Gitee