From ed2d2c9b9e9bca8cd97136b738c2624193dd9d92 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 09 十月 2022 11:48:34 +0800
Subject: [PATCH] 百叶帘，编辑场景数据显示异常，光伏功能安卓系统返回上一次
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 736410b..732abb2 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -38,6 +38,12 @@
rgbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
+ case SPK.LightRGBW:
+ var rgbwView = new RGBWPage(function);
+ MainPage.BasePageView.AddChidren(rgbwView);
+ rgbwView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
case SPK.LightDimming:
var dimmerView = new DimmerPage(function);
MainPage.BasePageView.AddChidren(dimmerView);
@@ -57,9 +63,21 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.CurtainRoller:
- var rollingShutterView = new RollingShutterPage(function);
+ var rollingShutterView = new VenetianBlindsPage(function);
MainPage.BasePageView.AddChidren(rollingShutterView);
rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.CurtainShades:
+ var curtainShadesView = new RollingShutterPage(function);
+ MainPage.BasePageView.AddChidren(curtainShadesView);
+ curtainShadesView.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:
@@ -142,6 +160,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;
@@ -160,7 +183,6 @@
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
var smPage = new SenesorMegahealthPage();
- smPage.ShowColltionButton = false;
smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.SensorGas:
@@ -204,15 +226,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