diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index 02ca56f29b57caae274f691c4678da64823a346b..b99468750571b8c9d017054bb639f9c63f021d7b 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 5671abf0a6de554ad0dd47c993cd86afd44a50bf..e91545ac8be5cc198b46aacd955c421b767aa03a 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) }) } }