From a047e6d004c4b0367dc4ce7633f7b3c71c0a9bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=B6=E7=86=99?= Date: Tue, 17 Jan 2023 12:10:35 +0000 Subject: [PATCH] change request permission method in medialibrary xts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 梁家熙 Change-Id: I3cb53c0e2f4ea24bb28d9ff7e21dbb88edf6168f --- multimedia/medialibrary/common.js | 20 ++++++++++++------- .../main/ets/test/getExifNoLocation.test.ets | 20 ++++++++++++------- .../main/ets/test/getExifLocation.test.ets | 18 +++++++++++------ 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/multimedia/medialibrary/common.js b/multimedia/medialibrary/common.js index a5625bdf6..f72265ae8 100644 --- a/multimedia/medialibrary/common.js +++ b/multimedia/medialibrary/common.js @@ -235,20 +235,26 @@ const getPermission = async function (name, context) { console.info("getPermission start", name); let permissions = ["ohos.permission.MEDIA_LOCATION", "ohos.permission.READ_MEDIA", "ohos.permission.WRITE_MEDIA"]; - context.requestPermissionsFromUser(permissions, (data) => { - console.info(`getPermission requestPermissionsFromUser ${JSON.stringify(data)}`); - }); - await sleep(200); + let atManager = abilityAccessCtrl.createAtManager(); + try { + atManager.requestPermissionsFromUser(context, permissions, (err, data) => { + console.info(`getPermission requestPermissionsFromUser ${JSON.stringify(data)}`); + }); + } catch (err) { + console.log(`get permission catch err -> ${JSON.stringify(err)}`); + } + await sleep(1000); let driver = uitest.Driver.create(); - await sleep(200); - + + await sleep(2000); let button = await driver.findComponent(uitest.ON.text("允许")); await button.click(); + await sleep(2000); let appInfo = await bundle.getApplicationInfo(name, 0, 100); let tokenID = appInfo.accessTokenId; - let atManager = abilityAccessCtrl.createAtManager(); + let isGranted1 = await atManager.verifyAccessToken(tokenID, "ohos.permission.MEDIA_LOCATION"); let isGranted2 = await atManager.verifyAccessToken(tokenID, "ohos.permission.READ_MEDIA"); let isGranted3 = await atManager.verifyAccessToken(tokenID, "ohos.permission.WRITE_MEDIA"); diff --git a/multimedia/medialibrary/mediaLibrary_getExifNoLocation/entry/src/main/ets/test/getExifNoLocation.test.ets b/multimedia/medialibrary/mediaLibrary_getExifNoLocation/entry/src/main/ets/test/getExifNoLocation.test.ets index 2bd7cc07b..5d2ae0675 100644 --- a/multimedia/medialibrary/mediaLibrary_getExifNoLocation/entry/src/main/ets/test/getExifNoLocation.test.ets +++ b/multimedia/medialibrary/mediaLibrary_getExifNoLocation/entry/src/main/ets/test/getExifNoLocation.test.ets @@ -25,21 +25,27 @@ export default function getExifNoLocation(abilityContext) { describe("getExifNoLocation", function () { beforeAll(async function () { console.info("beforeAll case"); - + let atManager = abilityAccessCtrl.createAtManager(); let permissions = ["ohos.permission.READ_MEDIA"]; - abilityContext.requestPermissionsFromUser(permissions, (data) => { - console.info(`getPermission requestPermissionsFromUser ${JSON.stringify(data)}`); - }); - await sleep(200); + + try { + atManager.requestPermissionsFromUser(abilityContext, permissions, (err, data) => { + console.info(`getPermission requestPermissionsFromUser ${JSON.stringify(data)}`); + }); + } catch (err) { + console.log(`get permission catch err -> ${JSON.stringify(err)}`); + } + await sleep(1000); let driver = uitest.Driver.create(); - await sleep(200); + await sleep(2000); let button = await driver.findComponent(uitest.ON.text("允许")); await button.click(); + await sleep(2000); let appInfo = await bundle.getApplicationInfo("ohos.acts.multimedia.mediaLibrary", 0, 100); let tokenID = appInfo.accessTokenId; - let atManager = abilityAccessCtrl.createAtManager(); + let isGranted = await atManager.verifyAccessToken(tokenID, "ohos.permission.READ_MEDIA"); if (isGranted != 0) { console.info("getpermission failed"); diff --git a/multimedia/medialibrary/mediaLibrary_getExiflocation/entry/src/main/ets/test/getExifLocation.test.ets b/multimedia/medialibrary/mediaLibrary_getExiflocation/entry/src/main/ets/test/getExifLocation.test.ets index 231f3e99e..0cdb6d5a8 100644 --- a/multimedia/medialibrary/mediaLibrary_getExiflocation/entry/src/main/ets/test/getExifLocation.test.ets +++ b/multimedia/medialibrary/mediaLibrary_getExiflocation/entry/src/main/ets/test/getExifLocation.test.ets @@ -25,22 +25,28 @@ export default function getExifLocation(abilityContext) { describe("getExifLocation", function () { beforeAll(async function () { console.info("beforeAll case"); + let atManager = abilityAccessCtrl.createAtManager(); let permissions = ["ohos.permission.MEDIA_LOCATION", "ohos.permission.READ_MEDIA"]; - abilityContext.requestPermissionsFromUser(permissions, (data) => { - console.info(`getPermission requestPermissionsFromUser ${JSON.stringify(data)}`); - }); - await sleep(200); + try { + atManager.requestPermissionsFromUser(abilityContext, permissions, (err, data) => { + console.info(`getPermission requestPermissionsFromUser ${JSON.stringify(data)}`); + }); + } catch (err) { + console.log(`get permission catch err -> ${JSON.stringify(err)}`); + } + await sleep(1000); let driver = uitest.Driver.create(); - await sleep(200); + await sleep(2000); let button = await driver.findComponent(uitest.ON.text("允许")); await button.click(); + await sleep(2000); let appInfo = await bundle.getApplicationInfo("ohos.acts.multimedia.mediaLibrary", 0, 100); let tokenID = appInfo.accessTokenId; - let atManager = abilityAccessCtrl.createAtManager(); + let isGranted1 = await atManager.verifyAccessToken(tokenID, "ohos.permission.MEDIA_LOCATION"); let isGranted2 = await atManager.verifyAccessToken(tokenID, "ohos.permission.READ_MEDIA"); if (!(isGranted1 == 0 && isGranted2 == 0)) { -- GitLab