From 1229b7f5bcad2cad400824c2107c440ab85d0b00 Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Wed, 16 Nov 2022 09:37:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=A8=A1=E7=B3=8A=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../src/main/ets/common/model/permissionGroup.ets | 10 ---------- .../src/main/ets/common/utils/constant.ets | 2 +- .../src/main/ets/pages/authority-management.ets | 3 ++- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/permissionmanager/src/main/ets/common/model/permissionGroup.ets b/permissionmanager/src/main/ets/common/model/permissionGroup.ets index f78c977..f8027c6 100644 --- a/permissionmanager/src/main/ets/common/model/permissionGroup.ets +++ b/permissionmanager/src/main/ets/common/model/permissionGroup.ets @@ -20,12 +20,6 @@ export const permissionGroups: any[] = [ "label": $r("sys.string.ohos_lab_location_in_background"), "groupId": 0 }, - { - "permissionName": "ohos.permission.APPROXIMATELY_LOCATION", - "groupName": "LOCATION", - "label": $r("sys.string.ohos_lab_approximately_location"), - "groupId": 0 - }, { "permissionName": "ohos.permission.LOCATION", "groupName": "LOCATION", @@ -213,7 +207,6 @@ export const groups: any[] = [ "label": $r("app.string.group_label_location"), "permissions": [ "ohos.permission.LOCATION_IN_BACKGROUND", - "ohos.permission.APPROXIMATELY_LOCATION", "ohos.permission.LOCATION" ], "isShow":true @@ -390,7 +383,6 @@ export const groups: any[] = [ export const permissionGroupPermissions: object = { "LOCATION": [ "ohos.permission.LOCATION_IN_BACKGROUND", - "ohos.permission.APPROXIMATELY_LOCATION", "ohos.permission.LOCATION" ], "CAMERA": [ @@ -454,7 +446,6 @@ export const permissionGroupPermissions: object = { export const userGrantPermissions: string[] = [ "ohos.permission.LOCATION_IN_BACKGROUND", - "ohos.permission.APPROXIMATELY_LOCATION", "ohos.permission.LOCATION", "ohos.permission.CAMERA", "ohos.permission.MICROPHONE", @@ -488,7 +479,6 @@ export const userGrantPermissions: string[] = [ export const permissionGroupIds: object = { "ohos.permission.LOCATION_IN_BACKGROUND": "0", - "ohos.permission.APPROXIMATELY_LOCATION": "0", "ohos.permission.LOCATION": "0", "ohos.permission.CAMERA": "1", "ohos.permission.MICROPHONE": "2", diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index cb0bada..7cb21fc 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -277,7 +277,7 @@ export default class Constants { static PERMISSION_NUM = 0; static PERMISSION_FLAG = 2; - static API_VERSION_SUPPORT_STAGE = 9; + static API_VERSION_SUPPORT_STAGE = 10; static PRE_AUTHORIZATION_NOT_MODIFIED = 4; diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index 3e9f8ad..0e07e47 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -61,6 +61,7 @@ interface groupPermission { let textInput_placeholder: any = '' const FUZZY_LOCATION_PERMISSION = 'ohos.permission.APPROXIMATELY_LOCATION' +const API_VERSION_SUPPORT_STAGE = 9 @Entry @Component @@ -368,7 +369,7 @@ struct authorityManagementPage { } // adapt different api - if (info.compatibleVersion >= Constants.API_VERSION_SUPPORT_STAGE) { + if (info.compatibleVersion >= API_VERSION_SUPPORT_STAGE) { info.appInfo.iconId = info.hapModuleInfos[0].abilityInfo[0].iconId; } -- Gitee