From f6d42245c4cea3df45b61de027951893ff9a081c Mon Sep 17 00:00:00 2001
From: fanchenxuan <fanchenxuan@huawei.com>
Date: Tue, 10 Dec 2024 10:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fanchenxuan <fanchenxuan@huawei.com>
---
 .../ets/PermissionSheet/GlobalSwitchSheetAbility.ets | 12 ++++++++----
 .../PermissionSheet/PermissionStateSheetAbility.ets  | 12 ++++++++----
 .../src/main/ets/pages/authority-management.ets      | 10 +++++++---
 permissionmanager/src/main/ets/pages/dialogPlus.ets  |  2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets
index 4b07c1f..dd71c78 100644
--- a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets
+++ b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets
@@ -156,10 +156,14 @@ export default class GlobalSwitchSheetAbility extends UIExtensionAbility {
         return;
       }
     }
-    let dis = display.getDefaultDisplaySync();
-    await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => {
-      Log.error('resize window error: ' + err.code + ' ' + err.message);
-    });
+    try {
+      let dis = display.getDefaultDisplaySync();
+      await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => {
+        Log.error('resize window error: ' + err.code + ' ' + err.message);
+      });
+    } catch (error) {
+      Log.error('getDefaultDisplaySync error: ' + error.code + ' ' + error.message);
+    }
     this.subWindowForHost?.on('windowEvent', (eventType: window.WindowEventType) => {
       Log.info('window event type is: ' + eventType);
       storage.setOrCreate('permissionWindow', eventType);
diff --git a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets
index 687798b..4f6f172 100644
--- a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets
+++ b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets
@@ -156,10 +156,14 @@ export default class PermissionStateSheetAbility extends UIExtensionAbility {
         return;
       }
     }
-    let dis = display.getDefaultDisplaySync();
-    await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => {
-      Log.error('resize window error: ' + err.code + ' ' + err.message);
-    });
+    try {
+      let dis = display.getDefaultDisplaySync();
+      await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => {
+        Log.error('resize window error: ' + err.code + ' ' + err.message);
+      });
+    } catch (error) {
+      Log.error('getDefaultDisplaySync error: ' + error.code + ' ' + error.message);
+    }
     this.subWindowForHost?.on('windowEvent', (eventType: window.WindowEventType) => {
       Log.info('window event type is: ' + eventType);
       storage.setOrCreate('permissionWindow', eventType);
diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets
index ca6fb6c..d092b90 100644
--- a/permissionmanager/src/main/ets/pages/authority-management.ets
+++ b/permissionmanager/src/main/ets/pages/authority-management.ets
@@ -383,9 +383,13 @@ struct authorityManagementPage {
    */
   aboutToAppear() {
     this.getAllBundlePermissions();
-    let dis = display.getDefaultDisplaySync();
-    this.isVertical = dis.height > dis.width ? true : false;
-    GlobalContext.store('isVertical', dis.height > dis.width ? true : false);
+    try {
+      let dis = display.getDefaultDisplaySync();
+      this.isVertical = dis.height > dis.width ? true : false;
+      GlobalContext.store('isVertical', dis.height > dis.width ? true : false);
+    } catch (error) {
+      Log.error(`getDefaultDisplaySync failed. ${JSON.stringify(error)}`);
+    }
   }
 
   getPermissionGroup(allGroup: GroupPermission[], order: number): GroupPermission[] {
diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets
index d03003f..027c2f1 100644
--- a/permissionmanager/src/main/ets/pages/dialogPlus.ets
+++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets
@@ -362,7 +362,7 @@ struct dialogPlusPage {
       this.initStatus = Constants.INIT_NEED_TO_TERMINATED;
       return;
     }
-    Log.info('request permission=' + JSON.stringify(this.reqPerms) + ', tokenId = ' + this.accessTokenId);
+    Log.info(`request permission: ${JSON.stringify(this.reqPerms)}.`);
     Log.info('permission state=' + JSON.stringify(this.want.parameters['ohos.user.grant.permission.state']));
     this.result = new Array(this.reqPerms.length).fill(-1);
     this.getPasteBoardInfo();
-- 
Gitee