!75 监听全局开关

Merge pull request !75 from fanchenxuan/master
This commit is contained in:
openharmony_ci 2023-02-02 08:26:40 +00:00 committed by Gitee
commit 85b82d4695
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 6 deletions

View File

@ -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()
})
})

View File

@ -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)
})
}
}