From afdec527e9b914c7024e7ace5592086e63a3bb10 Mon Sep 17 00:00:00 2001 From: yangxiang <1223109862@qq.com> Date: Tue, 6 May 2025 16:53:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9A=E5=BA=9F=E5=BC=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/WlanItem.ets | 2 +- entry/src/main/ets/pages/Index.ets | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/entry/src/main/ets/common/WlanItem.ets b/entry/src/main/ets/common/WlanItem.ets index 0915894..f062288 100644 --- a/entry/src/main/ets/common/WlanItem.ets +++ b/entry/src/main/ets/common/WlanItem.ets @@ -35,7 +35,7 @@ export struct WlanItem { if (this.currentBreakPoint === 'sm') { Image($r('app.media.ic_public_back')).width(24).height(24).margin({ right: 16 }) .onClick(()=>{ - router.back(); + this.getUIContext().getRouter().back(); }) } Text($r('app.string.WLAN')).fontSize(20).fontWeight(FontWeight.Medium) diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 6d80b94..cb2552b 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -22,15 +22,15 @@ struct Index { Column() { Column() { Button('A+B+C').onClick(() => { - router.pushUrl({ url: "application/MailBox" }) + this.getUIContext().getRouter().pushUrl({ url: "application/MailBox" }) }).type(ButtonType.Normal).borderRadius(5).width(100).id('caseOne') Button('A+C').onClick(() => { - router.pushUrl({ url: "application/PhotoAlbum" }) + this.getUIContext().getRouter().pushUrl({ url: "application/PhotoAlbum" }) }).type(ButtonType.Normal).borderRadius(5).width(100).id('caseTwo') Button('B+C').onClick(() => { - router.pushUrl({ url: "application/Settings" }) + this.getUIContext().getRouter().pushUrl({ url: "application/Settings" }) }).type(ButtonType.Normal).borderRadius(5).width(100).id('caseThree') }.width('100%').height('50%').justifyContent(FlexAlign.SpaceAround) }.width('100%').height('100%') -- Gitee From 72625acafc08bf49cf3ec0fd57467daf35ea2871 Mon Sep 17 00:00:00 2001 From: yangxiang <1223109862@qq.com> Date: Thu, 8 May 2025 10:29:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E5=BA=9F=E5=BC=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/application/MailBox.ets | 3 ++- entry/src/main/ets/application/PhotoAlbum.ets | 3 ++- entry/src/main/ets/application/Settings.ets | 3 ++- entry/src/main/ets/entryability/EntryAbility.ets | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/entry/src/main/ets/application/MailBox.ets b/entry/src/main/ets/application/MailBox.ets index 8d1806a..2cb4225 100644 --- a/entry/src/main/ets/application/MailBox.ets +++ b/entry/src/main/ets/application/MailBox.ets @@ -16,7 +16,8 @@ import { MailNavigation } from '../common/MailNavigation'; import { MailSideBar } from '../common/MailSideBar'; -let storage = LocalStorage.getShared(); +const uiContext: UIContext | undefined = AppStorage.get('uiContext'); +let storage = uiContext?.getSharedLocalStorage(); @Entry(storage) @Component diff --git a/entry/src/main/ets/application/PhotoAlbum.ets b/entry/src/main/ets/application/PhotoAlbum.ets index 25c8c58..6d93c29 100644 --- a/entry/src/main/ets/application/PhotoAlbum.ets +++ b/entry/src/main/ets/application/PhotoAlbum.ets @@ -16,7 +16,8 @@ import { PhotoContent } from '../common/PhotoContent'; import { PhotoSideBar } from '../common/PhotoSideBar'; -let storage = LocalStorage.getShared(); +const uiContext: UIContext | undefined = AppStorage.get('uiContext'); +let storage = uiContext?.getSharedLocalStorage(); @Entry(storage) @Component diff --git a/entry/src/main/ets/application/Settings.ets b/entry/src/main/ets/application/Settings.ets index d030419..83ef452 100644 --- a/entry/src/main/ets/application/Settings.ets +++ b/entry/src/main/ets/application/Settings.ets @@ -16,7 +16,8 @@ import { MainItem } from '../common/SettingItem'; import { WlanItem } from '../common/WlanItem'; -let storage = LocalStorage.getShared(); +const uiContext: UIContext | undefined = AppStorage.get('uiContext'); +let storage = uiContext?.getSharedLocalStorage(); @Entry(storage) @Component diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 45917dc..a8504cb 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -36,6 +36,9 @@ export default class EntryAbility extends UIAbility { return; } hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); + + let uiContext: UIContext | undefined = windowStage.getMainWindowSync().getUIContext() + AppStorage.setOrCreate('uiContext', uiContext); }); } -- Gitee From a933f49df3ba3f57cf13fe1d135c3758ad1886c8 Mon Sep 17 00:00:00 2001 From: yangxiang <1223109862@qq.com> Date: Thu, 8 May 2025 10:38:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E5=BA=9F=E5=BC=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/PhotoContent.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/common/PhotoContent.ets b/entry/src/main/ets/common/PhotoContent.ets index 0dd9e78..0792553 100644 --- a/entry/src/main/ets/common/PhotoContent.ets +++ b/entry/src/main/ets/common/PhotoContent.ets @@ -36,7 +36,7 @@ export struct PhotoContent { } onStateChange() { - animateTo({ duration: 300 }, () => { + this.getUIContext().animateTo({ duration: 300 }, () => { if (this.sideBarStatus === true && this.currentBreakPoint !== 'sm') { this.columnsTemplate = '1fr 1fr 1fr'; } else { -- Gitee