From c7dcf890db0cd55bc48e8411b3862b5c1af2fa6d Mon Sep 17 00:00:00 2001 From: lyujiayi <654765554@qq.com> Date: Wed, 23 Jul 2025 10:51:24 +0800 Subject: [PATCH] fix: modify the overload method Signed-off-by: lyujiayi <654765554@qq.com> --- .../idl/ohos.fileshare.fileShare.taihe | 36 ++++++++++++++++--- .../taihe/fileshare/src/fileshare_taihe.cpp | 5 +++ .../taihe/fileuri/idl/ohos.file.fileuri.taihe | 2 +- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/interfaces/kits/taihe/fileshare/idl/ohos.fileshare.fileShare.taihe b/interfaces/kits/taihe/fileshare/idl/ohos.fileshare.fileShare.taihe index 0ad3bdf30..52f44a8c7 100644 --- a/interfaces/kits/taihe/fileshare/idl/ohos.fileshare.fileShare.taihe +++ b/interfaces/kits/taihe/fileshare/idl/ohos.fileshare.fileShare.taihe @@ -43,27 +43,53 @@ function MakePolicyInfo(uri: String, operationMode: i32): PolicyInfo; function MakePathPolicyInfo(path: String, operationMode: OperationMode): PathPolicyInfo; -@gen_promise("activatePermission") function ActivatePermissionSync( policies: Array ): void; -@gen_promise("deactivatePermission") +@promise +function ActivatePermission( + policies: Array +): void; + function DeactivatePermissionSync( policies: Array ): void; -@gen_async("grantUriPermission") -@gen_promise("grantUriPermission") +@promise +function DeactivatePermission( + policies: Array +): void; + function GrantUriPermissionSync( uri:String, bundleName:String, flag: @sts_type("wantConstant.Flags") Opaque, ): void; -@gen_promise("checkPathPermission") +@static_overload("grantUriPermission") +@async function GrantUriPermissionWithCallback( + uri:String, + bundleName:String, + flag: @sts_type("wantConstant.Flags") Opaque, +): void; + +@static_overload("grantUriPermission") +@promise function GrantUriPermissionReturnsPromise( + uri:String, + bundleName:String, + flag: @sts_type("wantConstant.Flags") Opaque, +): void; + function CheckPathPermissionSync( tokenID: i32, policies: Array, policyType: PolicyType, ): Array; + +@promise +function CheckPathPermission( + tokenID: i32, + policies: Array, + policyType: PolicyType, +): Array; diff --git a/interfaces/kits/taihe/fileshare/src/fileshare_taihe.cpp b/interfaces/kits/taihe/fileshare/src/fileshare_taihe.cpp index 65f4a3cb6..4b0b0ae62 100644 --- a/interfaces/kits/taihe/fileshare/src/fileshare_taihe.cpp +++ b/interfaces/kits/taihe/fileshare/src/fileshare_taihe.cpp @@ -389,7 +389,12 @@ taihe::array CheckPathPermissionSync(int32_t tokenID, TH_EXPORT_CPP_API_MakePolicyInfo(ANI::FileShare::MakePolicyInfo); TH_EXPORT_CPP_API_MakePathPolicyInfo(ANI::FileShare::MakePathPolicyInfo); TH_EXPORT_CPP_API_ActivatePermissionSync(ANI::FileShare::ActivatePermissionSync); +TH_EXPORT_CPP_API_ActivatePermission(ANI::FileShare::ActivatePermissionSync); TH_EXPORT_CPP_API_DeactivatePermissionSync(ANI::FileShare::DeactivatePermissionSync); +TH_EXPORT_CPP_API_DeactivatePermission(ANI::FileShare::DeactivatePermissionSync); TH_EXPORT_CPP_API_GrantUriPermissionSync(ANI::FileShare::GrantUriPermissionSync); +TH_EXPORT_CPP_API_GrantUriPermissionWithCallback(ANI::FileShare::GrantUriPermissionSync); +TH_EXPORT_CPP_API_GrantUriPermissionReturnsPromise(ANI::FileShare::GrantUriPermissionSync); TH_EXPORT_CPP_API_CheckPathPermissionSync(ANI::FileShare::CheckPathPermissionSync); +TH_EXPORT_CPP_API_CheckPathPermission(ANI::FileShare::CheckPathPermissionSync); // NOLINTEND diff --git a/interfaces/kits/taihe/fileuri/idl/ohos.file.fileuri.taihe b/interfaces/kits/taihe/fileuri/idl/ohos.file.fileuri.taihe index b2c25a848..27b55a3a5 100644 --- a/interfaces/kits/taihe/fileuri/idl/ohos.file.fileuri.taihe +++ b/interfaces/kits/taihe/fileuri/idl/ohos.file.fileuri.taihe @@ -25,7 +25,7 @@ interface FileUri { getName(): String; } -@ctor("FileUri") +@rename @constructor("FileUri") function makeFileUri(name: String): FileUri; function getUriFromPath(path: String): String; -- Gitee