diff --git a/entry/src/main/ets/common/utils/CommonUtils.ets b/entry/src/main/ets/common/utils/CommonUtils.ets index 24e63b0666a9ca997a6d8f74614a6208987bbe90..d40f17078ab92f4472b882321032b1917168b786 100644 --- a/entry/src/main/ets/common/utils/CommonUtils.ets +++ b/entry/src/main/ets/common/utils/CommonUtils.ets @@ -13,14 +13,10 @@ * limitations under the License. */ -import { router } from '@kit.ArkUI'; -import { promptAction } from '@kit.ArkUI'; import libCheckNapi from 'libentry.so'; import CommonConstants from '../constants/CommonConstants'; import Logger from './Logger'; -const uiContext: UIContext | undefined = AppStorage.get('uiContext'); - /** * Common operation tools. */ @@ -94,6 +90,7 @@ export class CommonUtils { * @param {string} url page url */ public routerPage(url: string): void { + const uiContext: UIContext | undefined = AppStorage.get('uiContext'); uiContext!.getRouter().replaceUrl({ url: url }).catch((error: Error) => { @@ -107,6 +104,7 @@ export class CommonUtils { * @param {Resource | string} content content to show */ public showToastContent(content: Resource | string): void { + const uiContext: UIContext | undefined = AppStorage.get('uiContext'); uiContext!.getPromptAction().showToast({ message: content, duration: CommonConstants.TOAST_DURATION diff --git a/entry/src/main/ets/common/utils/MultipleDevicesUtils.ets b/entry/src/main/ets/common/utils/MultipleDevicesUtils.ets index 900d8d4d9292e5bd990f7c286c01a2849a13b591..ae2d2d531ce80481c2374268284205cf829b9174 100644 --- a/entry/src/main/ets/common/utils/MultipleDevicesUtils.ets +++ b/entry/src/main/ets/common/utils/MultipleDevicesUtils.ets @@ -16,8 +16,6 @@ import { mediaquery } from '@kit.ArkUI'; import CommonConstants from '../constants/CommonConstants'; -const uiContext: UIContext | undefined = AppStorage.get('uiContext'); - class MultipleDevicesUtils { private currentDeviceSize: string = ''; private smListener?: mediaquery.MediaQueryListener; @@ -48,6 +46,7 @@ class MultipleDevicesUtils { } public register(): void { + const uiContext: UIContext | undefined = AppStorage.get('uiContext'); this.smListener = uiContext!.getMediaQuery().matchMediaSync(CommonConstants.WIDTH_CONDITION_SM); this.smListener.on('change', this.isDeviceSizeSM); this.mdListener = uiContext!.getMediaQuery().matchMediaSync(CommonConstants.WIDTH_CONDITION_MD); diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index a2fa0e12e5ddbdeb5c369db51d610d6ccf149f40..2a025cf915e387e8e8093805a8db000bc6737b03 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -54,7 +54,6 @@ export default class EntryAbility extends UIAbility { return; } Logger.info(CommonConstants.TAG_ABILITY, 'Loading the content to succeeded ' + JSON.stringify(data)); - AppStorage.setOrCreate('uiContext', windowStage.getMainWindowSync().getUIContext()); }); } } \ No newline at end of file diff --git a/entry/src/main/ets/pages/LoginPage.ets b/entry/src/main/ets/pages/LoginPage.ets index 19f4285acb40bdb4089bbe58e40595f28257f692..a08ea6cc5a6dc3b51dc01ca96f6f6f0d2308a6cf 100644 --- a/entry/src/main/ets/pages/LoginPage.ets +++ b/entry/src/main/ets/pages/LoginPage.ets @@ -27,6 +27,10 @@ import MultipleDevicesUtils from '../common/utils/MultipleDevicesUtils'; struct LoginPage { @StorageProp('currentDeviceSize') currentDeviceSize: string = CommonConstants.SM; + aboutToAppear(): void { + AppStorage.setOrCreate('uiContext', this.getUIContext()); + } + onPageShow() { MultipleDevicesUtils.register(); }