From 3c1ce22733925e63bce3d124dba235c81a9f7a1d Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Fri, 18 Nov 2022 16:53:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83=E6=8E=A5=E5=8F=A3=E6=9B=BF?= =?UTF-8?q?=E6=8D=A22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../src/main/ets/common/utils/constant.ets | 37 ++++++----------- .../src/main/ets/common/utils/utils.ets | 8 +--- .../main/ets/pages/application-secondary.ets | 40 +++++-------------- .../main/ets/pages/application-tertiary.ets | 38 ++++-------------- .../main/ets/pages/authority-management.ets | 33 +++------------ .../main/ets/pages/authority-secondary.ets | 33 +++------------ .../ets/pages/authority-tertiary-groups.ets | 33 +++------------ .../src/main/ets/pages/authority-tertiary.ets | 33 +++------------ .../src/main/ets/pages/globalSwitch.ets | 4 +- .../src/main/ets/pages/other-permissions.ets | 40 ++++--------------- .../ets/pages/permission-access-record.ets | 33 +++------------ 11 files changed, 70 insertions(+), 262 deletions(-) diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index cb0bada..9616007 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -58,32 +58,19 @@ export default class Constants { static TEXTINPUT_IMAGE_MARGIN_TOP = 12; // grid useSizeType - static GRID_MARGIN = '0vp'; static GUTTER = 0; - static LEFT_XS_SPAN = 0; - static LEFT_XS_OFFSET = 0; - static LEFT_SM_SPAN = 0; - static LEFT_SM_OFFSET = 0; - static LEFT_MD_SPAN = 0; - static LEFT_MD_OFFSET = 0; - static LEFT_LG_SPAN = 2; - static LEFT_LG_OFFSET = 0; - static MIDDLE_XS_SPAN = 2; - static MIDDLE_XS_OFFSET = 0; - static MIDDLE_SM_SPAN = 4; - static MIDDLE_SM_OFFSET = 0; - static MIDDLE_MD_SPAN = 8; - static MIDDLE_MD_OFFSET = 0; - static MIDDLE_LG_SPAN = 8; - static MIDDLE_LG_OFFSET = 2; - static RIGHT_XS_SPAN = 0; - static RIGHT_XS_OFFSET = 2; - static RIGHT_SM_SPAN = 0; - static RIGHT_SM_OFFSET = 4; - static RIGHT_MD_SPAN = 0; - static RIGHT_MD_OFFSET = 8; - static RIGHT_LG_SPAN = 2; - static RIGHT_LG_OFFSET = 10; + static XS_COLUMNS = 2; + static XS_SPAN = 2; + static XS_OFFSET = 0; + static SM_COLUMNS = 4; + static SM_SPAN = 4; + static SM_OFFSET = 0; + static MD_COLUMNS = 8; + static MD_SPAN = 8; + static MD_OFFSET = 0; + static LG_COLUMNS = 12; + static LG_SPAN = 8; + static LG_OFFSET = 2; // 100% width,height static FULL_WIDTH = '100%'; diff --git a/permissionmanager/src/main/ets/common/utils/utils.ets b/permissionmanager/src/main/ets/common/utils/utils.ets index 0e93977..1e7b1be 100644 --- a/permissionmanager/src/main/ets/common/utils/utils.ets +++ b/permissionmanager/src/main/ets/common/utils/utils.ets @@ -55,12 +55,8 @@ export function getAppIcon(iconId, bundleName) { */ export function verifyAccessToken(accessTokenId, permission) { return new Promise((resolve) => { - abilityAccessCtrl.createAtManager().verifyAccessToken(accessTokenId, permission).then((res) => { - return resolve(res); - }) - .catch((error) => { - console.error('verifyAccessToken failed. Cause: ' + JSON.stringify(error)); - }) + let data = abilityAccessCtrl.createAtManager().verifyAccessTokenSync(accessTokenId, permission) + resolve(data) }) } diff --git a/permissionmanager/src/main/ets/pages/application-secondary.ets b/permissionmanager/src/main/ets/pages/application-secondary.ets index 4894009..e082fc8 100644 --- a/permissionmanager/src/main/ets/pages/application-secondary.ets +++ b/permissionmanager/src/main/ets/pages/application-secondary.ets @@ -127,7 +127,7 @@ struct appNamePlusPage { /** * Initialize permission status information and group permission information */ - async initialPermissions() { + initialPermissions() { var reqPermissions = this.routerData.permissions; var reqGroupIds = this.routerData.groupId; @@ -154,9 +154,8 @@ struct appNamePlusPage { if(this.routerData.api >= Constants.API_VERSION_SUPPORT_STAGE && permission == PRECISE_LOCATION_PERMISSION) { continue } - let res = await abilityAccessCtrl.createAtManager().verifyAccessToken( - this.routerData.tokenId, permission); - if (res != 0) { + let res = abilityAccessCtrl.createAtManager().verifyAccessTokenSync(this.routerData.tokenId, permission); + if (res != abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) { isGranted = false; } } @@ -190,16 +189,10 @@ struct appNamePlusPage { build() { Column(){ - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row({}) { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -321,25 +314,10 @@ struct appNamePlusPage { .layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } } diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index be6d89e..b25845d 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -72,16 +72,10 @@ class MediaListObj { struct mediaDocumentPage { build() { Column() { - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row() { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -96,25 +90,10 @@ struct mediaDocumentPage { .layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } } @@ -205,9 +184,8 @@ struct mediaDocumentItem { this.api = res.targetVersion bundleInfo = res var acManager = abilityAccessCtrl.createAtManager() - acManager.verifyAccessToken(res.appInfo.accessTokenId, PRECISE_LOCATION_PERMISSION).then(accurateStatus => { - accurateStatus == abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED ? this.accurateIsOn = true : this.accurateIsOn = false - }) + let accurateStatus = acManager.verifyAccessTokenSync(res.appInfo.accessTokenId, PRECISE_LOCATION_PERMISSION) + this.accurateIsOn = (accurateStatus == abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) ? true : false Promise.all([getAppLabel(res.appInfo.labelId, res.name), getAppIcon(res.appInfo.iconId, res.name)]) .then((values) => { diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index 95724a1..71dfe31 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -462,16 +462,10 @@ struct authorityManagementPage { } build() { - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row() { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -559,25 +553,10 @@ struct authorityManagementPage { .layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } } diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index 3c7c9bd..6368cfb 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -38,16 +38,10 @@ struct appNamePage { private backTitle = router.getParams()['backTitle']; // return title name build() { - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row() { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -62,25 +56,10 @@ struct appNamePage { }.layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } } diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index d674dad..fb7ee2e 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -70,16 +70,10 @@ struct locationInfoPage { @State polymorphismIsOn: Array = [] build() { - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row() { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -94,25 +88,10 @@ struct locationInfoPage { .layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index bf7b767..bf27faf 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -61,16 +61,10 @@ class ApplicationObj { @Component struct locationInfoPage { build() { - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row() { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -85,25 +79,10 @@ struct locationInfoPage { .layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } } diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index 1d2f366..3aeb252 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -16,7 +16,7 @@ import Constants from '../common/utils/constant'; import audio from '@ohos.multimedia.audio' import camera from '@ohos.multimedia.camera'; -import bundle from '@ohos.bundle'; +import bundleManager from '@ohos.bundle.bundleManager'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import { Log } from '../common/utils/utils' import deviceInfo from '@ohos.deviceInfo' @@ -139,7 +139,7 @@ struct globalDialog { aboutToAppear() { var acManager = abilityAccessCtrl.createAtManager() - bundle.getApplicationInfo(Constants.BUNDLE_NAME, 0).then(data => { + bundleManager.getApplicationInfo(Constants.BUNDLE_NAME, 0).then(data => { acManager.grantUserGrantedPermission(data.accessTokenId, "ohos.permission.MICROPHONE", 2) }) } diff --git a/permissionmanager/src/main/ets/pages/other-permissions.ets b/permissionmanager/src/main/ets/pages/other-permissions.ets index 21dc3b9..efc4433 100644 --- a/permissionmanager/src/main/ets/pages/other-permissions.ets +++ b/permissionmanager/src/main/ets/pages/other-permissions.ets @@ -38,16 +38,10 @@ for (let i = 0; i < permissions.length; i++) { @Component struct appNamePage { build() { - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row() { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -62,25 +56,10 @@ struct appNamePage { }.layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } @@ -90,12 +69,7 @@ struct appNamePage { onPageShow() { console.log(TAG + 'onPageShow other-permissions') permissions.forEach(permission => { - abilityAccessCtrl.createAtManager().verifyAccessToken(tokenId, permission).then(res => { - status = res; - }) - .catch(err => { - console.error(TAG + 'verifyAccessToken occure error: ' + JSON.stringify(err)) - }) + status = abilityAccessCtrl.createAtManager().verifyAccessTokenSync(tokenId, permission) }) } } diff --git a/permissionmanager/src/main/ets/pages/permission-access-record.ets b/permissionmanager/src/main/ets/pages/permission-access-record.ets index 49069ed..237440a 100644 --- a/permissionmanager/src/main/ets/pages/permission-access-record.ets +++ b/permissionmanager/src/main/ets/pages/permission-access-record.ets @@ -220,16 +220,10 @@ struct permissionRecordPage { } build() { - GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { - Row() { - Row() - .useSizeType({ - xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET }, - sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET }, - md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET }, - lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + GridRow({ gutter: Constants.GUTTER, columns: { + xs: Constants.XS_COLUMNS, sm: Constants.SM_COLUMNS, md: Constants.MD_COLUMNS, lg: Constants.LG_COLUMNS } }) { + GridCol({ span: { xs: Constants.XS_SPAN, sm: Constants.SM_SPAN, md: Constants.MD_SPAN, lg: Constants.LG_SPAN }, + offset: { xs: Constants.XS_OFFSET, sm: Constants.SM_OFFSET, md: Constants.MD_OFFSET, lg: Constants.LG_OFFSET } }) { Row() { Column() { Row() { @@ -311,25 +305,10 @@ struct permissionRecordPage { .layoutWeight(Constants.LAYOUT_WEIGHT) } } - .useSizeType({ - xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET }, - sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET }, - md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET }, - lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET } - }) .height(Constants.FULL_HEIGHT) - Row() - .useSizeType({ - xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET }, - sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET }, - md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET }, - lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET } - }) - .height(Constants.FULL_HEIGHT) + .width(Constants.FULL_WIDTH) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .height(Constants.FULL_HEIGHT) - .width(Constants.FULL_WIDTH) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } } -- Gitee