From 9c7f68b0d61676792083b3e6da98d21c5c537a18 Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Thu, 31 Oct 2024 09:47:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=AA=E5=B1=8F=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- AppScope/app.json | 4 ++-- AppScope/app.json5 | 4 ++-- .../main/ets/common/model/permissionGroup.ets | 9 ++++++--- .../src/main/resources/base/element/string.json | 16 ++++++++++++++++ .../base/media/ic_public_screen_capture.svg | 11 +++++++++++ .../src/main/resources/zh_CN/element/string.json | 16 ++++++++++++++++ 6 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 permissionmanager/src/main/resources/base/media/ic_public_screen_capture.svg diff --git a/AppScope/app.json b/AppScope/app.json index 8cad5bd..90788d5 100644 --- a/AppScope/app.json +++ b/AppScope/app.json @@ -4,8 +4,8 @@ "app": { "bundleName": "com.ohos.permissionmanager", "vendor": "example", - "versionCode": 1000071, - "versionName": "1.7.1", + "versionCode": 1000072, + "versionName": "1.7.2", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 14, diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 0c9451b..dd542c6 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.permissionmanager", "vendor": "example", - "versionCode": 1000071, - "versionName": "1.7.1", + "versionCode": 1000072, + "versionName": "1.7.2", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 14, diff --git a/permissionmanager/src/main/ets/common/model/permissionGroup.ets b/permissionmanager/src/main/ets/common/model/permissionGroup.ets index b7890e1..f81317b 100644 --- a/permissionmanager/src/main/ets/common/model/permissionGroup.ets +++ b/permissionmanager/src/main/ets/common/model/permissionGroup.ets @@ -46,7 +46,8 @@ export const permissionGroups: PermissionInfo[] = [ new PermissionInfo('ohos.permission.READ_WRITE_DOWNLOAD_DIRECTORY', 'FOLDER', $r('sys.string.ohos_lab_read_write_download_directory'), 16), new PermissionInfo('ohos.permission.READ_WRITE_DESKTOP_DIRECTORY', 'FOLDER', $r('sys.string.ohos_lab_read_write_desktop_directory'), 16), new PermissionInfo('ohos.permission.READ_WRITE_DOCUMENTS_DIRECTORY', 'FOLDER', $r('sys.string.ohos_lab_read_write_documents_directory'), 16), - new PermissionInfo('ohos.permission.ACCESS_NEARLINK', 'NEARLINK', $r('sys.string.ohos_lab_access_nearlink'), 17) + new PermissionInfo('ohos.permission.ACCESS_NEARLINK', 'NEARLINK', $r('sys.string.ohos_lab_access_nearlink'), 17), + new PermissionInfo('ohos.permission.CUSTOM_SCREEN_CAPTURE', 'CUSTOM_SCREEN_CAPTURE', $r('sys.string.ohos_lab_custom_screen_capture'), 18) ] export const groups: GroupInfo[] = [ @@ -67,7 +68,8 @@ export const groups: GroupInfo[] = [ new GroupInfo('BLUETOOTH', $r('app.string.groupName_bluetooth'), 'app.string.group_label_bluetooth', $r('app.media.ic_public_bluetooth'), [], '', ['ohos.permission.ACCESS_BLUETOOTH'], false, 'app.string.enable_description_bluetooth', $r('app.string.forbidden_description_bluetooth')), new GroupInfo('PASTEBOARD', $r('app.string.groupName_pasteboard'), 'app.string.group_label_pasteboard', $r('app.media.ic_clipboard'), [], '', ['ohos.permission.READ_PASTEBOARD'], false, 'app.string.enable_description_pasteboard', $r('app.string.forbidden_description_pasteboard')), new GroupInfo('FOLDER', $r('app.string.groupName_folder'), 'app.string.group_label_folder', $r('app.media.ic_public_folder'), [], '', ['ohos.permission.READ_WRITE_DOWNLOAD_DIRECTORY', 'ohos.permission.READ_WRITE_DESKTOP_DIRECTORY', 'ohos.permission.READ_WRITE_DOCUMENTS_DIRECTORY'], false, 'app.string.enable_description_folder', $r('app.string.forbidden_description_folder')), - new GroupInfo('NEARLINK', $r('app.string.groupName_nearLink'), 'app.string.group_label_nearLink', $r('app.media.ic_nearLink'), [], '', ['ohos.permission.ACCESS_NEARLINK'], false, 'app.string.enable_description_nearLink', $r('app.string.forbidden_description_nearLink')) + new GroupInfo('NEARLINK', $r('app.string.groupName_nearLink'), 'app.string.group_label_nearLink', $r('app.media.ic_nearLink'), [], '', ['ohos.permission.ACCESS_NEARLINK'], false, 'app.string.enable_description_nearLink', $r('app.string.forbidden_description_nearLink')), + new GroupInfo('CUSTOM_SCREEN_CAPTURE', $r('app.string.groupName_screenCapture'), 'app.string.group_label_screenCapture', $r('app.media.ic_public_screen_capture'), [], '', ['ohos.permission.CUSTOM_SCREEN_CAPTURE'], false, 'app.string.enable_description_screenCapture', $r('app.string.forbidden_description_screenCapture')) ]; export const userGrantPermissions: string[] = [ @@ -101,7 +103,8 @@ export const userGrantPermissions: string[] = [ 'ohos.permission.READ_WRITE_DOWNLOAD_DIRECTORY', 'ohos.permission.READ_WRITE_DESKTOP_DIRECTORY', 'ohos.permission.READ_WRITE_DOCUMENTS_DIRECTORY', - 'ohos.permission.ACCESS_NEARLINK' + 'ohos.permission.ACCESS_NEARLINK', + 'ohos.permission.CUSTOM_SCREEN_CAPTURE' ]; export const showSubPermissionsGroup: string[] = [ diff --git a/permissionmanager/src/main/resources/base/element/string.json b/permissionmanager/src/main/resources/base/element/string.json index 2a32cd0..f44551c 100644 --- a/permissionmanager/src/main/resources/base/element/string.json +++ b/permissionmanager/src/main/resources/base/element/string.json @@ -330,6 +330,10 @@ "name":"groupName_nearLink", "value":"NearLink" }, + { + "name":"groupName_screenCapture", + "value":"Screen capture" + }, { "name":"multi_device_collaboration", "value":"Multi-device collaboration" @@ -471,6 +475,10 @@ "priority":"LT" } }, + { + "name":"group_label_screenCapture", + "value":"Allow %s to capture your screen?" + }, { "name":"enable_description_location", "value":"When the system location service is enabled, %s apps are allowed to obtain the location of the device." @@ -555,6 +563,10 @@ "name":"enable_description_nearLink", "value":"%s apps have been allowed to access NearLink." }, + { + "name":"enable_description_screenCapture", + "value":"%s apps have been allowed to use screenshots." + }, { "name":"forbidden_description_location", "value":"When the system positioning service is enabled, applications are not allowed to obtain the location of the device." @@ -639,6 +651,10 @@ "name":"forbidden_description_nearLink", "value":"Apps have been prohibited from accessing NearLink." }, + { + "name":"forbidden_description_screenCapture", + "value":"Screenshots have been disabled." + }, { "name":"risk_warning", "value":"Risk application does not obtain this permission" diff --git a/permissionmanager/src/main/resources/base/media/ic_public_screen_capture.svg b/permissionmanager/src/main/resources/base/media/ic_public_screen_capture.svg new file mode 100644 index 0000000..c742dae --- /dev/null +++ b/permissionmanager/src/main/resources/base/media/ic_public_screen_capture.svg @@ -0,0 +1,11 @@ + + + 截屏_面状 + + + + + + + + \ 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 4aadec6..91a8551 100644 --- a/permissionmanager/src/main/resources/zh_CN/element/string.json +++ b/permissionmanager/src/main/resources/zh_CN/element/string.json @@ -330,6 +330,10 @@ "name":"groupName_nearLink", "value":"星闪" }, + { + "name":"groupName_screenCapture", + "value":"截屏" + }, { "name":"multi_device_collaboration", "value":"多设备协同" @@ -471,6 +475,10 @@ "priority":"translate" } }, + { + "name":"group_label_screenCapture", + "value":"允许“%s”截取你的屏幕？" + }, { "name":"enable_description_location", "value":"系统定位服务开关开启时，已允许%s个应用获取此设备的位置。" @@ -555,6 +563,10 @@ "name":"enable_description_nearLink", "value":"已允许%s个应用访问星闪。" }, + { + "name":"enable_description_screenCapture", + "value":"已允许%s个应用使用截屏。" + }, { "name":"forbidden_description_location", "value":"系统定位服务开关开启时，已禁止应用获取此设备的位置。" @@ -639,6 +651,10 @@ "name":"forbidden_description_nearLink", "value":"已禁止应用访问星闪。" }, + { + "name":"forbidden_description_screenCapture", + "value":"已禁止应用使用截屏。" + }, { "name":"risk_warning", "value":"风险应用禁止获取该权限" -- Gitee