From 1d2105ed10b3070461e096e895af493b896ed3fb Mon Sep 17 00:00:00 2001
From: EasyGuohf <163991322+EasyGuohf@users.noreply.github.com>
Date: Tue, 12 Aug 2025 15:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=EF=BC=9Atry/catch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/ets/common/utils/WindowUtils.ets      | 14 +++++++-------
 .../src/main/ets/entryability/EntryAbility.ets     |  7 ++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/multinavbarlibrary/src/main/ets/common/utils/WindowUtils.ets b/multinavbarlibrary/src/main/ets/common/utils/WindowUtils.ets
index d3992ea..ce629e1 100644
--- a/multinavbarlibrary/src/main/ets/common/utils/WindowUtils.ets
+++ b/multinavbarlibrary/src/main/ets/common/utils/WindowUtils.ets
@@ -57,8 +57,8 @@ export class WindowUtil {
       const systemAvoidArea: window.AvoidArea = data.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM);
       const navIndicatorAvoidArea: window.AvoidArea =
         data.getWindowAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR);
-      WindowUtil.setAvoidArea(data, window.AvoidAreaType.TYPE_SYSTEM, systemAvoidArea);
-      WindowUtil.setAvoidArea(data, window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR, navIndicatorAvoidArea);
+      WindowUtil.setAvoidArea(window.AvoidAreaType.TYPE_SYSTEM, systemAvoidArea);
+      WindowUtil.setAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR, navIndicatorAvoidArea);
       data.on('windowSizeChange', () => BreakpointSystem.getInstance().onWindowSizeChange(data));
       if (canIUse('SystemCapability.Window.SessionManager')) {
         data.setWindowDecorVisible(false);
@@ -66,7 +66,7 @@ export class WindowUtil {
       }
       WindowUtil.requestFullScreen(data);
       data.on('avoidAreaChange', (avoidAreaOption) => {
-        WindowUtil.setAvoidArea(data, avoidAreaOption.type, avoidAreaOption.area);
+        WindowUtil.setAvoidArea(avoidAreaOption.type, avoidAreaOption.area);
       });
     } catch (error) {
       const err: BusinessError = error as BusinessError;
@@ -76,12 +76,12 @@ export class WindowUtil {
   }
 
   // Get status bar height and indicator height.
-  public static setAvoidArea(data: window.Window, type: window.AvoidAreaType, area: window.AvoidArea) {
-    const context: UIContext = data.getUIContext();
+  public static setAvoidArea(type: window.AvoidAreaType, area: window.AvoidArea) {
+    const context: UIContext | undefined = AppStorage.get<UIContext>(Constants.KEY_UI_CONTEXT);
     if (type === window.AvoidAreaType.TYPE_SYSTEM) {
-      AppStorage.setOrCreate(Constants.KEY_STATUS_BAR_HEIGHT, context.px2vp(area.topRect.height));
+      AppStorage.setOrCreate(Constants.KEY_STATUS_BAR_HEIGHT, context?.px2vp(area.topRect.height));
     } else if (type === window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR) {
-      AppStorage.setOrCreate(Constants.KEY_NAV_INDICATOR_HEIGHT, context.px2vp(area.bottomRect.height));
+      AppStorage.setOrCreate(Constants.KEY_NAV_INDICATOR_HEIGHT, context?.px2vp(area.bottomRect.height));
     }
   }
 }
\ No newline at end of file
diff --git a/multinavbarsample/src/main/ets/entryability/EntryAbility.ets b/multinavbarsample/src/main/ets/entryability/EntryAbility.ets
index a79a572..2452458 100644
--- a/multinavbarsample/src/main/ets/entryability/EntryAbility.ets
+++ b/multinavbarsample/src/main/ets/entryability/EntryAbility.ets
@@ -24,7 +24,12 @@ const TAG: string = '[EntryAbility]';
 export default class EntryAbility extends UIAbility {
   onCreate(): void {
     hilog.info(0x0000, TAG, 'Ability onCreate');
-    this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET);
+    try {
+      this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET);
+    } catch (error) {
+      const err: BusinessError = error as BusinessError;
+      hilog.error(0x0000, TAG, '%{public}s', `Set colorMode failed: ${err.code}, ${err.message}`);
+    }
   }
 
   onWindowStageCreate(windowStage: window.WindowStage): void {
-- 
Gitee