From 160531692f7812b2ce22f76109139e89957b8fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=89=AC?= <dingyang33@huawei.com>
Date: Tue, 23 Sep 2025 17:40:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(uiContext):=20=E4=BF=AE=E5=A4=8D=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
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 | 3 +--
 entry/src/main/ets/entryability/EntryAbility.ets         | 1 -
 entry/src/main/ets/pages/LoginPage.ets                   | 4 ++++
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/entry/src/main/ets/common/utils/CommonUtils.ets b/entry/src/main/ets/common/utils/CommonUtils.ets
index 24e63b0..d40f170 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 900d8d4..ae2d2d5 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 a2fa0e1..2a025cf 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 19f4285..a08ea6c 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();
   }
-- 
Gitee