From 4c13a73ad51629f77442d2d3fc993f2bd42b5957 Mon Sep 17 00:00:00 2001 From: 18112475621 Date: Mon, 21 Feb 2022 14:19:11 +0800 Subject: [PATCH] Signed-off-by: 18112475621 Signed-off-by: 18112475621 Signed-off-by: 18112475621 Signed-off-by: 18112475621 Signed-off-by: 18112475621 Update permission-manager code Signed-off-by: 18112475621 --- .../entry/src/main/ets/default/app.ets | 2 - .../ets/default/common/components/backBar.ets | 2 +- .../default/common/model/permissionGroup.ets | 27 +--- .../ets/default/common/utils/constant.ets | 30 ++-- .../main/ets/default/common/utils/utils.ets | 9 +- .../default/pages/application-secondary.ets | 74 ++++++---- .../default/pages/application-tertiary.ets | 137 +++++++++++------- .../default/pages/authority-management.ets | 75 +++++----- .../ets/default/pages/authority-secondary.ets | 70 ++------- .../ets/default/pages/authority-tertiary.ets | 54 ++++--- .../ets/default/pages/other-permissions.ets | 66 +++------ .../src/main/ets/dynamic/app.ets | 2 - .../main/resources/base/element/color.json | 8 +- .../main/resources/base/element/string.json | 12 ++ .../src/main/resources/base/media/ic_more.svg | 2 +- .../base/media/ic_public_calendar.svg | 2 +- .../resources/base/media/ic_public_camera.svg | 2 +- .../base/media/ic_public_contacts_group.svg | 2 +- .../resources/base/media/ic_public_folder.svg | 2 +- .../resources/base/media/ic_public_gps.svg | 2 +- .../base/media/ic_public_message.svg | 2 +- .../resources/base/media/ic_public_phone.svg | 2 +- .../resources/base/media/ic_public_voice.svg | 2 +- .../main/resources/base/media/ic_sport.svg | 2 +- .../main/resources/base/media/ic_ssensor.svg | 2 +- .../src/main/resources/base/media/loading.gif | Bin 3897 -> 0 bytes .../src/ohosTest/ets/default/app.ets | 3 - .../ets/default/pages/index/index.ets | 3 - 28 files changed, 296 insertions(+), 300 deletions(-) delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/loading.gif diff --git a/frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/app.ets b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/app.ets index 9ae634daa..05b8ea999 100644 --- a/frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/app.ets +++ b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/app.ets @@ -15,9 +15,7 @@ export default { onCreate() { - console.info('Application onCreate') }, onDestroy() { - console.info('Application onDestroy') }, } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/backBar.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/backBar.ets index 32ff689c7..1920b99e5 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/backBar.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/backBar.ets @@ -36,7 +36,7 @@ export struct backBar { router.back(); }) Text(JSON.parse(this.title)) - .fontColor($r('app.color.title_text_color')) + .fontColor($r('app.color.text_color')) .fontSize(Constants.BACKBAR_TEXT_FONT_SIZE) .flexGrow(Constants.BACKBAR_TEXT_FLEX_GROW) .margin({ top: Constants.BACKBAR_TEXT_MARGIN_TOP }) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/model/permissionGroup.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/model/permissionGroup.ets index 3fe899e3b..61164ca09 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/model/permissionGroup.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/model/permissionGroup.ets @@ -181,13 +181,6 @@ export const permissionGroups: any[] = [ "label": "允许不同设备间数据交换", "description": "允许应用与远程设备交换用户数据（如图片、音乐、视频、及应用数据等）。", "groupId": 11 - }, - { - "permissionName": "ohos.permission.DISTRIBUTED_DATASYNC", - "groupName": "OTHERA", - "label": "允许不同设备间数据交换A", - "description": "允许应用与远程设备交换用户数据（如图片、音乐、视频、及应用数据等）。", - "groupId": 11 } ]; @@ -310,18 +303,6 @@ export const groups: any[] = [ "description": "访问您的其它权限", "permissions": [ "ohos.permission.DISTRIBUTED_DATASYNC" - ], - "children":[ - { - "name": "OTHER", - "groupName": "其他权限A", - "icon": $r('app.media.ic_more'), - "description": "访问您的其它权限", - "permissions": [ - "ohos.permission.DISTRIBUTED_DATASYNC", - "ohos.permission.DISTRIBUTED_DATASYNC" - ] - } ] } ]; @@ -338,7 +319,7 @@ export const permissionGroupPermissions: object = { "CALENDAR": ["ohos.permission.READ_CALENDAR", "ohos.permission.WRITE_CALENDAR"], "SPORT": ["ohos.permission.ACTIVITY_MOTION"], "HEALTH": ["ohos.permission.READ_HEALTH_DATA"], - "OTHER": ["ohos.permission.DISTRIBUTED_DATASYNCC","ohos.permission.DISTRIBUTED_DATASYNCD"] + "OTHER": ["ohos.permission.DISTRIBUTED_DATASYNC"] }; @@ -451,4 +432,8 @@ export const orderGroup: string[] = [ "健身运动", "身体传感器", "其他权限" -]; \ No newline at end of file +]; + +export const otherPermissionsLabel: object = { + "ohos.permission.DISTRIBUTED_DATASYNC": "允许不同设备间数据交换" +}; \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/constant.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/constant.ets index 0730cbfa0..7e0ed321a 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/constant.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/constant.ets @@ -29,7 +29,7 @@ export default class Constants { static BACKBAR_IMAGE_HEIGHT = 24; static BACKBAR_IMAGE_WIDTH = 24; static BACKBAR_IMAGE_MARGIN_TOP = 17; - static BACKBAR_IMAGE_MARGIN_LEFT = 24; + static BACKBAR_IMAGE_MARGIN_LEFT = 12; static BACKBAR_IMAGE_MARGIN_RIGHT = 15; // text of backBar @@ -97,7 +97,8 @@ export default class Constants { static CONSTRAINTSIZE_MINHEIGHT = 48; static LISTITEM_ROW_HEIGHT = 48; static LISTITEM_PADDING_LEFT = 24; - static LISTITEM_PADDING_RIGHT = 24; + static LIST_PADDING_LEFT = 12 + static LISTITEM_PADDING_RIGHT = 12; static IMAGE_HEIGHT = 24; static IMAGE_WIDTH = 12; static BORDER_RADIUS = 24; @@ -110,11 +111,13 @@ export default class Constants { static ROW_MARGIN_TOP = 9; static SECONDARY_TEXT_MARGIN_TOP = 19.5; static SECONDARY_TEXT_MARGIN_LEFT = 48; + static SECONDARY_LIST_PADDING_LEFT = 12; + static SECONDARY_LIST_PADDING_RIGHT = 12; - // application-tertiary + // application-tertiary` static TERTIARY_IMAGE_WIDTH = 64; static TERTIARY_IMAGE_HEIGHT = 64; - static TERTIARY_IMAGE_MARGIN_LEFT = 24; + static TERTIARY_IMAGE_MARGIN_LEFT = 12; static TERTIARY_IMAGE_MARGIN_RIGHT = 12; static TERTIARY_HALF_WIDTH = '50%'; static TERTIARY_ROW_MARGIN_TOP = 24; @@ -122,8 +125,8 @@ export default class Constants { static TERTIARY_RADIO_IMAGE_WIDTH = 24; static TERTIARY_RADIO_IMAGE_HEIGHT = 24; static TERTIARY_RADIO_IMAGE_MARGIN_TOP = 4; - static TERTIARY_LISTITEM_PADDING_LEFT = 12; - static TERTIARY_LISTITEM_PADDING_RIGHT = 12; + static TERTIARY_LISTITEM_PADDING_LEFT = 24; + static TERTIARY_LISTITEM_PADDING_RIGHT = 24; static TERTIARY_LISTITEM_MARGIN_TOP = 1; static TERTIARY_LIST_PADDING_LEFT = 12; static TERTIARY_LIST_PADDING_RIGHT = 12; @@ -143,13 +146,15 @@ export default class Constants { static AUTHORITY_TEXTINPUT_PADDING_LEFT = 12; static AUTHORITY_TEXTINPUT_PADDING_RIGHT = 4; static AUTHORITY_TEXT_MARGIN_TOP = 24; - static AUTHORITY_TEXT_MARGIN_LEFT = 12; + static AUTHORITY_TEXT_MARGIN_LEFT = 0; static AUTHORITY_ROW_MARGIN_TOP = 24; static SEARCHNORESULT_IMAGE_WIDTH = 200; static SEARCHNORESULT_IMAGE_HEIGHT = 200; static AUTHORITY_COLUMN_HEIGHT = '95%'; static AUTHORITY_ALPHABETINDEX_WIDTH = 24; static AUTHORITY_ALPHABETINDEX_PADDING_TOP = 16; + static AUTHORITY_TEXT_DECORATION_WIDTH = '86%'; + static AUTHORITY_TEXT_DECORATION_MARGIN_LEFT = 53; // authority-management static MANAGEMENT_IMAGE_WIDTH = 24; @@ -169,6 +174,7 @@ export default class Constants { static APPLICATION_IMAGE_HEIGHT = 40; static APPLICATION_IMAGE_MARGIN_RIGHT = 16; static APPLICATION_TEXT_MARGIN_RIGHT = 4; + static APPLICATION_LIST_PADDING_LEFT = 12; static APPLICATION_LISTITEM_PADDING_LEFT = 12; static APPLICATION_LISTITEM_PADDING_RIGHT = 12; static APPLICATION_TEXTINPUT_PADDING_LEFT = 12; @@ -177,8 +183,8 @@ export default class Constants { static APPLICATION_COLUMN_HEIGHT = '93%'; static APPLICATION_ALPHABETINDEX_MARGIN_TOP = 12; static APPLICATION_ALPHABETINDEX_WIDTH = 24; - static APPLICATION_TEXT_DECORATION_WIDTH = '85%'; - static APPLICATION_TEXT_DECORATION_MARGIN_LEFT = 56; + static APPLICATION_TEXT_DECORATION_WIDTH = '83%'; + static APPLICATION_TEXT_DECORATION_MARGIN_LEFT = 68; // slice static SLICE_START = 0; @@ -187,7 +193,7 @@ export default class Constants { static SLICE_END_INDEX = 1; // tabBar - static BAR_WIDTH = 744; + static BAR_WIDTH = 250; // setTimeout static DELAY_TIME = 1000; @@ -209,4 +215,8 @@ export default class Constants { static USERID = 100; static PERMISSION_INDEX = 0; + + static PERMISSION_NUM = 0; + + static PERMISSION_FLAG = 2; } \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/utils.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/utils.ets index 9e4b034cc..08b2a34be 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/utils.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/utils.ets @@ -29,7 +29,8 @@ export function getAppLabel(labelId, bundleName) { item.getString(labelId, (error, value) => { resolve(value); }) - }).catch(e => { + }).catch(error => { + console.error('Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error)); }) }) } @@ -45,7 +46,8 @@ export function getAppIcon(iconId, bundleName) { item.getMediaBase64(iconId, (error, value) => { resolve(value); }) - }).catch(e => { + }).catch(error => { + console.error('Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error)); }) }) } @@ -60,6 +62,9 @@ export function verifyAccessToken(accessTokenId, permission) { abilityAccessCtrl.createAtManager().verifyAccessToken(accessTokenId, permission).then((res) => { return resolve(res); }) + .catch((error) => { + console.error('verifyAccessToken failed. Cause: ' + JSON.stringify(error)); + }) }) } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-secondary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-secondary.ets index f050e690e..0876bbb9b 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-secondary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-secondary.ets @@ -78,26 +78,50 @@ struct appNamePlusPage { } }.onClick(() => { if (status === 'allow') { - router.push({ - uri: 'pages/application-tertiary', - params: { - routerData: this.routerData.bundleName, - backTitle: item.groupName, - permission: item.permission, - status: allowedStatus - } - }); + if (item.groupName == "其他权限") { + router.push({ + uri: 'pages/other-permissions', + params: { + routerData: this.routerData.bundleName, + backTitle: item.groupName, + permission: item.permission, + status: allowedStatus + } + }); + } else { + router.push({ + uri: 'pages/application-tertiary', + params: { + routerData: this.routerData.bundleName, + backTitle: item.groupName, + permission: item.permission, + status: allowedStatus + } + }); + } } else if (status === 'banned') { - router.push({ - uri: 'pages/application-tertiary', - params: { - routerData: this.routerData.bundleName, - backTitle: item.groupName, - permission: item.permission, - status: bannedStatus - } - }); + if (item.groupName == "其他权限") { + router.push({ + uri: 'pages/other-permissions', + params: { + routerData: this.routerData.bundleName, + backTitle: item.groupName, + permission: item.permission, + status: bannedStatus + } + }); + } else { + router.push({ + uri: 'pages/application-tertiary', + params: { + routerData: this.routerData.bundleName, + backTitle: item.groupName, + permission: item.permission, + status: bannedStatus + } + }); + } } }) } @@ -127,9 +151,9 @@ struct appNamePlusPage { } } if (isGranted) { - this.allowedListItem.push(new AllowedObj(groups[ids[i]].groupName, reqPermissions[0])); + this.allowedListItem.push(new AllowedObj(groups[ids[i]].groupName, reqPermissions)); } else { - this.bannedListItem.push(new BannedObj(groups[ids[i]].groupName, reqPermissions[0])); + this.bannedListItem.push(new BannedObj(groups[ids[i]].groupName, reqPermissions)); } } } @@ -201,7 +225,7 @@ struct appNamePlusPage { .borderRadius(Constants.BORDER_RADIUS) .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + .padding({ left: Constants.SECONDARY_LIST_PADDING_LEFT, right: Constants.SECONDARY_LIST_PADDING_RIGHT }) } else { if (this.allowedListItem.length) { Row() { @@ -210,7 +234,7 @@ struct appNamePlusPage { .fontSize(Constants.TEXT_SMAL_FONT_SIZE) .margin({ top: Constants.SECONDARY_TEXT_MARGIN_TOP, - left: Constants.SECONDARY_TEXT_MARGIN_LEFT + left: Constants.SECONDARY_LIST_PADDING_RIGHT }) } } @@ -228,7 +252,7 @@ struct appNamePlusPage { .borderRadius(Constants.BORDER_RADIUS) .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + .padding({ left: Constants.SECONDARY_LIST_PADDING_LEFT, right: Constants.SECONDARY_LIST_PADDING_RIGHT }) } if (this.bannedListItem.length) { Row() { @@ -237,7 +261,7 @@ struct appNamePlusPage { .fontSize(Constants.TEXT_SMAL_FONT_SIZE) .margin({ top: Constants.SECONDARY_TEXT_MARGIN_TOP, - left: Constants.SECONDARY_TEXT_MARGIN_LEFT + left: Constants.SECONDARY_LIST_PADDING_RIGHT }) } } @@ -255,7 +279,7 @@ struct appNamePlusPage { .borderRadius(Constants.BORDER_RADIUS) .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + .padding({ left: Constants.SECONDARY_LIST_PADDING_LEFT, right: Constants.SECONDARY_LIST_PADDING_RIGHT }) } } } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-tertiary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-tertiary.ets index ce2a88334..b1d7eab8c 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-tertiary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-tertiary.ets @@ -16,34 +16,38 @@ import { backBar } from "../common/components/backBar.ets"; import router from '@system.router'; import bundle from "@ohos.bundle"; -import { getAppLabel, getAppIcon } from "../common/utils/utils"; +import { getAppLabel, getAppIcon, verifyAccessToken } from "../common/utils/utils"; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import { authorizeDialog } from "../common/components/dialog.ets"; -import { permissionDescriptions } from "../common/model/permissionGroup.ets"; +import { permissionDescriptions, permissionGroups } from "../common/model/permissionGroup.ets"; import Constants from '../common/utils/constant.ets'; let routerData = router.getParams().routerData; // Routing jump data let backTitle = router.getParams().backTitle; // return title name let status = router.getParams().status; // Status: Allowed, Forbidden -let permission = router.getParams().permission; // permission name +let permissions = router.getParams().permission; // permissions name +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 class MeidaDocObj { name: string index: number groupName: string accessTokenId: string - permission: string + permissions: [] constructor( name: string, index: number, groupName: string, accessTokenId: string, - permission: string + permissions: [] ) { this.name = name this.index = index this.groupName = groupName this.accessTokenId = accessTokenId - this.permission = permission + this.permissions = permissions } }; // permission information class class MediaListObj { @@ -83,7 +87,11 @@ struct mediaDocumentPage { Row() { Column() { Row() { - backBar({ title: JSON.stringify(backTitle) }) + if(backTitle == "其他权限"){ + backBar({ title: JSON.stringify($r("app.string.othet_permission_label")) }) + }else { + backBar({ title: JSON.stringify(backTitle) }) + } } Row() { Column() { @@ -138,21 +146,13 @@ struct mediaDocumentItem { * @param {Number} accessTokenId * @param {String} permission permission name */ - async grantUserGrantedPermission(accessTokenId, permission) { - var permissionFlag = await abilityAccessCtrl.createAtManager(). - getPermissionFlags(accessTokenId, permission); + grantUserGrantedPermission(accessTokenId, permission) { abilityAccessCtrl.createAtManager().grantUserGrantedPermission( - accessTokenId, permission, permissionFlag).then(result => { - // result: 0 Authorization succeeded; result: -1 Authorization failed - if (result !== Constants.PERMISSION_INDEX) { - this.authorizeDialogController.open(); - setTimeout(()=> { - this.authorizeDialogController.close(); - }, Constants.DELAY_TIME) - } else { - this.isCheckList = [true, false]; - } - }).catch(error => { + accessTokenId, permission, Constants.PERMISSION_FLAG).then((result) => { + nowGrantResult = result; + }) + .catch((error) => { + console.error('grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error)); }) } @@ -161,21 +161,14 @@ struct mediaDocumentItem { * @param {Number} accessTokenId * @param {String} permission permission name */ - async revokeUserGrantedPermission(accessTokenId, permission) { - var permissionFlag = await abilityAccessCtrl.createAtManager(). - getPermissionFlags(accessTokenId, permission); + revokeUserGrantedPermission(accessTokenId, permission) { abilityAccessCtrl.createAtManager().revokeUserGrantedPermission( - accessTokenId, permission, permissionFlag).then(result => { - // result: 0 successfully cancel the authorization; result: -1 cancel the authorization failed - if (result !== Constants.PERMISSION_INDEX) { - this.authorizeDialogController.open(); - setTimeout(()=> { - this.authorizeDialogController.close(); - }, Constants.DELAY_TIME) - } else { - this.isCheckList = [false, true]; - } + accessTokenId, permission, Constants.PERMISSION_FLAG).then((result) => { + nowRevokeResult = result; }) + .catch((error) => { + console.error('revokeUserGrantedPermission failed. Cause: ' + JSON.stringify(error)); + }) } /** @@ -196,7 +189,7 @@ struct mediaDocumentItem { Constants.RADIO_ALLOW_INDEX, Constants.RADIO_ALLOW_GROUP_NAME, res.appInfo.accessTokenId, - permission + permissions ) ); this.mediaDocListItem.push( @@ -205,18 +198,19 @@ struct mediaDocumentItem { Constants.RADIO_BAN_INDEX, Constants.RADIO_BAN_GROUP_NAME, res.appInfo.accessTokenId, - permission + permissions ) ); - }).catch(() => { + }).catch((error) => { + console.error('bundle.getBundleInfo failed. Cause: ' + JSON.stringify(error)); this.mediaListItem = new MediaListObj('', '', '', permissionDescription); this.mediaDocListItem.push( new MeidaDocObj(Constants.RADIO_ALLOW_NAME, Constants.RADIO_ALLOW_INDEX, - Constants.RADIO_ALLOW_GROUP_NAME, '', permission) + Constants.RADIO_ALLOW_GROUP_NAME, '', permissions) ); this.mediaDocListItem.push( new MeidaDocObj(Constants.RADIO_BAN_NAME, Constants.RADIO_BAN_INDEX, - Constants.RADIO_BAN_GROUP_NAME, '', permission) + Constants.RADIO_BAN_GROUP_NAME, '', permissions) ); }) // Get permission status @@ -239,7 +233,7 @@ struct mediaDocumentItem { Row() { Text(this.mediaListItem.labelId) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.title_text_color')) + .fontColor($r('app.color.text_color')) .textAlign(TextAlign.Start) } .width(Constants.TERTIARY_HALF_WIDTH) @@ -255,7 +249,7 @@ struct mediaDocumentItem { Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Text(this.mediaListItem.description) + Text() .fontSize(Constants.TEXT_SMALLER_FONT_SIZE) .textAlign(TextAlign.Start) }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) @@ -265,9 +259,15 @@ struct mediaDocumentItem { Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Text(backTitle + '访问权限') - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .textAlign(TextAlign.Start) + if (backTitle === "其他权限") { + Text($r("app.string.othet_permission_label_description")) + .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .textAlign(TextAlign.Start) + } else { + Text(backTitle + "访问权限") + .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .textAlign(TextAlign.Start) + } }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) } } @@ -305,13 +305,46 @@ struct mediaDocumentItem { .width(Constants.FULL_WIDTH) .height(Constants.LISTITEM_ROW_HEIGHT) .onClick(() => { - if (item.accessTokenId !== '' || item.permission !== ''){ + item.permissions.forEach((permission) => { + if (!item.index) { + this.grantUserGrantedPermission(item.accessTokenId, permission) + if (nowGrantResult != Constants.PERMISSION_INDEX) { + GrantResultFlag.push(-1) + }else{ + GrantResultFlag.push(0) + } + } else { + this.revokeUserGrantedPermission(item.accessTokenId, permission) + if (nowRevokeResult != Constants.PERMISSION_INDEX) { + RevokeResultFlag.push(-1) + this.authorizeDialogController.open(); + setTimeout(()=> { + this.authorizeDialogController.close(); + }, Constants.DELAY_TIME) + }else{ + RevokeResultFlag.push(0) + } + } + }) if (!item.index) { - this.grantUserGrantedPermission(item.accessTokenId, item.permission); - } else { - this.revokeUserGrantedPermission(item.accessTokenId, item.permission); + if(GrantResultFlag.indexOf(-1) > -1){ + this.authorizeDialogController.open(); + setTimeout(()=> { + this.authorizeDialogController.close(); + }, Constants.DELAY_TIME) + }else{ + this.isCheckList = [true, false]; + } + }else{ + if (RevokeResultFlag.indexOf(-1) > -1){ + this.authorizeDialogController.open(); + setTimeout(()=> { + this.authorizeDialogController.close(); + }, Constants.DELAY_TIME) + }else{ + this.isCheckList = [false, true]; + } } - } }) } } @@ -337,11 +370,13 @@ struct mediaDocumentItem { .borderRadius(Constants.BORDER_RADIUS) .backgroundColor($r('app.color.default_background_color')) .padding({ - left: Constants.TERTIARY_LIST_PADDING_LEFT, right: Constants.TERTIARY_LIST_PADDING_RIGHT, top: Constants.TERTIARY_LIST_PADDING_TOP, bottom: Constants.TERTIARY_LIST_PADDING_BOTTOM }) } - .padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + .padding({ + left: Constants.LIST_PADDING_LEFT, + right: Constants.LIST_PADDING_LEFT + }) .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) .backgroundColor($r('app.color.background_color')) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-management.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-management.ets index b7491df34..e04b53856 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-management.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-management.ets @@ -87,31 +87,33 @@ struct authorityManagementPage { } } }.onClick(() => { - if (item.group == "OTHER") { + if (item.groupName === '其他权限') { router.push({ - uri: 'pages/other-permissions', + uri: 'pages/authority-secondary', params: { routerData: this.allPermissionApplications, backTitle: item.groupName } - }); + }) } else { - // 1: Indicates that there is a permission in the permission group if (item.permissions.length > 1) { router.push({ uri: 'pages/authority-secondary', params: { routerData: this.allPermissionApplications, backTitle: item.groupName } - }); + }) } else { var dataList = this.allPermissionApplications.filter((ele) => { return ele.permission === item.permissions[0] - }); + }) + var tertiaryLabel = permissionGroups.filter((ele) => { + return ele.permissionName === item.permissions[0] + })[0].label router.push({ uri: 'pages/authority-tertiary', - params: { routerData: dataList, backTitle: item.groupName } - }); + params: { routerData: dataList, backTitle: tertiaryLabel } + }) } } }) } - }.padding({ left: Constants.MANAGEMENT_ROW_PADDING_LEFT, right: Constants.MANAGEMENT_ROW_PADDING_RIGHT }) + }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.MANAGEMENT_ROW_PADDING_RIGHT }) } @State allApplicationPermissions: applicationPermissions[] = []; // All permissions apply @@ -199,6 +201,9 @@ struct authorityManagementPage { } }) }) + .catch((error) => { + console.error('bundle.getAllBundleInfo failed. Cause: ' + JSON.stringify(error)); + }) } /** @@ -342,7 +347,8 @@ struct authorityManagementPage { info['labelId'] = value; } }) - }).catch(e => { + }).catch(error => { + console.error('Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error)); }) } @@ -360,7 +366,8 @@ struct authorityManagementPage { item.getMediaBase64(info['iconId'], (error, value) => { info['iconId'] = value; }) - }).catch(e => { + }).catch(error => { + console.error('Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error)); }) } @@ -393,56 +400,41 @@ struct authorityManagementPage { Stack() { Tabs() { TabContent() { - Scroll() { - if(!this.allGroupPermission.length){ - Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }){ - Row(){ - Column() { - Image($r('app.media.loading')) - .customizeImage(Constants.MANAGEMENT_LODING_IMAGE_WIDTH, - Constants.MANAGEMENT_LODING_IMAGE_HEIGHT) - }.width(Constants.FULL_WIDTH) - .backgroundColor($r('app.color.background_color')) - }.height(Constants.MANAGEMENT_LODING_ROW_HEIGHT) - } - }else{ - Row() { - Column() { + Row() { + Column() { + Scroll() { Row() { List() { ForEach(this.allGroupPermission.slice(Constants.SLICE_START, - this.allGroupPermission.length - 1), (item) => { + this.allGroupPermission.length - 1), (item) => { this.ListItemLayout(item, Constants.SLICE_START_INDEX) }, item => item.toString()) ForEach(this.allGroupPermission.slice(Constants.SLICE_END), (item, index) => { this.ListItemLayout(item, Constants.SLICE_END_INDEX) }, 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 }) + .borderRadius(Constants.BORDER_RADIUS) + .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) }.padding({ left: Constants.MANAGEMENT_ROW_PADDING_LEFT, right: Constants.MANAGEMENT_ROW_PADDING_RIGHT, top: Constants.MANAGEMENT_ROW_PADDING_TOP }) - }.width(Constants.FULL_WIDTH) - .backgroundColor($r('app.color.background_color')) - } + } + }.width(Constants.FULL_WIDTH) + .backgroundColor($r('app.color.background_color')) } - } }.tabBar($r('app.string.authority')) TabContent() { - Scroll() { - applicationItem({ - applicationItem: bundleInfosList, - oldApplicationItem: bundleInfosList - }) - } + applicationItem({ + applicationItem: bundleInfosList, + oldApplicationItem: bundleInfosList + }) }.tabBar($r('app.string.application')) } .backgroundColor($r('app.color.background_color')) .barWidth(Constants.BAR_WIDTH) - .barMode(BarMode.Scrollable) + .barMode(BarMode.Fixed) }.height(Constants.FULL_HEIGHT) } } @@ -492,7 +484,7 @@ struct applicationItem { .flexGrow(Constants.FLEX_GROW) Text(item.permissions.length + '项权限') .fontSize(Constants.TEXT_SMAL_FONT_SIZE) - .fontColor($r('app.color.icon_color')) + .fontColor($r('app.color.text_secondary_color')) .margin({ right: Constants.APPLICATION_TEXT_MARGIN_RIGHT }) Image($r('app.media.rightarrow')) .customizeImage(Constants.IMAGE_WIDTH, Constants.IMAGE_HEIGHT) @@ -500,6 +492,7 @@ struct applicationItem { .width(Constants.FULL_WIDTH) .height(Constants.AUTHORITY_ROW_HEIGHT) .constraintSize({ minHeight: Constants.AUTHORITY_CONSTRAINTSIZE_MINHEIGHT }) + .padding({ left: Constants.APPLICATION_LIST_PADDING_LEFT}) } if (!index) { Row() { diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-secondary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-secondary.ets index 6d5d449a7..be6785d47 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-secondary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-secondary.ets @@ -23,11 +23,13 @@ class CalendarObj { groupName: string description: string label: string - constructor(permissionName: string, groupName: string, description: string, label: string) { + index: number + constructor(permissionName: string, groupName: string, description: string, label: string, index: number) { this.permissionName = permissionName this.groupName = groupName this.description = description this.label = label + this.index = index } } // Permission management secondary interface data class @@ -121,7 +123,7 @@ struct appNameItem { }) router.push({ uri: 'pages/authority-tertiary', - params: { routerData: dataList, backTitle: item.label } + params: { routerData: [dataList[item.index]], backTitle: item.label } }); }) } @@ -132,33 +134,14 @@ struct appNameItem { * Lifecycle function, executed when the page is initialized */ aboutToAppear() { - var permissionsListNomal = groups.filter((item) => { - return item.groupName === this.backTitle; - }); - var permissionsListOther = groups.filter((item) => { - return item.children !== undefined; - })[0].children.filter((item) => { - return item.groupName === this.backTitle; - }); - var arraySort = []; - for (let i = 0; i < permissionsListOther[0].permissions.length; i++) { - if (arraySort.indexOf(permissionsListOther[0].permissions[i]) === -1) { - arraySort.push(permissionsListOther[0].permissions[i]); - } - } - permissionsListOther[0].permissions = arraySort; - var permissionsList; - if (permissionsListNomal.length) { - permissionsList = permissionsListNomal; - } - if (permissionsListOther.length) { - permissionsList = permissionsListOther; - } + var permissionsList = groups.filter((item) => { + return item.groupName === this.backTitle + }) 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) + new CalendarObj(item.permissionName, item.groupName, item.description, item.label, i) ) } }) @@ -168,39 +151,7 @@ struct appNameItem { build() { Row() { Column() { - if (!this.calendarListItem.length) { - Row() { - List() { - ListItem() { - Row() { - Column() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Row() { - Column() { - Row() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Text($r('app.string.no_data')) - .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 }) - } - .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) - } - } - } - }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) - } - .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.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) - } else { - Row() { + Row() { List() { ForEach(this.calendarListItem.slice(Constants.SLICE_START, this.calendarListItem.length - 1), (item) => { this.ListItemLayout(item, Constants.SLICE_START_INDEX) @@ -211,8 +162,7 @@ struct appNameItem { }.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.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) - } + .padding({ left: Constants.LIST_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) } .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-tertiary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-tertiary.ets index 5c5f9d680..f0ef99c12 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-tertiary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-tertiary.ets @@ -19,7 +19,7 @@ import { textInput } from "../common/components/search.ets"; import router from '@system.router'; import bundle from "@ohos.bundle"; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; -import { getAppLabel, getAppIcon, verifyAccessToken, changeIndexValue } from "../common/utils/utils"; +import { getAppLabel, getAppIcon, verifyAccessToken } from "../common/utils/utils"; import { makePy } from "../common/utils/utils.ets"; import { authorizeDialog } from "../common/components/dialog.ets"; import Constants from '../common/utils/constant.ets'; @@ -106,7 +106,8 @@ struct locationInfoPage { @Component struct applicationItem { - @State toggleIsOn: boolean[] = []; // toggle switch state array + @State permissionNum: number = Constants.PERMISSION_NUM; // permission num + @State toggleIsOn: object = {}; // toggle switch state array @State applicationList: ApplicationObj[] = []; // application info array @State oldApplicationItem: ApplicationObj[] = []; // Original application information array @State searchResult: boolean = true; // search results @@ -153,14 +154,15 @@ struct applicationItem { Row() { Column() .backgroundColor($r('app.color.text_decoration_color')) - .width(Constants.FULL_WIDTH) + .width(Constants.AUTHORITY_TEXT_DECORATION_WIDTH) .height(Constants.TEXT_DECORATION_HEIGHT) + .margin({ left: Constants.AUTHORITY_TEXT_DECORATION_MARGIN_LEFT }) } } }.onClick(() => { }) } - }.padding({ left: Constants.AUTHORITY_LISTITEM_PADDING_LEFT, right: Constants.AUTHORITY_LISTITEM_PADDING_RIGHT }) + }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.AUTHORITY_LISTITEM_PADDING_RIGHT }) } /** @@ -169,22 +171,28 @@ struct applicationItem { * @param {String} permission permission name * @param {Number} index Array index to modify permission status */ - async grantUserGrantedPermission(accessTokenId, permission, index) { - var permissionFlag = await abilityAccessCtrl.createAtManager(). - getPermissionFlags(accessTokenId, permission); + grantUserGrantedPermission(accessTokenId, permission, index) { abilityAccessCtrl.createAtManager().grantUserGrantedPermission( - accessTokenId, permission, permissionFlag).then(result => { + accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => { // result: 0 Authorization succeeded; result: -1 Authorization failed if (result !== Constants.PERMISSION_INDEX) { this.authorizeDialogController.open(); - this.toggleIsOn = changeIndexValue(this.toggleIsOn, [[index, false]]); + this.toggleIsOn[index] = false; setTimeout(()=> { this.authorizeDialogController.close(); }, Constants.DELAY_TIME) } else { - this.toggleIsOn = changeIndexValue(this.toggleIsOn, [[index, true]]); + this.toggleIsOn[index] = true; } + let num = Constants.PERMISSION_NUM; + for(let key in this.toggleIsOn){ + if(this.toggleIsOn[key]){ + num++; + } + } + this.permissionNum = num; }).catch(error => { + console.error('abilityAccessCtrl.createAtManager.grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error)); }) } @@ -194,21 +202,26 @@ struct applicationItem { * @param {String} permission permission name * @param {Number} index Array index to modify permission status */ - async revokeUserGrantedPermission(accessTokenId, permission, index) { - var permissionFlag = await abilityAccessCtrl.createAtManager(). - getPermissionFlags(accessTokenId, permission); + revokeUserGrantedPermission(accessTokenId, permission, index) { abilityAccessCtrl.createAtManager().revokeUserGrantedPermission( - accessTokenId, permission, permissionFlag).then(result => { + accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => { // result: 0 successfully cancel the authorization; result: -1 cancel the authorization failed if (result !== Constants.PERMISSION_INDEX) { this.authorizeDialogController.open(); - this.toggleIsOn = changeIndexValue(this.toggleIsOn, [index, false]); + this.toggleIsOn[index] = true; setTimeout(()=> { this.authorizeDialogController.close(); }, Constants.DELAY_TIME) } else { - this.toggleIsOn = changeIndexValue(this.toggleIsOn, [index, true]); + this.toggleIsOn[index] = false; + } + let num = Constants.PERMISSION_NUM; + for(let key in this.toggleIsOn){ + if(this.toggleIsOn[key]){ + num++; + } } + this.permissionNum = num; }) } @@ -241,11 +254,14 @@ struct applicationItem { routerData[0].permission, makePy(values[0])[0].slice(0, 1)) // Get the first letter in the returned initials array ); + this.applicationList.sort((a,b) => a.index - b.index) + this.oldApplicationItem.sort((a,b) => a.index - b.index) // 0: have permission; -1: no permission if (values[2] === Constants.PERMISSION_INDEX) { - this.toggleIsOn.push(true); + this.toggleIsOn[i] = true; + this.permissionNum++; } else { - this.toggleIsOn.push(false); + this.toggleIsOn[i] = false; } }); }).catch(() => { @@ -277,7 +293,7 @@ struct applicationItem { Flex({ alignItems:ItemAlign.Start, justifyContent: FlexAlign.Start }) { Column() { Flex({ justifyContent: FlexAlign.Start }) { - Text(this.applicationList.length + '个应用获取此权限') + Text(this.permissionNum + '个应用获取此权限') .fontSize(Constants.TEXT_SMAL_FONT_SIZE) .fontColor($r('app.color.secondary_font_color')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP, left: Constants.AUTHORITY_TEXT_MARGIN_LEFT }) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/other-permissions.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/other-permissions.ets index a97d1af13..8f29466ad 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/other-permissions.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/other-permissions.ets @@ -14,24 +14,25 @@ */ import { backBar } from "../common/components/backBar.ets"; -import { groups } from "../common/model/permissionGroup.ets"; import router from '@system.router'; import Constants from '../common/utils/constant.ets'; +import { otherPermissionsLabel } from '../common/model/permissionGroup.ets' -class OtherPermissionObj { - groupName: string - permissions: string - constructor(groupName: string, permissions: string) { - this.groupName = groupName - this.permissions = permissions - } -} // Other permission interface data classes +let routerData = router.getParams().routerData; // Routing jump data +let backTitle = router.getParams().backTitle; // return title name +let status = router.getParams().status; // Status: Allowed, Forbidden +let permissions = router.getParams().permission; // permissions name +let otherPermissionList = []; // otherPermission List +for (let i = 0; i < permissions.length; i++) { + otherPermissionList.push({ + permissionLabel: otherPermissionsLabel[permissions[i]], + permission: permissions[i] + }) +} @Entry @Component struct appNamePage { - private backTitle = router.getParams().backTitle; // return title name - build() { GridContainer({ gutter: Constants.GUTTER }) { Row() { @@ -46,7 +47,7 @@ struct appNamePage { Row() { Column() { Row() { - backBar({ title: JSON.stringify(this.backTitle) }) + backBar({ title: JSON.stringify(backTitle) }) } Row() { Column() { @@ -80,17 +81,14 @@ struct appNamePage { @Component struct appNameItem { - @State otherPermissionListItem: OtherPermissionObj[] = []; // Other permission interface data array - private backTitle = router.getParams().backTitle; // return title name - private allPermissionApplications = router.getParams().routerData; // Routing jump data - + @State otherPermissionListItem: string[] = otherPermissionList; // Other permission interface data array @Builder ListItemLayout(item, index) { ListItem() { Row() { Column() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Text(item.groupName) + Text(item.permissionLabel) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontColor($r('app.color.text_color')) .flexGrow(Constants.FLEX_GROW) @@ -111,38 +109,20 @@ struct appNameItem { } } }.onClick(() => { - // 1: Indicates that there is a permission in the permission group - if (item.permissions.length > 1) { - router.push({ - uri: 'pages/authority-secondary', - params: { routerData: this.allPermissionApplications, backTitle: item.groupName } - }); - } - else { router.push({ - uri: 'pages/authority-tertiary', - params: { routerData: this.allPermissionApplications, backTitle: item.groupName } + uri: 'pages/application-tertiary', + params: { + routerData: routerData, + backTitle: backTitle, + permission: [item.permission], + status: status + } }); - } }) } }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) } - /** - * Lifecycle function, executed when the page is initialized - */ - aboutToAppear() { - var permissionsList = groups.filter((item) => { - return item.groupName === this.backTitle; - }) - for (let i = 0; i < permissionsList[0].children.length; i++) { - this.otherPermissionListItem.push( - new OtherPermissionObj(permissionsList[0].children[i].groupName, permissionsList[0].children[i].permissions) - ); - } - } - build() { Row() { Column() { @@ -158,7 +138,7 @@ struct appNameItem { }.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.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + .padding({ left: Constants.LIST_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) } .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/app.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/app.ets index 9ae634daa..05b8ea999 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/app.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/app.ets @@ -15,9 +15,7 @@ export default { onCreate() { - console.info('Application onCreate') }, onDestroy() { - console.info('Application onDestroy') }, } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json index 01d9deb53..bfad4e8f8 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json @@ -9,8 +9,8 @@ "value": "#f1f3f5" }, { - "name": "title_text_color", - "value": "#E5000000" + "name": "text_secondary_color", + "value": "#99000000" }, { "name": "active_background_color", @@ -24,10 +24,6 @@ "name": "text_decoration_color", "value": "#f3f4f6" }, - { - "name": "icon_color", - "value": "#18233199" - }, { "name": "default_background_color", "value": "#ffffff" diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json index a6f2b559c..f79c15e4d 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json @@ -95,6 +95,18 @@ { "name": "Authorization_failed", "value": "授权失败！" + }, + { + "name": "othet_permission_label", + "value": "允许不同设备间数据交换权限" + }, + { + "name": "othet_permission_label_description", + "value": "允许不同设备间数据交换访问权限" + }, + { + "name": "othet_permission", + "value": "其他权限" } ] } \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_more.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_more.svg index 3fdc1e9d6..73ab24938 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_more.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_more.svg @@ -2,6 +2,6 @@ HM/ic/24x24/more1.5 - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_calendar.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_calendar.svg index 56e634cab..bfb163637 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_calendar.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_calendar.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_camera.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_camera.svg index 7be7ccc41..535b7a305 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_camera.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_camera.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_contacts_group.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_contacts_group.svg index 6805946fb..e01910786 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_contacts_group.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_contacts_group.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_folder.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_folder.svg index c2a26b5df..01a9fae00 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_folder.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_folder.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_gps.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_gps.svg index 88ad317dd..738516f85 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_gps.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_gps.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_message.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_message.svg index 3191fb6e4..79f77f671 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_message.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_message.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_phone.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_phone.svg index c78bb4fb5..df52fe39c 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_phone.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_phone.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_voice.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_voice.svg index ac9311b12..257ae0605 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_voice.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_public_voice.svg @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_sport.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_sport.svg index 58c9f7a83..e9ed5719d 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_sport.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_sport.svg @@ -2,6 +2,6 @@ HM/ic/24x24/s0324ok - + \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg index 31a035d87..1d6a07632 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg @@ -2,7 +2,7 @@ HM/ic/24x24/ssensor - + diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/loading.gif b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/loading.gif deleted file mode 100644 index 915c1984cb8541c40f28762a09970b6578632aa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3897 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 diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets index 03748140d..3e090768e 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets @@ -15,12 +15,9 @@ export default { onCreate() { - console.info('Application onCreate') }, onShow() { - console.info('Application onShow') }, onDestroy() { - console.info('Application onDestroy') }, } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets index 61dc37aa5..28817aedb 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets @@ -21,7 +21,6 @@ import featureAbility from "@ohos.ability.featureAbility" @Component struct MyComponent { aboutToAppear() { - console.info("start run testcase!!!!") featureAbility.getWant() .then((Want) => { const core = Core.getInstance() @@ -41,10 +40,8 @@ struct MyComponent { configService.setConfig(Want.parameters) testsuite() core.execute() - console.info('Operation successful. Data: ' + JSON.stringify(Want)); }) .catch((error) => { - console.error('Operation failed. Cause: ' + JSON.stringify(error)); }) } -- Gitee