From bbd6b592a6b883e013ff1e0a574976ceba5009ea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 27 十月 2022 09:11:33 +0800
Subject: [PATCH] Merge branch 'dev--wxr'
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 49d4fc1..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,11 +63,17 @@
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);
--
Gitblit v1.8.0