From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 736410b..4ee35e8 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);
@@ -182,10 +188,6 @@
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);
@@ -204,15 +206,6 @@
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;
--
Gitblit v1.8.0