From 98b635e574905f20de5231b125fdac5ca963413a Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Mon, 4 Nov 2024 11:00:26 +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 ++-- .../src/main/ets/common/model/definition.ets | 4 +++- .../main/ets/common/model/permissionGroup.ets | 9 ++++++--- .../main/resources/base/element/string.json | 19 +++++++++++++++++++ .../base/media/ic_public_screen_capture.svg | 11 +++++++++++ .../main/resources/bo_CN/element/string.json | 7 +++++++ .../src/main/resources/ug/element/string.json | 7 +++++++ .../main/resources/zh_CN/element/string.json | 19 +++++++++++++++++++ .../main/resources/zh_HK/element/string.json | 7 +++++++ .../main/resources/zh_TW/element/string.json | 7 +++++++ .../main/resources/zz_ZX/element/string.json | 4 ++++ 12 files changed, 94 insertions(+), 8 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/definition.ets b/permissionmanager/src/main/ets/common/model/definition.ets index d368161..368f65e 100644 --- a/permissionmanager/src/main/ets/common/model/definition.ets +++ b/permissionmanager/src/main/ets/common/model/definition.ets @@ -44,7 +44,8 @@ export enum Permission { READ_WRITE_DOWNLOAD_DIRECTORY = 'ohos.permission.READ_WRITE_DOWNLOAD_DIRECTORY', READ_WRITE_DESKTOP_DIRECTORY = 'ohos.permission.READ_WRITE_DESKTOP_DIRECTORY', READ_WRITE_DOCUMENTS_DIRECTORY = 'ohos.permission.READ_WRITE_DOCUMENTS_DIRECTORY', - ACCESS_NEARLINK = 'ohos.permission.ACCESS_NEARLINK' + ACCESS_NEARLINK = 'ohos.permission.ACCESS_NEARLINK', + CUSTOM_SCREEN_CAPTURE = 'ohos.permission.CUSTOM_SCREEN_CAPTURE' } export enum PermissionGroup { @@ -65,6 +66,7 @@ export enum PermissionGroup { PASTEBOARD = 'PASTEBOARD', FOLDER = 'FOLDER', NEARLINK = 'NEARLINK', + CUSTOM_SCREEN_CAPTURE = 'CUSTOM_SCREEN_CAPTURE', OTHER = 'OTHER' } diff --git a/permissionmanager/src/main/ets/common/model/permissionGroup.ets b/permissionmanager/src/main/ets/common/model/permissionGroup.ets index 82a9ad0..ed4665f 100644 --- a/permissionmanager/src/main/ets/common/model/permissionGroup.ets +++ b/permissionmanager/src/main/ets/common/model/permissionGroup.ets @@ -47,7 +47,8 @@ export const permissionGroups: PermissionInfo[] = [ new PermissionInfo(Permission.READ_WRITE_DOWNLOAD_DIRECTORY, PermissionGroup.FOLDER, $r('sys.string.ohos_lab_read_write_download_directory'), 16), new PermissionInfo(Permission.READ_WRITE_DESKTOP_DIRECTORY, PermissionGroup.FOLDER, $r('sys.string.ohos_lab_read_write_desktop_directory'), 16), new PermissionInfo(Permission.READ_WRITE_DOCUMENTS_DIRECTORY, PermissionGroup.FOLDER, $r('sys.string.ohos_lab_read_write_documents_directory'), 16), - new PermissionInfo(Permission.ACCESS_NEARLINK, PermissionGroup.NEARLINK, $r('sys.string.ohos_lab_access_nearlink'), 17) + new PermissionInfo(Permission.ACCESS_NEARLINK, PermissionGroup.NEARLINK, $r('sys.string.ohos_lab_access_nearlink'), 17), + new PermissionInfo(Permission.CUSTOM_SCREEN_CAPTURE, PermissionGroup.CUSTOM_SCREEN_CAPTURE, $r('sys.string.ohos_lab_custom_screen_capture'), 18) ] export const groups: GroupInfo[] = [ @@ -68,7 +69,8 @@ export const groups: GroupInfo[] = [ new GroupInfo(PermissionGroup.BLUETOOTH, $r('app.string.groupName_bluetooth'), 'app.string.group_label_bluetooth', $r('app.media.ic_public_bluetooth'), [], '', ['ohos.permission.ACCESS_BLUETOOTH'], [ButtonStatus.DENY, ButtonStatus.ALLOW], false, 'app.string.enable_description_bluetooth', $r('app.string.forbidden_description_bluetooth')), new GroupInfo(PermissionGroup.PASTEBOARD, $r('app.string.groupName_pasteboard'), 'app.string.group_label_pasteboard', $r('app.media.ic_clipboard'), [], '', ['ohos.permission.READ_PASTEBOARD'], [ButtonStatus.DENY, ButtonStatus.THIS_TIME_ONLY], false, 'app.string.enable_description_pasteboard', $r('app.string.forbidden_description_pasteboard')), new GroupInfo(PermissionGroup.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'], [ButtonStatus.DENY, ButtonStatus.ALLOW], false, 'app.string.enable_description_folder', $r('app.string.forbidden_description_folder')), - new GroupInfo(PermissionGroup.NEARLINK, $r('app.string.groupName_nearLink'), 'app.string.group_label_nearLink', $r('app.media.ic_nearLink'), [], '', ['ohos.permission.ACCESS_NEARLINK'], [ButtonStatus.DENY, ButtonStatus.ALLOW], false, 'app.string.enable_description_nearLink', $r('app.string.forbidden_description_nearLink')) + new GroupInfo(PermissionGroup.NEARLINK, $r('app.string.groupName_nearLink'), 'app.string.group_label_nearLink', $r('app.media.ic_nearLink'), [], '', ['ohos.permission.ACCESS_NEARLINK'], [ButtonStatus.DENY, ButtonStatus.ALLOW], false, 'app.string.enable_description_nearLink', $r('app.string.forbidden_description_nearLink')), + new GroupInfo(PermissionGroup.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'], [ButtonStatus.DENY, ButtonStatus.ALLOW], false, 'app.string.enable_description_screenCapture', $r('app.string.forbidden_description_screenCapture')) ]; export const userGrantPermissions: string[] = [ @@ -102,7 +104,8 @@ export const userGrantPermissions: string[] = [ Permission.READ_WRITE_DOWNLOAD_DIRECTORY, Permission.READ_WRITE_DESKTOP_DIRECTORY, Permission.READ_WRITE_DOCUMENTS_DIRECTORY, - Permission.ACCESS_NEARLINK + Permission.ACCESS_NEARLINK, + Permission.CUSTOM_SCREEN_CAPTURE ]; export const buttonResource: Map = new Map([ diff --git a/permissionmanager/src/main/resources/base/element/string.json b/permissionmanager/src/main/resources/base/element/string.json index 2a32cd0..fe5e4fe 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,13 @@ "priority":"LT" } }, + { + "name":"group_label_screenCapture", + "value":"Allow %s to capture your screen?", + "attr":{ + "priority":"translate" + } + }, { "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 +566,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 +654,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/bo_CN/element/string.json b/permissionmanager/src/main/resources/bo_CN/element/string.json index 039c77c..1a46dfe 100644 --- a/permissionmanager/src/main/resources/bo_CN/element/string.json +++ b/permissionmanager/src/main/resources/bo_CN/element/string.json @@ -280,6 +280,13 @@ "priority":"LT" } }, + { + "name":"group_label_screenCapture", + "value":"༼%s༽ཡིས་ཁྱེད་ཀྱི་བརྙན་ཡོལ་གཅོད་ལེན་བྱ་ཆོག་པར་བྱེད་དམ།", + "attr":{ + "priority":"translate" + } + }, { "name":"pasteBoard_app", "value":"ནང་དོན་༼%s༽ལས་འདྲ་བཤུས་བྱས། བཀག་རྗེས་ཉེར་སྤྱོད་དེས་དྲས་སྦྱར་པང་ལ་ལྟ་སྤྱོད་བྱ་མི་ཆོག", diff --git a/permissionmanager/src/main/resources/ug/element/string.json b/permissionmanager/src/main/resources/ug/element/string.json index 36814c9..df5e599 100644 --- a/permissionmanager/src/main/resources/ug/element/string.json +++ b/permissionmanager/src/main/resources/ug/element/string.json @@ -280,6 +280,13 @@ "priority":"LT" } }, + { + "name":"group_label_screenCapture", + "value":"\u200f«%s» ئېكران تۇتىدۇ، رۇخسەتمۇ؟", + "attr":{ + "priority":"translate" + } + }, { "name":"pasteBoard_app", "value":"بۇ مەزمۇن «%s» دىن كەلگەن. چەكلىسىڭىز، بۇ ئەپ كېسىش تاختىسىنى زىيارەت قىلالمايدۇ.", diff --git a/permissionmanager/src/main/resources/zh_CN/element/string.json b/permissionmanager/src/main/resources/zh_CN/element/string.json index 4aadec6..604f9d0 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,13 @@ "priority":"translate" } }, + { + "name":"group_label_screenCapture", + "value":"允许“%s”截取您的屏幕？", + "attr":{ + "priority":"translate" + } + }, { "name":"enable_description_location", "value":"系统定位服务开关开启时，已允许%s个应用获取此设备的位置。" @@ -555,6 +566,10 @@ "name":"enable_description_nearLink", "value":"已允许%s个应用访问星闪。" }, + { + "name":"enable_description_screenCapture", + "value":"已允许%s个应用使用截屏。" + }, { "name":"forbidden_description_location", "value":"系统定位服务开关开启时，已禁止应用获取此设备的位置。" @@ -639,6 +654,10 @@ "name":"forbidden_description_nearLink", "value":"已禁止应用访问星闪。" }, + { + "name":"forbidden_description_screenCapture", + "value":"已禁止应用使用截屏。" + }, { "name":"risk_warning", "value":"风险应用禁止获取该权限" diff --git a/permissionmanager/src/main/resources/zh_HK/element/string.json b/permissionmanager/src/main/resources/zh_HK/element/string.json index 7409f14..9af7e7f 100644 --- a/permissionmanager/src/main/resources/zh_HK/element/string.json +++ b/permissionmanager/src/main/resources/zh_HK/element/string.json @@ -280,6 +280,13 @@ "priority":"LT" } }, + { + "name":"group_label_screenCapture", + "value":"允許「%s」截取您的屏幕？", + "attr":{ + "priority":"translate" + } + }, { "name":"pasteBoard_app", "value":"複製內容來自「%s」。禁止後將不再允許此應用程式存取剪貼簿。", diff --git a/permissionmanager/src/main/resources/zh_TW/element/string.json b/permissionmanager/src/main/resources/zh_TW/element/string.json index 3dd6b9c..f05d5f1 100644 --- a/permissionmanager/src/main/resources/zh_TW/element/string.json +++ b/permissionmanager/src/main/resources/zh_TW/element/string.json @@ -280,6 +280,13 @@ "priority":"LT" } }, + { + "name":"group_label_screenCapture", + "value":"允許「%s」擷取您的螢幕畫面？", + "attr":{ + "priority":"translate" + } + }, { "name":"pasteBoard_app", "value":"內容複製自「%s」。禁止後，將不再允許此應用程式存取剪貼簿。", diff --git a/permissionmanager/src/main/resources/zz_ZX/element/string.json b/permissionmanager/src/main/resources/zz_ZX/element/string.json index b52e5ac..d3494be 100644 --- a/permissionmanager/src/main/resources/zz_ZX/element/string.json +++ b/permissionmanager/src/main/resources/zz_ZX/element/string.json @@ -160,6 +160,10 @@ "name":"group_label_audios", "value":"[TS_950736]_Allow %s to access music and audio files on your device?" }, + { + "name":"group_label_screenCapture", + "value":"[TS_988622]_Allow %s to capture your screen?" + }, { "name":"pasteBoard_app", "value":"[TS_950726]_Content copied from %s. If you choose Deny, this app won't be able to access the clipboard." -- Gitee