From 3db359da3796d0c21fe4dfcbf7a0a6d0472f7996 Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Tue, 17 Jun 2025 14:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=A8=A1=E6=80=81=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=BF=94=E5=9B=9E=E5=80=BC=E6=A0=A1=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../ets/PermissionSheet/GlobalSwitchSheetDialog.ets | 8 ++++---- .../src/main/ets/common/utils/utils.ets | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets index e63cb2d..cb27737 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets @@ -18,7 +18,7 @@ import { BusinessError } from '@ohos.base'; import audio from '@ohos.multimedia.audio'; import camera from '@ohos.multimedia.camera'; import { CustomContentDialog } from '@ohos.arkui.advanced.Dialog'; -import { Log, PermissionDialogException, PermissionDialogReturn } from '../common/utils/utils'; +import { Log, PermissionDialogException, PermissionDialogReturn, GlobalDialogReturn } from '../common/utils/utils'; import { GroupInfo, WantInfo } from '../common/model/typedef'; import { GlobalContext } from '../common/utils/globalContext'; import Constants from '../common/utils/constant'; @@ -62,7 +62,7 @@ struct GlobalSwitchSheetDialog { bottomRight: 0 }, cancel: () => { - PermissionDialogReturn([Constants.ERR_GLOBAL_SWITCH_EXCEPTION], session); + GlobalDialogReturn(false, session); this.context.terminateSelf(); this.dialogController?.close(); } @@ -332,7 +332,7 @@ struct applicationItem { if (this.currentGroup == 'CAMERA') { let cameraManager = camera.getCameraManager(this.context); cameraManager.muteCameraPersistent(false, camera.PolicyType.PRIVACY); - PermissionDialogReturn([Constants.PERMISSION_DIALOG_SUCCESS], session); + GlobalDialogReturn(true, session); this.context.terminateSelf(); } else { let audioManager = audio.getAudioManager(); @@ -340,7 +340,7 @@ struct applicationItem { let groupId = audio.DEFAULT_VOLUME_GROUP_ID; audioVolumeManager.getVolumeGroupManager(groupId).then(audioVolumeGroupManager => { audioVolumeGroupManager.setMicMutePersistent(false, audio.PolicyType.PRIVACY); - PermissionDialogReturn([Constants.PERMISSION_DIALOG_SUCCESS], session); + GlobalDialogReturn(true, session); this.context.terminateSelf(); }) } diff --git a/permissionmanager/src/main/ets/common/utils/utils.ets b/permissionmanager/src/main/ets/common/utils/utils.ets index b046b89..1662469 100644 --- a/permissionmanager/src/main/ets/common/utils/utils.ets +++ b/permissionmanager/src/main/ets/common/utils/utils.ets @@ -243,6 +243,18 @@ export function PermissionDialogReturn(resultArray: Array, session: UIEx }) } +export function GlobalDialogReturn(result: boolean, session: UIExtensionContentSession): void { + session.terminateSelfWithResult({ + resultCode: 0, + want: { + parameters: { + 'ohos.user.setting.global_switch.result': result, + 'ohos.user.setting.error_code': 0 + } + } + }) +} + // check if the permissions provided are in the same group export function checkPermissionGroup(appPermissions: Permission[]): PermissionGroup | null { if (appPermissions.length == 0) { -- Gitee