From e3bb5edc1768c79dbf34fb7d68f5ab7359995df1 Mon Sep 17 00:00:00 2001
From: lvxiaoqiang <lvxiaoqiang1@huawei.com>
Date: Tue, 27 Dec 2022 18:44:44 +0800
Subject: [PATCH] modify camera async api to sync api

Signed-off-by: lvxiaoqiang <lvxiaoqiang1@huawei.com>
---
 .../src/main/ets/common/components/dialog.ets |  9 ++++---
 .../main/ets/pages/authority-management.ets   | 11 ++++-----
 .../ets/pages/authority-tertiary-groups.ets   |  7 +++---
 .../src/main/ets/pages/globalSwitch.ets       | 24 +++++++++----------
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets
index 3d3f861..02ca56f 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();
       let audioVolumeManager = audioManager.getVolumeManager();
diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets
index 75eb7c5..617a214 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.pushUrl({
-                    url: 'pages/authority-tertiary-groups',
-                    params: { routerData: dataList, backTitle: item.groupName, globalIsOn: !mute }
-                  })
+                let cameraManager = camera.getCameraManager(globalThis.context);
+                let mute = cameraManager.isCameraMuted();
+                router.pushUrl({
+                  url: '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 bfd9dc2..5671abf 100644
--- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets
+++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets
@@ -436,10 +436,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();
                             let audioVolumeManager = audioManager.getVolumeManager();
diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets
index 1d33016..e2ad718 100644
--- a/permissionmanager/src/main/ets/pages/globalSwitch.ets
+++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets
@@ -117,20 +117,18 @@ struct globalDialog {
         })
       })
     }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();
-        let audioVolumeManager = audioManager.getVolumeManager();
-        let groupid = audio.DEFAULT_VOLUME_GROUP_ID;
-        audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => {
-          audioVolumeGroupManager.setMicrophoneMute(false).then(() => {
-            globalThis.globalContext.terminateSelf()
-          })
+      let cameraManager = camera.getCameraManager(globalThis.globalContext);
+      cameraManager.muteCamera(false);
+      var audioManager = audio.getAudioManager();
+      let audioVolumeManager = audioManager.getVolumeManager();
+      let groupid = audio.DEFAULT_VOLUME_GROUP_ID;
+      audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => {
+        audioVolumeGroupManager.setMicrophoneMute(false).then(() => {
+          globalThis.globalContext.terminateSelf()
         })
       })
     }
-- 
Gitee