From f1532873e3029b2fb17cb84c1b9da1e2f66247c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 02 九月 2021 10:43:38 +0800
Subject: [PATCH] 代码合并
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 0f50349..b91669f 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -20,6 +20,12 @@
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.spk)
{
+ 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.LightSwitch:
var relayView = new RelayPage(function);
MainPage.BasePageView.AddChidren(relayView);
@@ -148,6 +154,11 @@
smPage.ShowColltionButton = false;
smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.SensorGas:
+ var gasPage = new SensorGasPage();
+ gasPage.ShowColltionButton = false;
+ gasPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
case SPK.ClothesHanger:
var clothesHangerpage = new ClothesHangerPage();
clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
@@ -169,6 +180,10 @@
var airFresh1 = new AirFreshControlPage();
airFresh1.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.AirFreshStandard:
+ var airFresh2 = new AirFreshRelayControlPage();
+ airFresh2.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
}
};
return eventHandler;
--
Gitblit v1.8.0