diff --git a/entry/src/main/ets/component/Header.ets b/entry/src/main/ets/component/Header.ets index 62387eacacced81f652d657309a19782fa2ef731..c148db60f345e5f56db2fe1f78642968345e2688 100644 --- a/entry/src/main/ets/component/Header.ets +++ b/entry/src/main/ets/component/Header.ets @@ -27,7 +27,7 @@ export struct Header { .position({ x: '2%', y: '2%' }) .size({ width: 200, height: 50 }) .onClick(() => { - router.back(); + this.getUIContext().getRouter().back(); }) } } \ No newline at end of file diff --git a/entry/src/main/ets/feature/LaunchFeature.ets b/entry/src/main/ets/feature/LaunchFeature.ets index 695676ca482f8fae779298f20177ccc862589c23..7f8e055e024d944f203d7992352fabd83698fb75 100644 --- a/entry/src/main/ets/feature/LaunchFeature.ets +++ b/entry/src/main/ets/feature/LaunchFeature.ets @@ -22,18 +22,18 @@ import { Want } from '@kit.AbilityKit'; import { GlobalContext } from '../module/GlobalContext'; export default class LaunchFeature { - private innerContext: common.UIAbilityContext | null = null; + private context: UIContext | null = null; private pref: preferences.Preferences | null = null; private subscriber: commonEventManager.CommonEventSubscriber | null = null; private subscriberLow: commonEventManager.CommonEventSubscriber | null = null; private currentRecordTimes: number = 0; - constructor(abilityContext: common.UIAbilityContext) { - this.innerContext = abilityContext; + constructor(context: UIContext) { + this.context = context; } async init(): Promise { - await preferences.getPreferences(this.innerContext as common.UIAbilityContext, consts.DATA_BASE_NAME) + await preferences.getPreferences(this.context?.getHostContext() as common.UIAbilityContext, consts.DATA_BASE_NAME) .then((pref) => { this.pref = pref; }); @@ -145,25 +145,26 @@ export default class LaunchFeature { bundleName: 'com.samples.customcommonevent', abilityName: 'MainAbility', }; - this.innerContext?.startAbility(want); + let innerContext: common.UIAbilityContext = this.context?.getHostContext() as common.UIAbilityContext + innerContext?.startAbility(want); } jumpToHistory = () => { Logger.info("ready to jump to history page"); - router.pushUrl({ + this.context?.getRouter().pushUrl({ url: 'pages/History', params: {} }); } jumpToSetting = () => { Logger.info("ready to jump to setting page"); - router.pushUrl({ + this.context?.getRouter().pushUrl({ url: 'pages/Setting', params: {} }); } jumpToAbout = () => { Logger.info("ready to jump to about page"); - router.pushUrl({ + this.context?.getRouter().pushUrl({ url: 'pages/About', params: {} }); diff --git a/entry/src/main/ets/pages/Detail.ets b/entry/src/main/ets/pages/Detail.ets index f05bff1b7ea571b8898f68dcbb3c9c21161bcc03..536c0dafcd0c5d6d14e03860647bb18f950cd766 100644 --- a/entry/src/main/ets/pages/Detail.ets +++ b/entry/src/main/ets/pages/Detail.ets @@ -18,8 +18,8 @@ import { Header } from '../component/Header'; @Entry @Component struct Detail { - private arr: Array = (router.getParams() as Record)['recEvents'] as Array; - private filteredArr: Array = (router.getParams() as Record)['onceEvents'] as Array; + private arr: Array = (this.getUIContext().getRouter().getParams() as Record)['recEvents'] as Array; + private filteredArr: Array = (this.getUIContext().getRouter().getParams() as Record)['onceEvents'] as Array; build() { Column() { diff --git a/entry/src/main/ets/pages/History.ets b/entry/src/main/ets/pages/History.ets index 68d958fae46929609e26a77a581f9da5da53cf8e..4bcca15eb332fad1a06b482728749c35ed61428d 100644 --- a/entry/src/main/ets/pages/History.ets +++ b/entry/src/main/ets/pages/History.ets @@ -21,7 +21,7 @@ import Logger from '../module/Logger'; @Entry @Component struct History { - private feature: historyFeature = new historyFeature(getContext() as common.UIAbilityContext); + private feature: historyFeature = new historyFeature(this.getUIContext().getHostContext() as common.UIAbilityContext); @State arr: Array> = []; async onPageShow() { diff --git a/entry/src/main/ets/pages/Launch.ets b/entry/src/main/ets/pages/Launch.ets index 7d9315afe784065bff298b4404e15e74d2ed7062..c6c09516efa858e9b9fea7220d3272984b8052e6 100644 --- a/entry/src/main/ets/pages/Launch.ets +++ b/entry/src/main/ets/pages/Launch.ets @@ -19,7 +19,7 @@ import launchFeature from '../feature/LaunchFeature'; @Entry @Component struct Launch { - private feature: launchFeature = new launchFeature(getContext() as common.UIAbilityContext); + private feature: launchFeature = new launchFeature(this.getUIContext()); async onPageShow() { await this.feature.init(); diff --git a/entry/src/main/ets/pages/Main.ets b/entry/src/main/ets/pages/Main.ets index b88066e663eeeef1a1aee5ef700bd4e2d1a9826d..8ae571df876107e03c6aa84778210000beb4c542 100644 --- a/entry/src/main/ets/pages/Main.ets +++ b/entry/src/main/ets/pages/Main.ets @@ -205,7 +205,7 @@ struct Main { validRecEvents.push(element); } }); - router.pushUrl({ + this.getUIContext().getRouter().pushUrl({ url: 'pages/Detail', params: { 'recEvents': validRecEvents, diff --git a/entry/src/main/ets/pages/Setting.ets b/entry/src/main/ets/pages/Setting.ets index d6c862b6e2c4f6d5a26d08b7d9b8f5fad726c433..1ba3474ccdb54015b9456ef7263ace8495e26846 100644 --- a/entry/src/main/ets/pages/Setting.ets +++ b/entry/src/main/ets/pages/Setting.ets @@ -25,7 +25,7 @@ class EventData { @Entry @Component struct Setting { - private feature: settingFeature = new settingFeature(getContext() as common.UIAbilityContext); + private feature: settingFeature = new settingFeature(this.getUIContext().getHostContext() as common.UIAbilityContext); private dataSource: Array = [ { event: commonEventManager.Support.COMMON_EVENT_WIFI_POWER_STATE, title: $r('app.string.enable_wifi') }, { event: commonEventManager.Support.COMMON_EVENT_SCREEN_OFF, title: $r('app.string.enable_screen_off') },