From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 25 七月 2024 17:34:32 +0800 Subject: [PATCH] 2024年07月25日17:33:40 --- HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs index ef701da..f45fb41 100644 --- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs +++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs @@ -22,6 +22,12 @@ //璺宠浆鍒板姛鑳戒俊鎭缃〉闈� switch (function.spk) { + case SPK.ElectricEnergy: + var skipView = new EnergyMainPage(); + MainPage.BasePageView.AddChidren(skipView); + skipView.LoadPage(); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + break; case SPK.GroupControl: //var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid)); //dialog.ShowDialog(); @@ -34,6 +40,12 @@ var airSwitchPage = new AirSwitchPage(function); MainPage.BasePageView.AddChidren(airSwitchPage); airSwitchPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + break; + case SPK.AirSwitchP3: + var airSwitchP3Page = new AirSwitchP3Page(function); + MainPage.BasePageView.AddChidren(airSwitchP3Page); + airSwitchP3Page.LoadPage(btnCollectionIcon, btnName, btnFromFloor); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; break; case SPK.LightSwitch: @@ -157,7 +169,7 @@ break; case SPK.MusicStandard: case SPK.AvMusic: - Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function };//褰撳墠鎾斁鍣� + Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function ,LastDateTime = DateTime.Now};//褰撳墠鎾斁鍣� var a31PlayMusicPage = new Music.A31PlayMusicPage(); MainPage.BasePageView.AddChidren(a31PlayMusicPage); a31PlayMusicPage.Show(); -- Gitblit v1.8.0