From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index cc2d317..49d4fc1 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -148,6 +148,11 @@
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();
waterPage.ShowColltionButton = false;
@@ -166,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:
@@ -210,15 +214,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