From dd870668bac148191af4b2e5c998583aaa0ede4a Mon Sep 17 00:00:00 2001
From: zhangxiaoliang25 <zhangxiaoliang25@huawei.com>
Date: Mon, 15 May 2023 14:06:08 +0000
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8mkdir=20=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?Signed-off-by:=20zhangxiaoliang25=20<zhangxiaoliang25@huawei.co?=
 =?UTF-8?q?m>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I914bb8e767a7d416429b543cb55b9bb908f4c407
---
 .../file_access_ext_ability.js                | 29 +++++++++++++++++++
 .../src/js_file_access_ext_ability.cpp        |  6 ++--
 .../FileExtensionAbility.ts                   |  1 +
 test/unittest/external_file_access_test.cpp   |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js b/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js
index 3ada907e..66834674 100644
--- a/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js
+++ b/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js
@@ -13,7 +13,31 @@
  * limitations under the License.
  */
 
+// import fileio from '@ohos.fileio';
+// import hilog from '@ohos.hilog';
+// import baseUri from '@ohos.uri';
+// const URI_SCHEME = 'datashare://';
+// const FILE_SCHEME_NAME = 'file';
+// const FILE_PREFIX_NAME = 'file://';
+// const DOMAIN_CODE = 0x0001;
+// const TAG = 'ExternalFileManager';
+// const ERR_OK = 0;
+// const ERR_ERROR = -1;
+// const E_URIS = 14300002;
+
+
 class FileAccessExtensionAbility {
+
+  // genNewFileUri(uri, displayName) {
+  //   let newFileUri = uri;
+  //   if (uri.charAt(uri.length - 1) === '/') {
+  //     newFileUri += displayName;
+  //   } else {
+  //     newFileUri += '/' + displayName;
+  //   }
+  //   return newFileUri;
+  // }
+
   onCreate(want) {
   }
 
@@ -31,6 +55,7 @@ class FileAccessExtensionAbility {
     };
   }
 
+
   mkdir(parentUri, displayName) {
     return {
       uri: "",
@@ -38,6 +63,10 @@ class FileAccessExtensionAbility {
     };
   }
 
+  test_func(){
+    return "zxl_zxl";
+  }
+
   delete(selectFileUri) {
     return {
       code: ERR_ERROR,
diff --git a/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp b/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp
index 231cc6ff..3070ebcd 100644
--- a/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp
+++ b/interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp
@@ -76,7 +76,9 @@ void JsFileAccessExtAbility::Init(const std::shared_ptr<AbilityLocalRecord> &rec
     std::string moduleName(Extension::abilityInfo_->moduleName);
     moduleName.append("::").append(abilityInfo_->name);
     HandleScope handleScope(jsRuntime_);
-
+    HILOG_INFO("moduleName_zxl=%{public}s", moduleName.c_str());
+    HILOG_INFO("srcPath_zxl=%{public}s", srcPath.c_str());
+    HILOG_INFO("hapPath=%{public}s", (abilityInfo_->hapPath).c_str());
     jsObj_ = jsRuntime_.LoadModule(moduleName, srcPath, abilityInfo_->hapPath);
     if (jsObj_ == nullptr) {
         HILOG_ERROR("Failed to get jsObj_");
@@ -452,7 +454,7 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN
 
         return ret;
     };
-
+    HILOG_INFO("zxl:mkdir");
     auto errCode = CallJsMethod("mkdir", jsRuntime_, jsObj_.get(), argParser, retParser);
     if (errCode != ERR_OK) {
         HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode);
diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts
index cd02eaf7..a4d7c430 100644
--- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts
+++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts
@@ -223,6 +223,7 @@ export default class FileExtAbility extends Extension {
   }
 
   mkdir(parentUri, displayName): {string, number} {
+    hilog.info(DOMAIN_CODE, TAG, 'zxl_zxl:'+test_func());
     if (!this.checkUri(parentUri)) {
       return {
         uri: '',
diff --git a/test/unittest/external_file_access_test.cpp b/test/unittest/external_file_access_test.cpp
index 2067e101..28bf7fc7 100644
--- a/test/unittest/external_file_access_test.cpp
+++ b/test/unittest/external_file_access_test.cpp
@@ -89,6 +89,7 @@ public:
             auto element = wantVec[i].GetElement();
             if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" &&
                 element.GetAbilityName() == "FileExtensionAbility") {
+                GTEST_LOG_(INFO) << ("find want " + element.GetAbilityName());
                 want = wantVec[i];
                 sus = true;
                 break;
-- 
Gitee