diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index a8faa399f4726220e2e4af393c186a499be55bec..7403ebe2d55bc131429d9d151f35c6b8a9a3a9e4 100644 --- a/permissionmanager/src/main/ets/common/components/dialog.ets +++ b/permissionmanager/src/main/ets/common/components/dialog.ets @@ -110,11 +110,10 @@ export struct globalDialog { confirm() { if(globalThis.currentPermissionGroup == 'CAMERA') { - camera.getCameraManager(globalThis.context).then(cameraManager => { - cameraManager.muteCamera(true) - this.globalIsOn = false - this.controller.close() - }) + let cameraManager = camera.getCameraManager(globalThis.context); + cameraManager.muteCamera(true); + this.globalIsOn = false; + this.controller.close(); }else { var audioManager = audio.getAudioManager(); audioManager.setMicrophoneMute(true).then(() => { diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index 3e9f8add6aa32fb2a2416b20cc6ffc2d09262376..555bb88606e18be0d805253464ae44ad45e49ae0 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -123,12 +123,11 @@ struct authorityManagementPage { }) }) }else { - camera.getCameraManager(globalThis.context).then(cameraManager => { - let mute = cameraManager.isCameraMuted() - router.push({ - uri: 'pages/authority-tertiary-groups', - params: { routerData: dataList, backTitle: item.groupName, globalIsOn: !mute } - }) + let cameraManager = camera.getCameraManager(globalThis.context); + let mute = cameraManager.isCameraMuted() + router.push({ + uri: 'pages/authority-tertiary-groups', + params: { routerData: dataList, backTitle: item.groupName, globalIsOn: !mute } }) } } diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index 7650f1d2186a14cdf39b362295d78f28e04b9e0f..6061dea44c2f46a9ab78b01b2d4e2f6f6d4a0b94 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -457,10 +457,9 @@ struct applicationItem { .onChange((isOn: boolean) => { if(isOn) { if(globalThis.currentPermissionGroup == "CAMERA") { - camera.getCameraManager(globalThis.context).then(cameraManager => { - cameraManager.muteCamera(false) - this.globalIsOn = isOn - }) + let cameraManager = camera.getCameraManager(globalThis.context); + cameraManager.muteCamera(false); + this.globalIsOn = isOn; }else { var audioManager = audio.getAudioManager(); audioManager.setMicrophoneMute(false).then(() => { diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index 4587ab2075c6e218c153a8d590de6049892ab5fa..23439f2f707a21524dabe13b8b66400fab21419c 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -113,17 +113,15 @@ struct globalDialog { globalThis.globalContext.terminateSelf() }) }else if(globalThis.globalState == CAMERA) { - camera.getCameraManager(globalThis.globalContext).then(cameraManager => { - cameraManager.muteCamera(false) - globalThis.globalContext.terminateSelf() - }) + let cameraManager = camera.getCameraManager(globalThis.globalContext); + cameraManager.muteCamera(false); + globalThis.globalContext.terminateSelf(); }else { - camera.getCameraManager(globalThis.globalContext).then(cameraManager => { - cameraManager.muteCamera(false) - var audioManager = audio.getAudioManager(); - audioManager.setMicrophoneMute(false).then(() => { - globalThis.globalContext.terminateSelf() - }) + let cameraManager = camera.getCameraManager(globalThis.globalContext); + cameraManager.muteCamera(false) + var audioManager = audio.getAudioManager(); + audioManager.setMicrophoneMute(false).then(() => { + globalThis.globalContext.terminateSelf() }) }