From f37bf2ad0a55e875a6fbf2cb8b98601f5c300aa9 Mon Sep 17 00:00:00 2001 From: y30045862 Date: Thu, 2 Nov 2023 14:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E8=BD=BD=E7=82=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9C=80=E8=BF=91=E8=AE=BF=E9=97=AE=E6=9C=80=E8=BF=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=80=82=E9=85=8D=20Signed-off-by:=20yangjingbo10=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8a75d857e9b22e3e7b55ff01b99547cfc82eee30 --- .../kits/native/recent/recent_n_exporter.h | 2 +- .../trash/include/file_trash_n_exporter.h | 3 +-- .../FileExtensionAbility.ts | 2 +- .../FileExtensionAbility/ListScanFileInfo.ts | 17 +++-------------- .../resources/base/profile/backup_config.json | 4 ++++ 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/interfaces/kits/native/recent/recent_n_exporter.h b/interfaces/kits/native/recent/recent_n_exporter.h index a4105dab..82565ba8 100644 --- a/interfaces/kits/native/recent/recent_n_exporter.h +++ b/interfaces/kits/native/recent/recent_n_exporter.h @@ -42,7 +42,7 @@ public: ~RecentNExporter() override; }; -const std::string RECENT_PATH = "/storage/.Recent/Users/100/"; +const std::string RECENT_PATH = "/storage/Users/currentUser/.Recent"; const std::string FILE_ACCESS_PERMISSION = "ohos.permission.FILE_ACCESS_MANAGER"; constexpr int BUF_SIZE = 1024; constexpr int MAX_RECENT_SIZE = 100; diff --git a/interfaces/kits/native/trash/include/file_trash_n_exporter.h b/interfaces/kits/native/trash/include/file_trash_n_exporter.h index 080168cb..648a3e6f 100644 --- a/interfaces/kits/native/trash/include/file_trash_n_exporter.h +++ b/interfaces/kits/native/trash/include/file_trash_n_exporter.h @@ -26,8 +26,7 @@ namespace OHOS { namespace Trash { using namespace FileManagement::LibN; using namespace std; -// 暂时默认用户100 -const std::string TRASH_PATH = "/storage/.Trash/Users/100"; +const std::string TRASH_PATH = "/storage/Users/currentUser/.Trash"; const std::string TRASH_SUB_DIR = "oh_trash_content"; /** 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 50945e1d..1b99d07e 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 @@ -57,7 +57,7 @@ const MOVED_FROM = 3; const MOVED_SELF = 4; const DEVICE_ONLINE = 5; const DEVICE_OFFLINE = 6; -const TRASH_PATH = '/storage/.Trash/Users/100/'; +const TRASH_PATH = '/storage/Users/currentUser/.Trash/'; const TRASH_SUB_FODER = '/oh_trash_content'; const EXTERNAL_PATH = '/storage/External'; let observerMap = new Map(); diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts index 1610c791..9c7e6c87 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +// @ts-nocheck import hilog from '@ohos.hilog'; import fs from '@ohos.file.fs'; import type { Filter } from '@ohos.file.fs'; @@ -61,7 +62,7 @@ function buildDisplayName(displayNameArray: string[]) : string[] { function buildFilterOptions(filter: Filter, listNum: number, recursion: boolean) : {recursion: boolean, listNum: number, filter: Filter} { - let optionFilter: Filter = {}; + let optionFilter: Filter = {'hidden': true}; if (filter !== null) { let suffixArray = filter.suffix; if (suffixArray !== null && suffixArray.length > 0) { @@ -96,14 +97,6 @@ function buildFilterOptions(filter: Filter, listNum: number, recursion: boolean) return options; } -function buildNoFilterOptions(listNum: number, recursion: boolean) : {recursion: boolean, listNum: number} { - let options = { - 'recursion': recursion, - 'listNum': listNum, - }; - return options; -} - function getNewPathOrUri(prefixSection: string, filename: string) : string { let completeResult = prefixSection; if (completeResult.endsWith('/')) { @@ -140,11 +133,7 @@ function getFileInfos(sourceFileUri: string, offset: number, count: number, filt } let options; let listNum = offset + count; - if (hasFilter(filter)) { - options = buildFilterOptions(filter, listNum, recursion); - } else { - options = buildNoFilterOptions(listNum, recursion); - } + options = buildFilterOptions(filter, listNum, recursion); let fileNameList = fs.listFileSync(path, options); for (let i = 0; i < fileNameList.length; i++) { if (offset > i) { diff --git a/services/file_extension_hap/entry/src/main/resources/base/profile/backup_config.json b/services/file_extension_hap/entry/src/main/resources/base/profile/backup_config.json index 52fdaf93..301a812f 100644 --- a/services/file_extension_hap/entry/src/main/resources/base/profile/backup_config.json +++ b/services/file_extension_hap/entry/src/main/resources/base/profile/backup_config.json @@ -2,5 +2,9 @@ "allowToBackupRestore": true, "includes": [ "/storage/Users/currentUser/" + ], + "excludes": [ + "/storage/Users/currentUser/.Trash/", + "/storage/Users/currentUser/.Recent/" ] } \ No newline at end of file -- Gitee