From 56dfdc1bf7e7f2bb2456f29c3686dfa935a89e80 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 13:59:45 +0800
Subject: [PATCH] 2022年06月30日13:59:08

---
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 5e0a123..cc2d317 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -62,6 +62,12 @@
                         rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         break;
+                    case SPK.CurtainDream:
+                        var curtainDreamView = new CurtainDreamPage(function);
+                        MainPage.BasePageView.AddChidren(curtainDreamView);
+                        curtainDreamView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        break;
                     case SPK.FloorHeatStandard:
                     case SPK.HvacFloorHeat:
                         var fhView = new FloorHeatingPage(function);
@@ -125,11 +131,11 @@
                         break;
                     case SPK.MusicStandard:
                     case SPK.AvMusic:
-                        Music.A31MusicModel.Current.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);
@@ -182,6 +188,10 @@
                         var acPage = new AcControlPage();
                         acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
+                    case SPK.HvacCac:
+                        var cacPage = new CacControlPage();
+                        cacPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+                        break;
                     case SPK.IrLearn:
                         var irLearinPage = new IrLearnPage();
                         irLearinPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
@@ -197,12 +207,21 @@
                         airFresh2.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
                     case SPK.DoorLock:
-                        var doorLockPage = new DoorLockListPage();
+                        var doorLockPage = new DoorLockPage();
                         doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
+                    case SPK.SensorHelp:
+                        var panelHelpPage = new UI2.FuntionControlView.Panel.PanelHelpPage();
+                        panelHelpPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+                        break;
+                    case SPK.PanelEnvironment:
+                        var panelEnvironmentPage = new EnvironmentPanelPage();
+                        panelEnvironmentPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+                        break;
+                         
                 }
             };
             return eventHandler;
         }
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0