From f4e1bd07956a5aece846e55e2ecdf40998e18d8e Mon Sep 17 00:00:00 2001 From: chensihan Date: Mon, 22 Jul 2024 16:36:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chensihan --- .../src/main/ets/FileExtensionAbility/FileExtensionAbility.ts | 1 + 1 file changed, 1 insertion(+) 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 1a16573b..62576f05 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 @@ -766,6 +766,7 @@ export default class FileExtAbility extends Extension { hmdfsPath2uri(path): string { return `file://docs/storage/hmdfs/${path}`; + 1 } getRoots() { -- Gitee From 9ed506b0b903169c36eb2d2b54c27c64ade41f0c Mon Sep 17 00:00:00 2001 From: chensihan Date: Mon, 22 Jul 2024 08:43:02 +0000 Subject: [PATCH 2/3] =?UTF-8?q?update=20services/file=5Fextension=5Fhap/en?= =?UTF-8?q?try/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts.?= =?UTF-8?q?=20=E9=BB=84=E5=8C=BA=E5=90=8C=E6=AD=A5=E8=87=B3=E8=93=9D?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chensihan --- .../FileExtensionAbility.ts | 44 ++++++++----------- 1 file changed, 18 insertions(+), 26 deletions(-) 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 62576f05..0238260c 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 @@ -162,17 +162,6 @@ export default class FileExtAbility extends Extension { } } - isCrossDeviceLink(sourceFileUri, targetParentUri): boolean { - let roots = this.getRoots().roots; - for (let index = 0; index < roots.length; index++) { - let uri = roots[index].uri; - if (sourceFileUri.indexOf(uri) === 0 && targetParentUri.indexOf(uri) === 0) { - return false; - } - } - return true; - } - openFile(sourceFileUri, flags): {number, number} { sourceFileUri = decodeUri(sourceFileUri); if (!checkUri(sourceFileUri)) { @@ -766,7 +755,23 @@ export default class FileExtAbility extends Extension { hmdfsPath2uri(path): string { return `file://docs/storage/hmdfs/${path}`; - 1 + } + + getHmdfsPath(): {}[] { + let rootPathHmdfs = '/storage/hmdfs'; + let hmdfsInfoList = []; + let hmdfsName = fs.listFileSync(rootPathHmdfs); + for (let i = 0; i < hmdfsName.length; i++) { + let hmdfsInfo = { + uri: this.hmdfsPath2uri(hmdfsName[i]), + displayName: hmdfsName[i], + relativePath: '/storage/hmdfs/' + hmdfsName[i], + deviceType: deviceType.DEVICE_SHARED_TERMINAL, + deviceFlags: deviceFlag.SUPPORTS_READ | deviceFlag.SUPPORTS_WRITE, + }; + hmdfsInfoList.push(hmdfsInfo); + } + return hmdfsInfoList; } getRoots() { @@ -803,20 +808,7 @@ export default class FileExtAbility extends Extension { roots = roots.concat(volumeInfoList); try { - let rootPathHmdfs = '/storage/hmdfs'; - let hmdfsInfoList = []; - let hmdfsName = fs.listFileSync(rootPathHmdfs); - for (let i = 0; i < hmdfsName.length; i++) { - let hmdfsInfo = { - uri: this.hmdfsPath2uri(hmdfsName[i]), - displayName: hmdfsName[i], - relativePath: '/storage/hmdfs/' + hmdfsName[i], - deviceType: deviceType.DEVICE_SHARED_TERMINAL, - deviceFlags: deviceFlag.SUPPORTS_READ | deviceFlag.SUPPORTS_WRITE, - }; - hmdfsInfoList.push(hmdfsInfo); - } - roots = roots.concat(hmdfsInfoList); + roots = roots.concat(getHmdfsPath()); } catch (e) { hilog.info(DOMAIN_CODE, TAG, 'getRoots errorcode: ' + e.code, ' message: ' + e.message); } -- Gitee From fd1519d9d3e15475923aa85129347932831b2a84 Mon Sep 17 00:00:00 2001 From: chensihan Date: Mon, 22 Jul 2024 08:45:56 +0000 Subject: [PATCH 3/3] =?UTF-8?q?update=20services/file=5Fextension=5Fhap/en?= =?UTF-8?q?try/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts.?= =?UTF-8?q?=20=E8=93=9D=E9=BB=84=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chensihan --- .../ets/FileExtensionAbility/FileExtensionAbility.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 0238260c..2821b12e 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 @@ -162,6 +162,17 @@ export default class FileExtAbility extends Extension { } } + isCrossDeviceLink(sourceFileUri, targetParentUri): boolean { + let roots = this.getRoots().roots; + for (let index = 0; index < roots.length; index++) { + let uri = roots[index].uri; + if (sourceFileUri.indexOf(uri) === 0 && targetParentUri.indexOf(uri) === 0) { + return false; + } + } + return true; + } + openFile(sourceFileUri, flags): {number, number} { sourceFileUri = decodeUri(sourceFileUri); if (!checkUri(sourceFileUri)) { -- Gitee