From ece597a242e6e9c5b11ca27b206dfe25ec007b1f Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Wed, 1 Feb 2023 16:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=85=A8=E5=B1=80=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../src/main/ets/common/components/dialog.ets | 2 -- .../ets/pages/authority-tertiary-groups.ets | 20 +++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index 02ca56f..b994687 100644 --- a/permissionmanager/src/main/ets/common/components/dialog.ets +++ b/permissionmanager/src/main/ets/common/components/dialog.ets @@ -112,7 +112,6 @@ export struct globalDialog { if(globalThis.currentPermissionGroup == 'CAMERA') { let cameraManager = camera.getCameraManager(globalThis.context); cameraManager.muteCamera(true); - this.globalIsOn = false; this.controller.close(); }else { var audioManager = audio.getAudioManager(); @@ -120,7 +119,6 @@ export struct globalDialog { let groupid = audio.DEFAULT_VOLUME_GROUP_ID; audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => { audioVolumeGroupManager.setMicrophoneMute(true).then(() => { - this.globalIsOn = false this.controller.close() }) }) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index 5671abf..e91545a 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -403,6 +403,21 @@ struct applicationItem { } if(globalGroup.indexOf(globalThis.currentPermissionGroup) !== -1) { this.globalIsOn = globalIsOn + if(globalThis.currentPermissionGroup == "CAMERA") { + let cameraManager = camera.getCameraManager(globalThis.context); + cameraManager.on('cameraMute', curMuted => { + this.globalIsOn = !curMuted + }) + }else { + var audioManager = audio.getAudioManager(); + let audioVolumeManager = audioManager.getVolumeManager(); + let groupid = audio.DEFAULT_VOLUME_GROUP_ID; + audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => { + audioVolumeGroupManager.on('micStateChange', micStateChange => { + this.globalIsOn = !micStateChange.mute + }) + }) + } } } @@ -438,15 +453,12 @@ struct applicationItem { if(globalThis.currentPermissionGroup == "CAMERA") { let cameraManager = camera.getCameraManager(globalThis.context); cameraManager.muteCamera(false); - this.globalIsOn = isOn; }else { var audioManager = audio.getAudioManager(); let audioVolumeManager = audioManager.getVolumeManager(); let groupid = audio.DEFAULT_VOLUME_GROUP_ID; audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => { - audioVolumeGroupManager.setMicrophoneMute(false).then(() => { - this.globalIsOn = isOn - }) + audioVolumeGroupManager.setMicrophoneMute(false) }) } } -- Gitee