diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets index 8d14b5bac574b93256b0a74b47f72a71b67cb3a5..3e44508b90a58a3c8cf111166de64df40230e4ee 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets @@ -54,15 +54,10 @@ struct appNamePlusPage { Column() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Column() { - Row() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Text(item.groupName) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.text_color')) - }.margin({ top: Constants.FLEX_MARGIN_TOP, bottom: Constants.FLEX_MARGIN_BOTTOM }) - }.height(Constants.FULL_HEIGHT) - }.flexGrow(Constants.FLEX_GROW).constraintSize({ minHeight: Constants.CONSTRAINTSIZE_MINHEIGHT }) + Text(item.groupName) + .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontColor($r('app.color.text_color')) + .flexGrow(Constants.FLEX_GROW) Image($r('app.media.rightarrow')) .objectFit(ImageFit.Contain) .height(Constants.IMAGE_HEIGHT) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets index 458788fc6ed3681e847eb302ea6ad0fab99368f9..f1c6f15639db6e687176f08973d86aa58fbec980 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets @@ -18,6 +18,7 @@ import router from '@system.router'; import bundle from "@ohos.bundle"; import { getAppLabel, getAppIcon, verifyAccessToken } from "../common/utils/utils"; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; +import Resmgr from '@ohos.resourceManager' import { authorizeDialog } from "../common/components/dialog.ets"; import { permissionDescriptions, permissionGroups } from "../common/model/permissionGroup.ets"; import Constants from '../common/utils/constant.ets'; @@ -32,6 +33,7 @@ let nowGrantResult = Constants.PERMISSION_NUM; // Authorization results now let nowRevokeResult = Constants.PERMISSION_NUM; // Now deauthorize results let GrantResultFlag = []; // Authorization result Flag let RevokeResultFlag = []; // Cancel authorization result Flag +let reason = "" // Authorized reason class MeidaDocObj { name: string index: number @@ -176,6 +178,17 @@ struct mediaDocumentItem { aboutToAppear() { let permissionDescription = permissionDescriptions[backTitle]; bundle.getBundleInfo(routerData, Constants.PARMETER_BUNDLE_FLAG).then(res => { + res.reqPermissionDetails.forEach(reqPermissionDetail => { + if(reqPermissionDetail.name == permissions[0]) { + Resmgr.getResourceManager(routerData).then(item => { + item.getString(reqPermissionDetail.reasonId, (err, value) => { + if (value !== undefined) { + reason = value + } + }) + }) + } + }) Promise.all([getAppLabel(res.appInfo.labelId, res.name), getAppIcon(res.appInfo.iconId, res.name)]) .then((values) => { @@ -258,7 +271,7 @@ struct mediaDocumentItem { Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Text(backTitle + "访问权限") + Text(reason != "" ? reason : (backTitle + "访问权限")) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .textAlign(TextAlign.Start) }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets index f45257da3f5412157b077c2816342c640119047f..e4f8723ca82dea91a423fee7fb5ca41f53bc49a0 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets @@ -342,7 +342,6 @@ struct authorityManagementPage { for (let j = 0; j < info.reqPermissions.length; j++) { var permission = info.reqPermissions[j]; var flag = await acManager.getPermissionFlags(info.appInfo.accessTokenId, permission) - console.log(TAG + "flag:" + flag + " permission:" + permission + " bundleName" + info.name) if(flag == Constants.PRE_AUTHORIZATION_NOT_MODIFIED) { continue }