diff --git a/commons/base/src/main/ets/utils/WindowUtil.ets b/commons/base/src/main/ets/utils/WindowUtil.ets index fa433d1ec30f1e54c710b03446d256cbdd60e001..c786871115458f121ece2d5b03a2595bdf5b2475 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 d0ff09dc03876f6bc104389ab476b07ed8ec2831..1d5aa7a3986fe636f382ea65bf78cdfd063bfa17 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 fb4de71c22c5d3bcc7abb390c7b0841935076ec2..73a608435992d9e6335649fb96f9db7a9c33861f 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()); + } + } }); }