diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets index b90ce61bbf25d83125c200827125f97a5f60f44c..e0d00641068048ef69f04d44873a41ef961e5c58 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { getPermissionGroup } from '../utils/utils.ets' +import { getPermissionGroup, Log } from '../utils/utils.ets' import { BundleFlag, USER_ID } from '../model/bundle.ets' import Constants from '../utils/constant.ets' import featureAbility from '@ohos.ability.featureAbility' @@ -22,8 +22,6 @@ import bundle from '@ohos.bundle' import Resmgr from '@ohos.resourceManager' import { permissionGroups, showSubpermissionsGrop } from "../model/permissionGroup.ets"; -var TAG = "PermissionManager_GrantAbility:" - @Extend(Button) function customizeButton() { .backgroundColor($r('app.color.default_background_color')) .fontColor($r('app.color.button_color')) @@ -120,7 +118,7 @@ export struct privacyDialog { if (this.initStatus == Constants.INIT_NEED_TO_TERMINATED) { ret = Constants.RESULT_FAILURE } - console.log(TAG + "code:" + ret + ", result=" + JSON.stringify(this.result)) + Log.info("code:" + ret + ", result=" + JSON.stringify(this.result)) this.answer(ret, this.reqPerms) } @@ -136,8 +134,8 @@ export struct privacyDialog { getApplicationName(uid) { bundle.getNameForUid(uid).then((data) => { - console.log(TAG + "getApplicationName bundleName:" + data) - console.log(TAG + "getApplicationName userId:" + Math.floor(uid/200000)) + Log.info("getApplicationName bundleName:" + data) + Log.info("getApplicationName userId:" + Math.floor(uid/200000)) bundle.getApplicationInfo(data, BundleFlag.GET_BUNDLE_DEFAULT, Math.floor(uid/200000)).then(applicationInfo => { Resmgr.getResourceManager(data).then(item => { item.getString(applicationInfo.labelId, (err, value) => { @@ -146,11 +144,11 @@ export struct privacyDialog { } else { this.appName = value } - console.log(TAG + "hap label:" + applicationInfo.label + ", value:"+this.appName) + Log.info("hap label:" + applicationInfo.label + ", value:"+this.appName) }) }) }).catch(err => { - console.log(TAG + "applicationInfo error :" + err) + Log.error("applicationInfo error :" + err) this.initStatus = Constants.INIT_NEED_TO_TERMINATED }) bundle.getBundleInfo(data, Constants.PARMETER_BUNDLE_FLAG).then(bundleInfo => { @@ -171,7 +169,7 @@ export struct privacyDialog { }) }) }).catch(err => { - console.log(TAG + "getNameForUid error :" + JSON.stringify(err)) + Log.error("getNameForUid error :" + JSON.stringify(err)) this.initStatus = Constants.INIT_NEED_TO_TERMINATED }) } @@ -200,13 +198,13 @@ export struct privacyDialog { this.reqPerms.forEach((permission, idx) => { //已授权 if(stateGroup[idx] == Constants.PASS_OPER) { - console.log(TAG + "permission has been fixed:" + permission) + Log.info("permission has been fixed:" + permission) this.result[idx] = abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED; //待授权 }else if(stateGroup[idx] == Constants.DYNAMIC_OPER) { var group = getPermissionGroup(permission) if(!group) { - console.log(TAG + "permission not find:" + permission) + Log.info("permission not find:" + permission) }else { var exist = this.grantGroups.find(grantGroup => grantGroup.name == group.name) //判断是否为需要展示子权限的权限组 @@ -238,7 +236,7 @@ export struct privacyDialog { } answer(ret, reqPerms) { - console.log(TAG + "code:" + ret + ", perms="+ JSON.stringify(reqPerms) +", result=" + JSON.stringify(this.result)) + Log.info("code:" + ret + ", perms="+ JSON.stringify(reqPerms) +", result=" + JSON.stringify(this.result)) var perms = [] var results = [] reqPerms.forEach(perm => { @@ -264,19 +262,19 @@ export struct privacyDialog { this.result = [] featureAbility.getWant((err, want) => { if (err.code != 0) { - console.log(TAG + "featureAbility.getWant err:" + err) + Log.error("featureAbility.getWant err:" + err) this.initStatus = Constants.INIT_NEED_TO_TERMINATED return } this.reqPerms = want.parameters['ohos.user.grant.permission'] this.accessTokenId = want.parameters['ohos.aafwk.param.callerToken'] if (this.reqPerms == undefined || this.accessTokenId == undefined || this.reqPerms.length == 0) { - console.log(TAG + "invalid parameters") + Log.info("invalid parameters") this.initStatus = Constants.INIT_NEED_TO_TERMINATED return } - console.log(TAG + "request permission=" + JSON.stringify(this.reqPerms) + ", tokenId = " + this.accessTokenId) - console.log(TAG + "permission state=" + JSON.stringify(want.parameters['ohos.user.grant.permission.state'])); + Log.info("request permission=" + JSON.stringify(this.reqPerms) + ", tokenId = " + this.accessTokenId) + Log.info("permission state=" + JSON.stringify(want.parameters['ohos.user.grant.permission.state'])); this.result = new Array(this.reqPerms.length).fill(-1); this.getgrantGroups(want.parameters['ohos.user.grant.permission.state']); this.getApplicationName(want.parameters['ohos.aafwk.param.callerUid']) @@ -284,6 +282,6 @@ export struct privacyDialog { } aboutToDisappear() { - console.log(TAG + "aboutToDisappear") + Log.info("aboutToDisappear") } } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets index 95a38fcbe1e91f0dde89cf2a4c344043da016292..e095e24eb39c40b72604fe5043cc471af476ad2b 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets @@ -14,6 +14,8 @@ */ import { permissionGroups, groups } from "../model/permissionGroup.ets" +const TAG = 'PermissionManager_Log'; + export function getPermissionGroup(permission: string) { for (var i = 0; i < permissionGroups.length; i++) { if (permissionGroups[i].permissionName == permission) { @@ -33,4 +35,14 @@ export function getPermissionGroup(permission: string) { } } } +} + +export class Log { + static info(log) { + console.info(`Info: ${TAG} ${log}`) + } + + static error(log) { + console.info(`Error: ${TAG} ${log}`) + } } \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets index 97b6e10957c0b5d8ca18ff40023f3989cb560044..4c07af20f7af679d7239a9593ea3fa8613f80ba2 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets @@ -15,8 +15,7 @@ import { privacyDialog } from "../common/components/dialog.ets" import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; - -var TAG = "PermissionManager_GrantAbility:" +import { Log } from '../common/utils/utils.ets' @Entry @Component @@ -35,16 +34,16 @@ struct dialogPlusPage { group.permissions.forEach(async permission => { const result = await acManager.grantUserGrantedPermission(accessTokenId, permission, userFixedFlag) num ++ - console.log(TAG + "grant permission result:" + result + "permission" + permission) + Log.info("grant permission result:" + result + "permission" + permission) if (result == abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) { permissionList.forEach((req, idx) => { if(req == permission) { this.result[idx] = abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED; } }) - console.log(TAG + "grant permission success:" + permission) + Log.info("grant permission success:" + permission) } else { - console.log(TAG + "failed to grant permission:" + permission + " ret:" + result) + Log.error("failed to grant permission:" + permission + " ret:" + result) } if(num == group.permissions.length) { this.count ++ @@ -55,12 +54,12 @@ struct dialogPlusPage { var acManager = abilityAccessCtrl.createAtManager() group.permissions.forEach(async permission => { const result = await acManager.revokeUserGrantedPermission(accessTokenId, permission, userFixedFlag) - console.log(TAG + "revoke permission result:" + result + "permission" + permission); + Log.info("revoke permission result:" + result + "permission" + permission); }) this.count ++ } privacyExist() { - console.info(TAG + "exist") + Log.info("exist") } aboutToAppear() { this.privacyDialogController.open() 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 3e44508b90a58a3c8cf111166de64df40230e4ee..46eb4b6117c80b5d6a26e935af759abc36e02e9b 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 @@ -239,59 +239,79 @@ struct appNamePlusPage { }.margin({ top: Constants.ROW_MARGIN_TOP }) .padding({ left: Constants.SECONDARY_LIST_PADDING_LEFT, right: Constants.SECONDARY_LIST_PADDING_RIGHT }) } else { - if (this.allowedListItem.length) { - Row() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Text($r('app.string.allowed')) - .fontSize(Constants.TEXT_SMAL_FONT_SIZE) - .margin({ - top: Constants.SECONDARY_TEXT_MARGIN_TOP, - left: Constants.SECONDARY_LIST_PADDING_RIGHT + Scroll() { + List() { + if (this.allowedListItem.length) { + ListItem() { + Row() { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Text($r('app.string.allowed')) + .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .margin({ + top: Constants.SECONDARY_TEXT_MARGIN_TOP, + left: Constants.SECONDARY_LIST_PADDING_RIGHT + }) + } + } + } + + ListItem() { + Row() { + List() { + ForEach(this.allowedListItem.slice(Constants.SLICE_START, this.allowedListItem.length - 1), + (item) => { + this.ListItemLayout(item, Constants.SLICE_START_INDEX, 'allow') + }, item => item.toString()) + ForEach(this.allowedListItem.slice(Constants.SLICE_END), (item, index) => { + this.ListItemLayout(item, Constants.SLICE_END_INDEX, 'allow') + }, item => item.toString()) + } + .backgroundColor($r('app.color.default_background_color')) + .borderRadius(Constants.BORDER_RADIUS) + .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) + }.margin({ top: Constants.ROW_MARGIN_TOP }) + .padding({ + left: Constants.SECONDARY_LIST_PADDING_LEFT, + right: Constants.SECONDARY_LIST_PADDING_RIGHT }) + } } - } - Row() { - List() { - ForEach(this.allowedListItem.slice(Constants.SLICE_START, this.allowedListItem.length - 1), - (item) => { - this.ListItemLayout(item, Constants.SLICE_START_INDEX, 'allow') - }, item => item.toString()) - ForEach(this.allowedListItem.slice(Constants.SLICE_END), (item, index) => { - this.ListItemLayout(item, Constants.SLICE_END_INDEX, 'allow') - }, item => item.toString()) - } - .backgroundColor($r('app.color.default_background_color')) - .borderRadius(Constants.BORDER_RADIUS) - .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) - }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.SECONDARY_LIST_PADDING_LEFT, right: Constants.SECONDARY_LIST_PADDING_RIGHT }) - } - if (this.bannedListItem.length) { - Row() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Text($r('app.string.banned')) - .fontSize(Constants.TEXT_SMAL_FONT_SIZE) - .margin({ - top: Constants.SECONDARY_TEXT_MARGIN_TOP, - left: Constants.SECONDARY_LIST_PADDING_RIGHT + if (this.bannedListItem.length) { + ListItem() { + Row() { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Text($r('app.string.banned')) + .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .margin({ + top: Constants.SECONDARY_TEXT_MARGIN_TOP, + left: Constants.SECONDARY_LIST_PADDING_RIGHT + }) + } + } + } + + ListItem() { + Row() { + List() { + ForEach(this.bannedListItem.slice(Constants.SLICE_START, this.bannedListItem.length - 1), + (item) => { + this.ListItemLayout(item, Constants.SLICE_START_INDEX, 'banned') + }, item => item.toString()) + ForEach(this.bannedListItem.slice(Constants.SLICE_END), (item) => { + this.ListItemLayout(item, Constants.SLICE_END_INDEX, 'banned') + }, item => item.toString()) + } + .backgroundColor($r('app.color.default_background_color')) + .borderRadius(Constants.BORDER_RADIUS) + .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) + }.margin({ top: Constants.ROW_MARGIN_TOP }) + .padding({ + left: Constants.SECONDARY_LIST_PADDING_LEFT, + right: Constants.SECONDARY_LIST_PADDING_RIGHT }) + } } } - Row() { - List() { - ForEach(this.bannedListItem.slice(Constants.SLICE_START, this.bannedListItem.length - 1), - (item) => { - this.ListItemLayout(item, Constants.SLICE_START_INDEX, 'banned') - }, item => item.toString()) - ForEach(this.bannedListItem.slice(Constants.SLICE_END), (item) => { - this.ListItemLayout(item, Constants.SLICE_END_INDEX, 'banned') - }, item => item.toString()) - } - .backgroundColor($r('app.color.default_background_color')) - .borderRadius(Constants.BORDER_RADIUS) - .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) - }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.SECONDARY_LIST_PADDING_LEFT, right: Constants.SECONDARY_LIST_PADDING_RIGHT }) } } }