From fafefe893ea04daf4296182d6e30bcd43f6c8fd5 Mon Sep 17 00:00:00 2001
From: BrainL <libuyan1@huawei.com>
Date: Sat, 1 Feb 2025 17:25:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6idl=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 <libuyan1@huawei.com>
---
 interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp | 7 +++++--
 interfaces/kits/js/src/mod_fs/properties/connectdfs.h   | 3 ++-
 2 files changed, 7 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 c3dc7fdb0..4403dee8a 100644
--- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp
@@ -32,6 +32,8 @@ namespace OHOS {
 namespace FileManagement {
 namespace ModuleFileIO {
 namespace fs = std::filesystem;
+const int ERR_NOEER = 0;
+const int ERR_NULLPTR = -1;
 
 ConnectDfsCB *ConnectDfs::CreateConnectDfsCBCBInfo(napi_env &env)
 {
@@ -283,14 +285,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 +312,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 42438ad2e..9f662d5c5 100644
--- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.h
+++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.h
@@ -37,6 +37,7 @@ using namespace OHOS::AppExecFwk;
 
 napi_value WrapInt32(napi_env &env, int32_t num, const std::string &paramName);
 napi_value WrapString(napi_env &env, const std::string &param, const std::string &paramName);
+using namespace OHOS::Storage::DistributedFile;
 
 struct CallbackInfo {
     napi_env env;
@@ -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


From c682fe9a90fdb645d35612f48e504bee6efa2def Mon Sep 17 00:00:00 2001
From: BrainL <libuyan1@huawei.com>
Date: Mon, 3 Feb 2025 15:25:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=90=E7=B3=BB=E7=BB=9FIDL=E5=8C=96=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: BrainL <libuyan1@huawei.com>
---
 interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp | 1 +
 interfaces/kits/js/src/mod_fs/properties/connectdfs.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp
index 4403dee8a..6bb9bf3dc 100644
--- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp
@@ -32,6 +32,7 @@ namespace OHOS {
 namespace FileManagement {
 namespace ModuleFileIO {
 namespace fs = std::filesystem;
+
 const int ERR_NOEER = 0;
 const int ERR_NULLPTR = -1;
 
diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.h b/interfaces/kits/js/src/mod_fs/properties/connectdfs.h
index 9f662d5c5..4f9e64049 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 &paramName);
 napi_value WrapString(napi_env &env, const std::string &param, const std::string &paramName);
-- 
Gitee