From 418b0d0a4002bc06ba3a55d1809fe46043f06c09 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 26 九月 2022 14:07:58 +0800
Subject: [PATCH] 光伏更新，金茂科技系统更新
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 6438837..49d4fc1 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,7 +131,7 @@
break;
case SPK.MusicStandard:
case SPK.AvMusic:
- //Music.A31MusicModel.Current.functionMusic =function;//褰撳墠鎾斁鍣�
+ //Music.A31MusicModel.Current= new Music.A31MusicModel { functionMusic = function };//褰撳墠鎾斁鍣�
//var a31PlayMusicPage = new Music.A31PlayMusicPage();
//MainPage.BasePageView.AddChidren(a31PlayMusicPage);
//a31PlayMusicPage.Show();
@@ -141,6 +147,11 @@
var pirPage = new SensorPirPage();
pirPage.ShowColltionButton = false;
pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorHelp:
+ var helpPage = new PanelHelpPage();
+ helpPage.ShowColltionButton = false;
+ helpPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.SensorWater:
var waterPage = new SensorWaterImmersionPage();
@@ -160,7 +171,6 @@
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
var smPage = new SenesorMegahealthPage();
- smPage.ShowColltionButton = false;
smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.SensorGas:
@@ -181,6 +191,10 @@
case SPK.HvacAC:
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();
@@ -205,4 +219,4 @@
return eventHandler;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0