From 72dd49f90a70205bcc1030765507c0bfb151040d Mon Sep 17 00:00:00 2001
From: hdw <hedongwei05@chinasoftinc.com>
Date: Thu, 8 May 2025 14:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83api=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/common/utils/CommonUtils.ets          | 6 ++++--
 entry/src/main/ets/common/utils/MultipleDevicesUtils.ets | 8 +++++---
 entry/src/main/ets/entryability/EntryAbility.ets         | 1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/entry/src/main/ets/common/utils/CommonUtils.ets b/entry/src/main/ets/common/utils/CommonUtils.ets
index d98bec0..24e63b0 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 ab80eed..900d8d4 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 2a025cf..a2fa0e1 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
-- 
Gitee