blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxr
2023-07-30 d76b0e40e5bb127fd33aa1f7842447a1df0628d5 
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs


@@ -23,14 +23,24 @@


                switch (function.spk)


                {


                    case SPK.GroupControl:


                         var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));


                         dialog.ShowDialog();


                         //var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));


                         //dialog.ShowDialog();


                         var groupControlPage = new GroupControlPage_V2(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));


                        MainPage.BasePageView.AddChidren(groupControlPage);


                        groupControlPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);


                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;


                        break;


                    case SPK.AirSwitch:


                        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:


                        var relayView = new RelayPage(function);


@@ -153,11 +163,11 @@


                        break;


                    case SPK.MusicStandard:


                    case SPK.AvMusic:


                        //Music.A31MusicModel.Current= new Music.A31MusicModel { functionMusic = function };//当前播放器


                        //var a31PlayMusicPage = new Music.A31PlayMusicPage();


                        //MainPage.BasePageView.AddChidren(a31PlayMusicPage);


                        //a31PlayMusicPage.Show();


                        //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;


                        Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function };//当前播放器


                        var a31PlayMusicPage = new Music.A31PlayMusicPage();


                        MainPage.BasePageView.AddChidren(a31PlayMusicPage);


                        a31PlayMusicPage.Show();


                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;


                        break;



                    case SPK.LightCCT:


                        var TureView = new ColorTureLampPage(function);


@@ -166,6 +176,7 @@


                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;


                        break;


                    case SPK.SensorPir:


                    case SPK.SensorPirHold:


                        var pirPage = new SensorPirPage();


                        pirPage.ShowColltionButton = false;


                        pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);