From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index ed596b1..f6559b3 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -65,12 +65,6 @@
rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- case SPK.AcStandard:
- var acView = new ACPage(function as AC);
- MainPage.BasePageView.AddChidren(acView);
- acView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
case SPK.FloorHeatStandard:
var fhView = new FloorHeatingPage(function as FloorHeating);
MainPage.BasePageView.AddChidren(fhView);
@@ -124,6 +118,41 @@
TureView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
+ case SPK.SensorPir:
+ var pirPage = new SensorPirPage();
+ pirPage.ShowColltionButton = false;
+ pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorWater:
+ var waterPage = new SensorWaterImmersionPage();
+ waterPage.ShowColltionButton = false;
+ waterPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorSmoke:
+ var smokePage = new SensorSmokePage();
+ smokePage.ShowColltionButton = false;
+ smokePage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorDoorWindow:
+ var doorwindowPage = new SensorDoorWinwsPage();
+ doorwindowPage.ShowColltionButton = false;
+ doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.ClothesHanger:
+ var clothesHangerpage = new ClothesHangerPage();
+ clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.IrAC:
+ case SPK.AcStandard:
+ var acPage = new AcControlPage();
+ acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ //case SPK.AcStandard:
+ // var acView = new ACPage(function as AC);
+ // MainPage.BasePageView.AddChidren(acView);
+ // acView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // break;
}
};
return eventHandler;
--
Gitblit v1.8.0