From d439f047af14481d3ed3ec04cfa9212c780710eb Mon Sep 17 00:00:00 2001 From: jiang-xiaofeng Date: Fri, 11 Feb 2022 14:48:18 +0800 Subject: [PATCH] display the name of application Signed-off-by: jiang-xiaofeng Signed-off-by: jiang-xiaofeng --- .../com.ohos.permissionmanager/build.gradle | 11 ------- .../permissionmanager/src/main/config.json | 10 +++++- .../ets/dynamic/common/components/dialog.ets | 31 +++++++++++++++++-- .../main/ets/dynamic/common/model/bundle.ets | 2 +- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/frameworks/com.ohos.permissionmanager/build.gradle b/frameworks/com.ohos.permissionmanager/build.gradle index d867e2f57..924a888a1 100644 --- a/frameworks/com.ohos.permissionmanager/build.gradle +++ b/frameworks/com.ohos.permissionmanager/build.gradle @@ -3,17 +3,6 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 ohos { - signingConfigs { - release { - storeFile file('D:\\Huawei\\key\\permissionmanager\\permissionmanager.p12') - storePassword '0000001AA260E03E4EFC6DAE11257137D057327B7D76708207E97F857840A6BB0C3E2EDEBC8175EFE2D7' - keyAlias = 'zhouyan' - keyPassword '0000001ABE41800D8041F8025A346900B00C8D44BE5145EADC3F6C769D4F24BA17CD120C388C3E21659E' - signAlg = 'SHA256withECDSA' - profile file('D:\\Huawei\\key\\permissionmanager\\permissionmanager.p7b') - certpath file('D:\\Huawei\\key\\permissionmanager\\permissionmanager.cer') - } - } compileSdkVersion 7 } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json index ae7cebf54..afb90ba92 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json @@ -3,7 +3,7 @@ "bundleName": "com.ohos.permissionmanager", "vendor": "ohos", "version": { - "code": 1000000, + "code": 1, "name": "1.0.0" } }, @@ -60,6 +60,14 @@ { "name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", "reason": "revoke sensitive permissions" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "get applicationInfo" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "get applicationInfo" } ] } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets index 677a4a5d6..f1dd95144 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets @@ -14,8 +14,11 @@ */ import { getPermissionGroup } from "../utils/utils.ets" +import { BundleFlag, userId } from "../model/bundle.ets" import featureAbility from '@ohos.ability.featureAbility'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; +import bundle from '@ohos.bundle'; +import Resmgr from '@ohos.resourceManager'; @Extend(Button) function customizeButton() { .backgroundColor($r('app.color.default_background_color')) @@ -34,6 +37,7 @@ export struct privacyDialog { @State reqPerms: Array = [] @State grantGroups: Array = [] @State userFixedFlag: number = 2 // means user fixed + @State appName: string = "" build() { Column() { @@ -53,7 +57,7 @@ export struct privacyDialog { Column() { Row() { Flex({ justifyContent: FlexAlign.Start }) { - Text("是否允许该应用访问" + this.grantGroups[this.count].groupName).fontSize(16) + Text("是否允许" + this.appName + "访问" + this.grantGroups[this.count].groupName).fontSize(16) .margin({ top: 16, left: 24 @@ -129,7 +133,7 @@ export struct privacyDialog { this.hasPrepared = false; featureAbility.getWant((err, want) => { this.reqPerms = want.parameters['ohos.user.grant.permission'] - this.accessTokenId = want.parameters['ohos.aafwk.param.callToken'] + this.accessTokenId = want.parameters['ohos.aafwk.param.callerToken'] console.log("GrantAbility request permission=" + JSON.stringify(this.reqPerms) + " tokenId = " + this.accessTokenId) this.reqPerms.forEach(item => { var group = getPermissionGroup(item) @@ -141,6 +145,29 @@ export struct privacyDialog { } }) this.hasPrepared = true; + bundle.getNameForUid(want.parameters['ohos.aafwk.param.callerUid'], (err, data) => { + if(err) { + console.log("GrantAbility getNameForUid error :" + err) + return + } + console.log("GrantAbility getNameForUid data :" + data) + bundle.getApplicationInfo(data, BundleFlag.GET_BUNDLE_DEFAULT, userId).then(applicationInfo => { + console.log("GrantAbility applicationInfo :" + JSON.stringify(applicationInfo)) + Resmgr.getResourceManager(data).then(item => { + item.getString(applicationInfo.labelId, (err, value) => { + if (value == undefined) { + console.log("GrantAbility label :" ) + this.appName = applicationInfo.label.replace('$string:', '') + } else { + console.log("GrantAbility labelValue :" + value) + this.appName = value + } + }) + }) + }).catch(err => { + console.log("GrantAbility applicationInfo11 error :" + err) + }) + }) }) } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/bundle.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/bundle.ets index 4530bc6fc..7c29c39fc 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/bundle.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/bundle.ets @@ -34,5 +34,5 @@ export const BundleFlag = { */ GET_ABILITY_INFO_SYSTEMAPP_ONLY : 0x00000080 } -export const userId: number = 0 +export const userId: number = 100 -- Gitee