From 48b49cfc03fe43bc64bfb40990a1965270e21b2e Mon Sep 17 00:00:00 2001
From: wpp <58198665+879356503@users.noreply.github.com>
Date: Fri, 18 Apr 2025 18:14:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/ets/entryability/EntryAbility.ets    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index 0c556f4..bdca8fa 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -66,18 +66,24 @@ export default class EntryAbility extends UIAbility {
 
   onWindowStageCreate(windowStage: window.WindowStage): void {
     windowStage.getMainWindow().then((windowObj: window.Window) => {
-      let type = window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR;
-      let avoidArea = windowObj.getWindowAvoidArea(type);
-      let bottomRectHeight = avoidArea.bottomRect.height;
-      AppStorage.setOrCreate('bottomRectHeight', bottomRectHeight);
-      type = window.AvoidAreaType.TYPE_SYSTEM;
-      avoidArea = windowObj.getWindowAvoidArea(type);
-      let topRectHeight = avoidArea.topRect.height;
-      AppStorage.setOrCreate('topRectHeight', topRectHeight);
-      this.updateBreakpoint(windowObj.getWindowProperties().windowRect.width);
-      windowObj.on('windowSizeChange', (windowSize) => {
-        this.updateBreakpoint(windowSize.width);
-      })
+      try {
+        let type = window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR;
+        let avoidArea = windowObj.getWindowAvoidArea(type);
+        let bottomRectHeight = avoidArea.bottomRect.height;
+        AppStorage.setOrCreate('bottomRectHeight', bottomRectHeight);
+        type = window.AvoidAreaType.TYPE_SYSTEM;
+        avoidArea = windowObj.getWindowAvoidArea(type);
+        let topRectHeight = avoidArea.topRect.height;
+        AppStorage.setOrCreate('topRectHeight', topRectHeight);
+        this.updateBreakpoint(windowObj.getWindowProperties().windowRect.width);
+        windowObj.on('windowSizeChange', (windowSize) => {
+          this.updateBreakpoint(windowSize.width);
+        });
+      } catch (err) {
+        hilog.error(0x0000, 'testTag', `Set window properties err. Cause: ${err.code}`);
+      }
+    }).catch((err: BusinessError) => {
+      hilog.error(0x0000, 'testTag', `Failed to get main window. Cause:`, err.message);
     });
     // Main window is created, set main page for this ability
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
-- 
Gitee


From 8bea4dc9208323ac7caea55c3aaa59cbe634210c Mon Sep 17 00:00:00 2001
From: wpp <58198665+879356503@users.noreply.github.com>
Date: Fri, 18 Apr 2025 19:11:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/ets/entryability/EntryAbility.ets    | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index bdca8fa..32c67f8 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -87,25 +87,30 @@ export default class EntryAbility extends UIAbility {
     });
     // Main window is created, set main page for this ability
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
+
     let context = this.context;
     let resourceManager: resourceManager.ResourceManager = context.resourceManager;
     AppStorage.setOrCreate('resourceManager', resourceManager);
     windowStage.loadContent('pages/Index', (err, data) => {
-      createNWeb(ResourceUtil.getRawFileStringByKey(getContext(this) as common.UIAbilityContext,
-        ConfigMapKey.GALLERY_URL), windowStage.getMainWindowSync().getUIContext());
-      if (err.code) {
-        hilog.error(0x0000, 'testTag', 'Failed to load the content.');
-        return;
-      }
-      hilog.info(0x0000, 'testTag', 'Succeeded in loading the content.', JSON.stringify(data) ?? '');
-      let windowClass: window.Window = windowStage.getMainWindowSync();
-      let isLayoutFullScreen = true;
-      windowClass.setWindowLayoutFullScreen(isLayoutFullScreen).then(() => {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'Succeeded in setting the window layout to full-screen mode.');
-      }).catch(() => {
+      try {
+        createNWeb(ResourceUtil.getRawFileStringByKey(getContext(this) as common.UIAbilityContext,
+          ConfigMapKey.GALLERY_URL), windowStage.getMainWindowSync().getUIContext());
+        if (err.code) {
+          hilog.error(0x0000, 'testTag', 'Failed to load the content.');
+          return;
+        }
+        hilog.info(0x0000, 'testTag', 'Succeeded in loading the content.', JSON.stringify(data) ?? '');
+        let windowClass: window.Window = windowStage.getMainWindowSync();
+        let isLayoutFullScreen = true;
+        windowClass.setWindowLayoutFullScreen(isLayoutFullScreen).then(() => {
+          hilog.info(0x0000, 'testTag', '%{public}s', 'Succeeded in setting the window layout to full-screen mode.');
+        }).catch(() => {
+          hilog.error(0x0000, 'testTag', '%{public}s', 'Failed to set the window layout to full-screen mode.');
+        });
+      } catch (error) {
         hilog.error(0x0000, 'testTag', '%{public}s',
-          'Failed to set the window layout to full-screen mode.');
-      });
+          `onWindowStageCreate failed. Cause code: ${error.code}, message: ${error.message}`);
+      }
     });
   }
 
-- 
Gitee