From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 82d5d2b..c0df69b 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -148,9 +148,18 @@
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);
+ break;
+ case SPK.FanIr:
+ var fanIr = new IrFanPage();
+ fanIr.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.AcIr:
case SPK.AcStandard:
@@ -165,6 +174,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