diff --git a/permissionmanager/src/main/ets/MainAbility/MainAbility.ts b/permissionmanager/src/main/ets/MainAbility/MainAbility.ts index b4e7be4149aece9fad6fe3a3e7b18ed80a540446..9e381c9afeae60fb88ea04443aef75ba60eff44f 100644 --- a/permissionmanager/src/main/ets/MainAbility/MainAbility.ts +++ b/permissionmanager/src/main/ets/MainAbility/MainAbility.ts @@ -24,6 +24,7 @@ export default class MainAbility extends Ability { globalThis.allBundleInfo = []; globalThis.allUserPermissions = [] globalThis.allGroups = [] + globalThis.permissionLabels = {} } onWindowStageCreate(windowStage) { diff --git a/permissionmanager/src/main/ets/common/model/permissionGroup.ets b/permissionmanager/src/main/ets/common/model/permissionGroup.ets index 0f5a451f1cbaa2326b5aa8febb8a7d970ec0e634..befa20d5f2e1ca0504bdca0da7aef29281e6079a 100644 --- a/permissionmanager/src/main/ets/common/model/permissionGroup.ets +++ b/permissionmanager/src/main/ets/common/model/permissionGroup.ets @@ -17,220 +17,189 @@ export const permissionGroups: any[] = [ { "permissionName": "ohos.permission.LOCATION_IN_BACKGROUND", "groupName": "LOCATION", - "label": "后台定位权限", - "description": "允许应用在后台运行时获取位置信息。", + "label": $r("sys.string.ohos_lab_location_in_background"), "groupId": 0 }, { "permissionName": "ohos.permission.APPROXIMATELY_LOCATION", "groupName": "LOCATION", - "label": "模糊位置权限", - "description": "允许应用获取模糊位置信息。", + "label": $r("sys.string.ohos_lab_approximately_location"), "groupId": 0 }, { "permissionName": "ohos.permission.LOCATION", "groupName": "LOCATION", - "label": "前台定位权限", - "description": "允许应用在前台运行时获取位置信息。", + "label": $r("sys.string.ohos_lab_location"), "groupId": 0 }, { "permissionName": "ohos.permission.CAMERA", "groupName": "CAMERA", - "label": "拍摄照片和录制视频", - "description": "允许应用拍摄照片和视频。", + "label": $r("sys.string.ohos_lab_camera"), "groupId": 1 }, { "permissionName": "ohos.permission.MICROPHONE", "groupName": "MICROPHONE", - "label": "录制音频", - "description": "允许应用打开或关闭录音通路。", + "label": $r("sys.string.ohos_lab_microphone"), "groupId": 2 }, { "permissionName": "ohos.permission.ANSWER_CALL", "groupName": "PHONE", - "label": "接听电话", - "description": "允许应用接听电话。", + "label": $r("sys.string.ohos_lab_answer_call"), "groupId": 3 }, { "permissionName": "ohos.permission.MANAGE_VOICEMAIL", "groupName": "PHONE", - "label": "语音信箱", - "description": "允许应用管理语音信箱。", + "label": $r("sys.string.ohos_lab_manage_voicemail"), "groupId": 3 }, { "permissionName": "ohos.permission.READ_CELL_MESSAGES", "groupName": "SMS", - "label": "读取小区广播", - "description": "允许应用读取设备接收的小区广播信息。", + "label": $r("sys.string.ohos_lab_read_cell_messages"), "groupId": 4 }, { "permissionName": "ohos.permission.READ_MESSAGES", "groupName": "SMS", - "label": "读取短彩信", - "description": "允许应用读取设备接收的短彩信信息。", + "label": $r("sys.string.ohos_lab_read_messages"), "groupId": 4 }, { "permissionName": "ohos.permission.RECEIVE_MMS", "groupName": "SMS", - "label": "接收彩信", - "description": "允许应用接收彩信。", + "label": $r("sys.string.ohos_lab_receive_mms"), "groupId": 4 }, { "permissionName": "ohos.permission.RECEIVE_SMS", "groupName": "SMS", - "label": "接收短信", - "description": "允许应用接收短信。", + "label": $r("sys.string.ohos_lab_receive_sms"), "groupId": 4 }, { "permissionName": "ohos.permission.RECEIVE_WAP_MESSAGES", "groupName": "SMS", - "label": "接收WAP消息", - "description": "允许应用接收和处理WAP消息。", + "label": $r("sys.string.ohos_lab_receive_wap_messages"), "groupId": 4 }, { "permissionName": "ohos.permission.SEND_MESSAGES", "groupName": "SMS", - "label": "发送短彩信", - "description": "允许应用发送短彩信", + "label": $r("sys.string.ohos_lab_send_messages"), "groupId": 4 }, { "permissionName": "ohos.permission.READ_CONTACTS", "groupName": "CONTACTS", - "label": "读取通讯录", - "description": "允许应用读取设备上存储的联系人信息。", + "label": $r("sys.string.ohos_lab_read_contacts"), "groupId": 5 }, { "permissionName": "ohos.permission.WRITE_CONTACTS", "groupName": "CONTACTS", - "label": "新建/修改/删除通讯录", - "description": "允许应用新建/修改/删除设备上存储的联系人信息。", + "label": $r("sys.string.ohos_lab_write_contacts"), "groupId": 5 }, { "permissionName": "ohos.permission.READ_CALL_LOG", "groupName": "CALL_LOG", - "label": "读取通话记录", - "description": "允许应用读取设备上的通话记录信息。", + "label": $r("sys.string.ohos_lab_read_call_log"), "groupId": 6 }, { "permissionName": "ohos.permission.WRITE_CALL_LOG", "groupName": "CALL_LOG", - "label": "新建/修改/删除通话记录", - "description": "允许新建/修改/删除设备上的通话记录信息。", + "label": $r("sys.string.ohos_lab_write_call_log"), "groupId": 6 }, { "permissionName": "ohos.permission.MEDIA_LOCATION", "groupName": "MEDIA", - "label": "允许应用访问拍摄位置", - "description": "应用访问用户媒体文件中的拍摄位置信息如经纬度信息。", + "label": $r("sys.string.ohos_lab_media_location"), "groupId": 7 }, { "permissionName": "ohos.permission.READ_MEDIA", "groupName": "MEDIA", - "label": "允许应用读取媒体文件", - "description": "允许应用访问户媒体文件，如视频、音频、图片等。", + "label": $r("sys.string.ohos_lab_read_media"), "groupId": 7 }, { "permissionName": "ohos.permission.WRITE_MEDIA", "groupName": "MEDIA", - "label": "允许应用读写媒体文件", - "description": "允许应用读写户媒体文件，如视频、音频、图片等。", + "label": $r("sys.string.ohos_lab_write_media"), "groupId": 7 }, { "permissionName": "ohos.permission.READ_CALENDAR", "groupName": "CALENDAR", - "label": "读取日历", - "description": "允许应用读取日历。", + "label": $r("sys.string.ohos_lab_read_calendar"), "groupId": 8 }, { "permissionName": "ohos.permission.WRITE_CALENDAR", "groupName": "CALENDAR", - "label": "新建/修改/删除日历", - "description": "允许应用新建/修改/删除日历。", + "label": $r("sys.string.ohos_lab_write_calendar"), "groupId": 8 }, { "permissionName": "ohos.permission.ACTIVITY_MOTION", "groupName": "SPORT", - "label": "读取用户的运动状态", - "description": "允许应用程序读取用户的运动状态。", + "label": $r("sys.string.ohos_lab_activity_motion"), "groupId": 9 }, { "permissionName": "ohos.permission.READ_HEALTH_DATA", "groupName": "HEALTH", - "label": "读取用户的健康数据", - "description": "允许应用程序读取用户的健康数据。", + "label": $r("sys.string.ohos_lab_read_health_data"), "groupId": 10 }, { "permissionName": "ohos.permission.DISTRIBUTED_DATASYNC", "groupName": "OTHER", "icon": $r("app.media.ic_multi_device_vector"), - "text": "使用多设备协同？", - "label": "多设备协同", - "description": "发现并访问其他设备。", + "text": $r("app.string.group_label_distributed_datasync"), + "label": $r("app.string.multi_device_collaboration"), "groupId": 11 }, { "permissionName": "ohos.permission.READ_IMAGEVIDEO", "groupName": "IMAGE_AND_VIDEOS", "label": $r('sys.string.ohos_desc_read_imagevideo'), - "description": "允许应用读取用户公共目录的图片或视频文件。", "groupId": 12 }, { "permissionName": "ohos.permission.WRITE_IMAGEVIDEO", "groupName": "IMAGE_AND_VIDEOS", "label": $r('sys.string.ohos_desc_write_imagevideo'), - "description": "允许应用修改用户公共目录的图片或视频文件。", "groupId": 12 }, { "permissionName": "ohos.permission.READ_AUDIO", "groupName": "AUDIOS", "label": $r('sys.string.ohos_desc_read_audio'), - "description": "允许应用读取用户公共目录的音频文件。", "groupId": 13 }, { "permissionName": "ohos.permission.WRITE_AUDIO", "groupName": "AUDIOS", "label": $r('sys.string.ohos_desc_write_audio'), - "description": "允许应用修改用户公共目录的音频文件。", "groupId": 13 }, { "permissionName": "ohos.permission.READ_DOCUMENT", "groupName": "DOCUMENTS", "label": $r('sys.string.ohos_desc_read_document'), - "description": "允许应用读取用户公共目录的文档。", "groupId": 14 }, { "permissionName": "ohos.permission.WRITE_DOCUMENT", "groupName": "DOCUMENTS", "label": $r('sys.string.ohos_desc_write_document'), - "description": "允许应用修改用户公共目录的文档。", "groupId": 14 }, { @@ -250,10 +219,10 @@ export const permissionGroups: any[] = [ export const groups: any[] = [ { "name": "LOCATION", - "groupName": "位置信息", + "groupName": $r("app.string.groupName_location"), "icon": $r('app.media.ic_public_gps'), "description": "", - "label": "访问位置信息？", + "label": $r("app.string.group_label_location"), "permissions": [ "ohos.permission.LOCATION_IN_BACKGROUND", "ohos.permission.APPROXIMATELY_LOCATION", @@ -263,9 +232,9 @@ export const groups: any[] = [ }, { "name": "CAMERA", - "groupName": "相机", + "groupName": $r("app.string.groupName_camera"), "icon": $r('app.media.ic_public_camera'), - "label": "使用相机？", + "label": $r("app.string.group_label_camera"), "description": "", "permissions": [ "ohos.permission.CAMERA" @@ -274,9 +243,9 @@ export const groups: any[] = [ }, { "name": "MICROPHONE", - "groupName": "麦克风", + "groupName": $r("app.string.groupName_microphone"), "icon": $r('app.media.ic_public_voice'), - "label": "使用麦克风？", + "label": $r("app.string.group_label_microphone"), "description": "", "permissions": [ "ohos.permission.MICROPHONE" @@ -285,9 +254,9 @@ export const groups: any[] = [ }, { "name": "PHONE", - "groupName": "电话", + "groupName": $r("app.string.groupName_phone"), "icon": $r('app.media.ic_public_phone'), - "label": "使用拨打电话？", + "label": $r("app.string.group_label_phone"), "description": "", "permissions": [ "ohos.permission.ANSWER_CALL", @@ -297,10 +266,10 @@ export const groups: any[] = [ }, { "name": "SMS", - "groupName": "信息", + "groupName": $r("app.string.groupName_sms"), "icon": $r('app.media.ic_public_message'), - "label": "访问信息？", - "description": "", + "label": $r("app.string.group_label_sms"), + "description": "", "permissions": [ "ohos.permission.READ_CELL_MESSAGES", "ohos.permission.READ_MESSAGES", @@ -313,10 +282,10 @@ export const groups: any[] = [ }, { "name": "CONTACTS", - "groupName": "通讯录", + "groupName": $r("app.string.groupName_contacts"), "icon": $r('app.media.ic_public_contacts_group'), - "label": "访问通讯录？", - "description": "", + "label": $r("app.string.group_label_contacts"), + "description": "", "permissions": [ "ohos.permission.READ_CONTACTS", "ohos.permission.WRITE_CONTACTS" @@ -325,10 +294,10 @@ export const groups: any[] = [ }, { "name": "CALL_LOG", - "groupName": "通话记录", + "groupName": $r("app.string.groupName_call_log"), "icon": $r('app.media.ic_call_logs'), - "label": "访问通话记录？", - "description": "", + "label": $r("app.string.group_label_call_log"), + "description": "", "permissions": [ "ohos.permission.READ_CALL_LOG", "ohos.permission.WRITE_CALL_LOG" @@ -337,10 +306,10 @@ export const groups: any[] = [ }, { "name": "MEDIA", - "groupName": "媒体和文件", + "groupName": $r("app.string.groupName_media"), "icon": $r('app.media.ic_public_folder'), "description": "", - "label": "访问媒体和文件？", + "label": $r("app.string.group_label_media"), "permissions": [ "ohos.permission.MEDIA_LOCATION", "ohos.permission.READ_MEDIA", @@ -350,10 +319,10 @@ export const groups: any[] = [ }, { "name": "CALENDAR", - "groupName": "日历", + "groupName": $r("app.string.groupName_calendar"), "icon": $r('app.media.ic_public_calendar'), - "label": "访问日历？", - "description": "", + "label": $r("app.string.group_label_calendar"), + "description": "", "permissions": [ "ohos.permission.READ_CALENDAR", "ohos.permission.WRITE_CALENDAR" @@ -362,9 +331,9 @@ export const groups: any[] = [ }, { "name": "SPORT", - "groupName": "健身运动", + "groupName": $r("app.string.groupName_sport"), "icon": $r('app.media.ic_sport'), - "label": "访问健身运动？", + "label": $r("app.string.group_label_sport"), "description": "", "permissions": [ "ohos.permission.ACTIVITY_MOTION" @@ -373,9 +342,9 @@ export const groups: any[] = [ }, { "name": "HEALTH", - "groupName": "身体传感器", + "groupName": $r("app.string.groupName_health"), "icon": $r('app.media.ic_ssensor'), - "label": "使用身体传感器？", + "label": $r("app.string.group_label_health"), "description": "", "permissions": [ "ohos.permission.READ_HEALTH_DATA" @@ -384,7 +353,7 @@ export const groups: any[] = [ }, { "name": "OTHER", - "groupName": "其他权限", + "groupName": $r("app.string.groupName_other"), "icon": $r('app.media.ic_more'), "description": "", "permissions": [ @@ -396,7 +365,7 @@ export const groups: any[] = [ "name": "IMAGE_AND_VIDEOS", "groupName": $r('sys.string.ohos_lab_read_imagevideo'), "icon": $r('app.media.ic_public_folder'), - "label": "访问图片和视频？", + "label": $r("app.string.group_label_image_and_videos"), "description": "", "permissions": [ "ohos.permission.READ_IMAGEVIDEO", @@ -408,7 +377,7 @@ export const groups: any[] = [ "name": "AUDIOS", "groupName": $r('sys.string.ohos_lab_read_audio'), "icon": $r('app.media.ic_public_folder'), - "label": "访问音乐和音频？", + "label": $r("app.string.group_label_audios"), "description": "", "permissions": [ "ohos.permission.READ_AUDIO", @@ -420,7 +389,7 @@ export const groups: any[] = [ "name": "DOCUMENTS", "groupName": $r('sys.string.ohos_lab_read_document'), "icon": $r('app.media.ic_public_folder'), - "label": "访问文件？", + "label": $r("app.string.group_label_document"), "description": "", "permissions": [ "ohos.permission.READ_DOCUMENT", @@ -430,9 +399,9 @@ export const groups: any[] = [ }, { "name": "CALENDAR_ALL", - "groupName": '全部日历', + "groupName": $r("app.string.groupName_calendar_all"), "icon": $r('app.media.ic_public_calendar'), - "label": "访问全部日历？", + "label": $r("app.string.group_label_calendar_all"), "description": "", "permissions": [ "ohos.permission.READ_WHOLE_CALENDAR", diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index 1c07b9dbbf3c70bb58d8aa007ff1da59c2154de1..cb0bada647b6f68c0e332786f2140e1de07f4110 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -380,6 +380,8 @@ export default class Constants { //global dialog static ROW_HEIGHT = 56 + static ROW_PADDING_TOP = 14 + static ROW_PADDING_BOTTOM = 14 static DIALOG_MARGIN_BOTTOM = 12 // diff --git a/permissionmanager/src/main/ets/pages/application-secondary.ets b/permissionmanager/src/main/ets/pages/application-secondary.ets index 9556d4dd6655c69a9f55652bc6c7092d028ca490..447dafbbda44717e1b9b01f94de882acc19d0222 100644 --- a/permissionmanager/src/main/ets/pages/application-secondary.ets +++ b/permissionmanager/src/main/ets/pages/application-secondary.ets @@ -72,7 +72,7 @@ struct appNamePlusPage { }.onClick(() => { globalThis.currentPermissionGroup = item.group if (status === 'allow') { - if (item.groupName == "其他权限") { + if (item.group == "OTHER") { router.push({ uri: 'pages/other-permissions', params: { @@ -96,7 +96,7 @@ struct appNamePlusPage { } } else if (status === 'banned') { - if (item.groupName == "其他权限") { + if (item.group == "OTHER") { router.push({ uri: 'pages/other-permissions', params: { diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index e488af43a5ac80f3d7e3faa2a1b4bd72d061f5dd..ebcd1cb47a2d0a764e807a47f5e98def7d07243c 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -175,11 +175,7 @@ struct mediaDocumentItem { if(showSubpermissionsGrop.indexOf(globalThis.currentPermissionGroup) != -1) { reason = [] permissions.forEach(permission => { - permissionGroups.forEach(permissionGroup => { - if(permissionGroup.permissionName == permission) { - reason.push(permissionGroup.label) - } - }) + reason.push(globalThis.permissionLabels[permission]) }) Promise.all([globalThis.context.resourceManager.getString($r("app.string.separator").id), globalThis.context.resourceManager.getString($r("app.string.reason_suffix").id)]) diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index d66c5402c9c0ca9cb4b9186495f984454cad5167..3e9f8add6aa32fb2a2416b20cc6ffc2d09262376 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -22,7 +22,7 @@ import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import audio from '@ohos.multimedia.audio' import camera from '@ohos.multimedia.camera' import { groups, userGrantPermissions, permissionGroupPermissions, noNeedDisplayApp, globalGroup } from "../common/model/permissionGroup"; -import { permissionGroups, permissionGroupIds } from "../common/model/permissionGroup"; +import { permissionGroups, permissionGroupIds, showSubpermissionsGrop } from "../common/model/permissionGroup"; import { makePy } from "../common/utils/utils"; import Constants from '../common/utils/constant'; @@ -97,11 +97,10 @@ struct authorityManagementPage { } } }.onClick(() => { - if (item.groupName === '其他权限' || item.groupName === '电话' || item.groupName === '通讯录' || item.groupName === '信息' - || item.groupName === '通话记录' || item.groupName === '日历') { + if (item.group === 'OTHER' || showSubpermissionsGrop.indexOf(item.group) !== -1) { router.push({ uri: 'pages/authority-secondary', - params: { routerData: this.allPermissionApplications, backTitle: item.groupName } + params: { routerData: this.allPermissionApplications, backTitle: item.groupName, group: item.group } }) } else { var dataList = this.allPermissionApplications.filter((ele) => { @@ -233,6 +232,7 @@ struct authorityManagementPage { item.alphabeticalIndex = makePy(item.labelId)[0].slice(0, 1); // Get the first letter in the returned initials array } }) + this.getPermissionLabel() }) .catch((error) => { console.error(TAG + 'bundle.getAllBundleInfo failed. Cause: ' + JSON.stringify(error)); @@ -252,6 +252,21 @@ struct authorityManagementPage { } } + /** + * Get all permission label + */ + getPermissionLabel() { + globalThis.allUserPermissions.forEach(userPermission => { + permissionGroups.forEach(permissionInfo => { + if(userPermission == permissionInfo.permissionName) { + globalThis.context.resourceManager.getString(permissionInfo.label.id).then(val => { + globalThis.permissionLabels[userPermission] = val + }) + } + }) + }) + } + /** * Get all app permission information */ diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index 3a5a3d90f1b3303e0c7b807f2fbe2b9f5165ca8e..e828f3c25a324481b2ae4ec3cd5c8f380131c542 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -22,13 +22,11 @@ import Constants from '../common/utils/constant'; class CalendarObj { permissionName: string groupName: string - description: string label: string index: number - constructor(permissionName: string, groupName: string, description: string, label: string, index: number) { + constructor(permissionName: string, groupName: string, label: string, index: number) { this.permissionName = permissionName this.groupName = groupName - this.description = description this.label = label this.index = index } @@ -92,7 +90,7 @@ struct appNameItem { @State calendarListItem: CalendarObj[] = []; // Permission management secondary interface data array private routerData: any = router.getParams().routerData; // Routing jump data private backTitle = router.getParams().backTitle; // return title name - private allPermissionApplications = router.getParams().allPermissionApplications; // Array of all app permission names + private group = router.getParams().group; @Builder ListItemLayout(item, index) { ListItem() { @@ -139,13 +137,13 @@ struct appNameItem { */ aboutToAppear() { var permissionsList = groups.filter((item) => { - return item.groupName === this.backTitle + return item.name === this.group }) for (let i = 0; i < permissionsList[0].permissions.length; i++) { permissionGroups.forEach((item) => { if (item.permissionName === permissionsList[0].permissions[i]) { this.calendarListItem.push( - new CalendarObj(item.permissionName, item.groupName, item.description, item.label, i) + new CalendarObj(item.permissionName, item.groupName, item.label, i) ) } }) diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index a01722f4948435e3c5e0c8b1d7d83cbcb4bb80f7..1b3b2e0101360bdff3774aa65c55bff6e5e9d07e 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -35,6 +35,8 @@ import { LocationCanvas } from '../common/components/location' const FUZZY_LOCATION_PERMISSION = 'ohos.permission.APPROXIMATELY_LOCATION' const PRECISE_LOCATION_PERMISSION = 'ohos.permission.LOCATION' +let permissionLabels: Object = {} + @Entry @Component struct dialogPlusPage { @@ -311,20 +313,12 @@ struct PermissionDialog { var exist = this.grantGroups.find(grantGroup => grantGroup.name == group.name) //判断是否为需要展示子权限的权限组 if(showSubpermissionsGrop.indexOf(group.name) != -1) { - var permissionDetail - permissionGroups.forEach(permissionGroup => { - if(permissionGroup.permissionName == permission) { - //获取授权的权限信息 - permissionDetail = permissionGroup - } - }) - //权限组已存在的情况 if(!exist) { - group.description = [permissionDetail.label] + group.description = [permissionLabels[permission]] this.grantGroups.push(group) }else { - if(exist.description.indexOf(permissionDetail.label) == -1) { - exist.description.push(permissionDetail.label) + if(exist.description.indexOf(permissionLabels[permission]) == -1) { + exist.description.push(permissionLabels[permission]) } } }else { @@ -357,6 +351,9 @@ struct PermissionDialog { }) bundleManager.getBundleInfo(bundleName, Constants.PARMETER_BUNDLE_FLAG).then(info => { this.grantGroups.forEach((group) => { + globalThis.extensionContext.resourceManager.getString(group.label.id, (err, val) => { + group.label = val + }) if(group.description) { Promise.all([globalThis.extensionContext.resourceManager.getString($r("app.string.separator").id), globalThis.extensionContext.resourceManager.getString($r("app.string.reason_suffix").id)]) @@ -400,6 +397,15 @@ struct PermissionDialog { globalThis.extensionContext.resourceManager.getString($r("app.string.fuzzy_to_exact").id, (err, val) => { this.resource.fuzzy_to_exact = val }) + this.reqPerms.forEach(reqPerm => { + permissionGroups.forEach(permissionInfo => { + if(reqPerm == permissionInfo.permissionName) { + globalThis.extensionContext.resourceManager.getString(permissionInfo.label.id).then(val => { + permissionLabels[reqPerm] = val + }) + } + }) + }) } aboutToAppear() { diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index 52a861ce5445fec64fd607669e45c19aef65c530..25e0f5e05ffee321707c3eb19fc9ebc05a083b7f 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -63,9 +63,9 @@ struct globalDialog { .fontColor($r('app.color.label_color')) .fontWeight(FontWeight.Medium) .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) - .height(Constants.ROW_HEIGHT) .width(Constants.FULL_WIDTH) - .padding({ left: Constants.DIALOG_DESP_MARGIN_LEFT, right: Constants.DIALOG_DESP_MARGIN_RIGHT }) + .padding({ left: Constants.DIALOG_DESP_MARGIN_LEFT, right: Constants.DIALOG_DESP_MARGIN_RIGHT, + top: Constants.ROW_PADDING_TOP, bottom: Constants.ROW_PADDING_BOTTOM}) Text(globalThis.globalState == MICROPHONE ? $r('app.string.global_desc_microphone') : globalThis.globalState == CAMERA ? $r('app.string.global_desc_camera') : $r('app.string.global_desc_camera_and_microphone')) diff --git a/permissionmanager/src/main/ets/pages/permission-access-record.ets b/permissionmanager/src/main/ets/pages/permission-access-record.ets index c676af21297f0a331cef498664c5d6ddbb5648b5..328468df1abb85aaec0e5223d64cb97545457f1c 100644 --- a/permissionmanager/src/main/ets/pages/permission-access-record.ets +++ b/permissionmanager/src/main/ets/pages/permission-access-record.ets @@ -338,7 +338,7 @@ struct permissionRecordPage { * @param {Number} The time stamp */ getTime(time, format='MM月DD日 NNHH:mm') { - if(this.strings.morning == 'am') { format = 'MM/DD HH:mm NN' } + if(this.strings.morning == 'am') { format = 'HH:mm NN MM/DD' } let date = new Date(time * 1000) let config = { MM: date.getMonth() + 1, diff --git a/permissionmanager/src/main/resources/base/element/string.json b/permissionmanager/src/main/resources/base/element/string.json index b5dc7f04f4de5b4def432a5bf799920185b7f65c..eb02e4628af956dc921c1eec6b3fbb5bff9a2835 100644 --- a/permissionmanager/src/main/resources/base/element/string.json +++ b/permissionmanager/src/main/resources/base/element/string.json @@ -18,7 +18,7 @@ }, { "name": "access_permission", - "value": "access permission" + "value": " access permission" }, { "name": "permission_access_record", @@ -58,19 +58,19 @@ }, { "name": "reason_suffix", - "value": " and other permissions." + "value": " and other permissions. " }, { "name": "separator", - "value": "," + "value": ", " }, { "name": "visits", - "value": "Number of visits:" + "value": "Number of visits: " }, { "name": "recent_visit", - "value": ";Recent visits:" + "value": "; Recent visits: " }, { "name": "morning", @@ -199,6 +199,126 @@ { "name": "close_camera_desc", "value": "After it is turned off, all apps will not be able to use the camera properly to take photos, videos or perform face recognition. To restore data, turn on the camera switch." + }, + { + "name": "groupName_location", + "value": "Location information" + }, + { + "name": "groupName_camera", + "value": "Camera" + }, + { + "name": "groupName_microphone", + "value": "Microphone" + }, + { + "name": "groupName_phone", + "value": "Phone" + }, + { + "name": "groupName_sms", + "value": "Information" + }, + { + "name": "groupName_contacts", + "value": "Address book" + }, + { + "name": "groupName_call_log", + "value": "Call log" + }, + { + "name": "groupName_media", + "value": "Media & Documents" + }, + { + "name": "groupName_calendar", + "value": "Calendar" + }, + { + "name": "groupName_sport", + "value": "Fitness" + }, + { + "name": "groupName_health", + "value": "Body sensor" + }, + { + "name": "groupName_other", + "value": "Other rights" + }, + { + "name": "groupName_calendar_all", + "value": "All of the calendar" + }, + { + "name": "multi_device_collaboration", + "value": "Multi-device collaboration" + }, + { + "name": "group_label_location", + "value": " access location information?" + }, + { + "name": "group_label_camera", + "value": " using a camera?" + }, + { + "name": "group_label_microphone", + "value": " using a microphone?" + }, + { + "name": "group_label_phone", + "value": " use to dial a phone?" + }, + { + "name": "group_label_sms", + "value": " access to information?" + }, + { + "name": "group_label_contacts", + "value": " access the address book?" + }, + { + "name": "group_label_call_log", + "value": " access to call records?" + }, + { + "name": "group_label_media", + "value": " access to media and files?" + }, + { + "name": "group_label_calendar", + "value": " access to the calendar?" + }, + { + "name": "group_label_sport", + "value": " visit the gym?" + }, + { + "name": "group_label_health", + "value": " use body sensors?" + }, + { + "name": "group_label_distributed_datasync", + "value": " use multiple device collaboration?" + }, + { + "name": "group_label_image_and_videos", + "value": " access to pictures and videos?" + }, + { + "name": "group_label_audios", + "value": " access to music and audio?" + }, + { + "name": "group_label_document", + "value": " access to files?" + }, + { + "name": "group_label_calendar_all", + "value": " access the entire calendar?" } ] } \ No newline at end of file diff --git a/permissionmanager/src/main/resources/zh_CN/element/string.json b/permissionmanager/src/main/resources/zh_CN/element/string.json index ee41e2f36ec72c757261297da58834967a519fb9..df03e1ccb5818a472f81e237bd0f7f2abbc207d4 100644 --- a/permissionmanager/src/main/resources/zh_CN/element/string.json +++ b/permissionmanager/src/main/resources/zh_CN/element/string.json @@ -199,6 +199,126 @@ { "name": "close_camera_desc", "value": "关闭后，所有应用服务都将无法正常使用摄像头拍摄照片、视频或进行人脸识别。若需恢复，请打开摄像头开关。" + }, + { + "name": "groupName_location", + "value": "位置信息" + }, + { + "name": "groupName_camera", + "value": "相机" + }, + { + "name": "groupName_microphone", + "value": "麦克风" + }, + { + "name": "groupName_phone", + "value": "电话" + }, + { + "name": "groupName_sms", + "value": "信息" + }, + { + "name": "groupName_contacts", + "value": "通讯录" + }, + { + "name": "groupName_call_log", + "value": "通话记录" + }, + { + "name": "groupName_media", + "value": "媒体和文件" + }, + { + "name": "groupName_calendar", + "value": "日历" + }, + { + "name": "groupName_sport", + "value": "健身运动" + }, + { + "name": "groupName_health", + "value": "身体传感器" + }, + { + "name": "groupName_other", + "value": "其他权限" + }, + { + "name": "groupName_calendar_all", + "value": "全部日历" + }, + { + "name": "multi_device_collaboration", + "value": "多设备协同" + }, + { + "name": "group_label_location", + "value": "访问位置信息？" + }, + { + "name": "group_label_camera", + "value": "使用相机？" + }, + { + "name": "group_label_microphone", + "value": "使用麦克风？" + }, + { + "name": "group_label_phone", + "value": "使用拨打电话？" + }, + { + "name": "group_label_sms", + "value": "访问信息？" + }, + { + "name": "group_label_contacts", + "value": "访问通讯录？" + }, + { + "name": "group_label_call_log", + "value": "访问通话记录？" + }, + { + "name": "group_label_media", + "value": "访问媒体和文件？" + }, + { + "name": "group_label_calendar", + "value": "访问日历？" + }, + { + "name": "group_label_sport", + "value": "访问健身运动？" + }, + { + "name": "group_label_health", + "value": "使用身体传感器？" + }, + { + "name": "group_label_distributed_datasync", + "value": "使用多设备协同？" + }, + { + "name": "group_label_image_and_videos", + "value": "访问图片和视频？" + }, + { + "name": "group_label_audios", + "value": "访问音乐和音频？" + }, + { + "name": "group_label_document", + "value": "访问文件？" + }, + { + "name": "group_label_calendar_all", + "value": "访问全部日历？" } ] } \ No newline at end of file