From 3471ffd021591c273f2cef2fab1661b2faaaae4a Mon Sep 17 00:00:00 2001
From: hdw <hedongwei05@chinasoftinc.com>
Date: Fri, 6 Jun 2025 14:32:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/src/main/ets/utils/WindowUtil.ets    |  4 +---
 .../main/ets/entryability/EntryAbility.ets    | 18 +++++++--------
 .../main/ets/secondability/SecondAbility.ets  | 22 +++++++++----------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/commons/base/src/main/ets/utils/WindowUtil.ets b/commons/base/src/main/ets/utils/WindowUtil.ets
index fa433d1..c786871 100644
--- a/commons/base/src/main/ets/utils/WindowUtil.ets
+++ b/commons/base/src/main/ets/utils/WindowUtil.ets
@@ -19,8 +19,6 @@ import { BreakpointConstants } from '../constants/BreakpointConstants';
 import { CommonConstants } from '../constants/CommonConstants';
 import Logger from './Logger';
 
-const uiContext: UIContext | undefined = AppStorage.get('uiContext');
-
 export class WindowUtil {
   private windowStage?: window.WindowStage;
   private mainWindowClass?: window.Window;
@@ -73,7 +71,7 @@ export class WindowUtil {
     });
   }
 
-  setAvoidRectHeight(): void {
+  setAvoidRectHeight(uiContext: UIContext): void {
     if (this.mainWindowClass === undefined) {
       Logger.error(`MainWindowClass is undefined`);
       return;
diff --git a/products/phone/src/main/ets/entryability/EntryAbility.ets b/products/phone/src/main/ets/entryability/EntryAbility.ets
index d0ff09d..1d5aa7a 100644
--- a/products/phone/src/main/ets/entryability/EntryAbility.ets
+++ b/products/phone/src/main/ets/entryability/EntryAbility.ets
@@ -56,20 +56,20 @@ export default class EntryAbility extends UIAbility {
     AppStorage.setOrCreate('uiContext', this.context);
     console.log(JSON.stringify(this.context) + '555555555555')
 
-    if (this.windowUtil !== undefined) {
-      this.windowUtil.setWindowStage(windowStage);
-      await this.windowUtil.setMainWindow();
-      if (deviceInfo.deviceType !== CommonConstants.DEVICE_TYPES[0]) {
-        this.windowUtil.setFullScreen();
-      }
-      this.windowUtil.setAvoidRectHeight();
-    }
-    windowStage.loadContent('pages/Index', (err, data) => {
+    windowStage.loadContent('pages/Index', async (err, data) => {
       if (err.code) {
         hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
         return;
       }
       hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
+      if (this.windowUtil !== undefined) {
+        this.windowUtil.setWindowStage(windowStage);
+        await this.windowUtil.setMainWindow();
+        if (deviceInfo.deviceType !== CommonConstants.DEVICE_TYPES[0]) {
+          this.windowUtil.setFullScreen();
+        }
+        this.windowUtil.setAvoidRectHeight(windowStage.getMainWindowSync().getUIContext());
+      }
     });
   }
 
diff --git a/products/phone/src/main/ets/secondability/SecondAbility.ets b/products/phone/src/main/ets/secondability/SecondAbility.ets
index fb4de71..73a6084 100644
--- a/products/phone/src/main/ets/secondability/SecondAbility.ets
+++ b/products/phone/src/main/ets/secondability/SecondAbility.ets
@@ -74,23 +74,23 @@ export default class SecondAbility extends UIAbility {
       display.on(`foldStatusChange`, this.onFoldStatusChange);
     }
     AppStorage.setOrCreate('uiContext', this.context);
-    if (this.windowUtil !== undefined) {
-      this.windowUtil.setWindowStage(windowStage);
-      await this.windowUtil.setMainWindow();
-      if (deviceInfo.deviceType !== CommonConstants.DEVICE_TYPES[0]) {
-        this.windowUtil.setFullScreen();
-      }
-      if (!AppStorage.get('topRectHeight')) {
-        this.windowUtil.setAvoidRectHeight();
-      }
-    }
 
-    windowStage.loadContent('pages/Index', (err, data) => {
+    windowStage.loadContent('pages/Index', async (err, data) => {
       if (err.code) {
         hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
         return;
       }
       hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
+      if (this.windowUtil !== undefined) {
+        this.windowUtil.setWindowStage(windowStage);
+        await this.windowUtil.setMainWindow();
+        if (deviceInfo.deviceType !== CommonConstants.DEVICE_TYPES[0]) {
+          this.windowUtil.setFullScreen();
+        }
+        if (!AppStorage.get('topRectHeight')) {
+          this.windowUtil.setAvoidRectHeight(windowStage.getMainWindowSync().getUIContext());
+        }
+      }
     });
   }
 
-- 
Gitee