diff --git a/entry/src/main/ets/common/utils/CommonUtils.ets b/entry/src/main/ets/common/utils/CommonUtils.ets index d98bec0f66835f640d9dee2a8289f00e1ccd4f9e..24e63b0666a9ca997a6d8f74614a6208987bbe90 100644 --- a/entry/src/main/ets/common/utils/CommonUtils.ets +++ b/entry/src/main/ets/common/utils/CommonUtils.ets @@ -19,6 +19,8 @@ import libCheckNapi from 'libentry.so'; import CommonConstants from '../constants/CommonConstants'; import Logger from './Logger'; +const uiContext: UIContext | undefined = AppStorage.get('uiContext'); + /** * Common operation tools. */ @@ -92,7 +94,7 @@ export class CommonUtils { * @param {string} url page url */ public routerPage(url: string): void { - router.replaceUrl({ + uiContext!.getRouter().replaceUrl({ url: url }).catch((error: Error) => { Logger.error(CommonConstants.TAG_COMMON_UTILS, 'replace url error ' + JSON.stringify(error)); @@ -105,7 +107,7 @@ export class CommonUtils { * @param {Resource | string} content content to show */ public showToastContent(content: Resource | string): void { - promptAction.showToast({ + 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 ab80eedf7d3f1ed86102f5a20f846ab17d8d8cca..900d8d4d9292e5bd990f7c286c01a2849a13b591 100644 --- a/entry/src/main/ets/common/utils/MultipleDevicesUtils.ets +++ b/entry/src/main/ets/common/utils/MultipleDevicesUtils.ets @@ -16,6 +16,8 @@ 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; @@ -46,11 +48,11 @@ class MultipleDevicesUtils { } public register(): void { - this.smListener = mediaquery.matchMediaSync(CommonConstants.WIDTH_CONDITION_SM); + this.smListener = uiContext!.getMediaQuery().matchMediaSync(CommonConstants.WIDTH_CONDITION_SM); this.smListener.on('change', this.isDeviceSizeSM); - this.mdListener = mediaquery.matchMediaSync(CommonConstants.WIDTH_CONDITION_MD); + this.mdListener = uiContext!.getMediaQuery().matchMediaSync(CommonConstants.WIDTH_CONDITION_MD); this.mdListener.on('change', this.isDeviceSizeMD); - this.lgListener = mediaquery.matchMediaSync(CommonConstants.WIDTH_CONDITION_LG); + this.lgListener = uiContext!.getMediaQuery().matchMediaSync(CommonConstants.WIDTH_CONDITION_LG); this.lgListener.on('change', this.isDeviceSizeLG); } diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 2a025cf915e387e8e8093805a8db000bc6737b03..a2fa0e12e5ddbdeb5c369db51d610d6ccf149f40 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -54,6 +54,7 @@ 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