From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
old mode 100644
new mode 100755
index a4f7435..d4effc2
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -19,10 +19,20 @@
switch (function.functionType)
{
case FunctionType.Relay:
- var relayView = new RelayPage(function as Light);
- MainPage.BasePageView.AddChidren(relayView);
- relayView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ if (function.spk == SPK.ElectricSocket)
+ {
+ var s1View = new SocketPage(function as SwitchSocket);
+ MainPage.BasePageView.AddChidren(s1View);
+ s1View.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else
+ {
+ var relayView = new RelayPage(function as Light);
+ MainPage.BasePageView.AddChidren(relayView);
+ relayView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
break;
case FunctionType.RGB:
var rgbView = new RGBPage(function as Light);
@@ -78,6 +88,25 @@
sView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
+ case FunctionType.TV:
+ var tvView = new TVPage(function as TV);
+ MainPage.BasePageView.AddChidren(tvView);
+ tvView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case FunctionType.A31Music:
+ Music.A31MusicModel.Current = (function as Music.A31MusicModel);//褰撳墠鎾斁鍣�
+ var a31PlayMusicPage = new Music.A31PlayMusicPage();
+ MainPage.BasePageView.AddChidren(a31PlayMusicPage);
+ a31PlayMusicPage.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case FunctionType.ColorTemperature:
+ var TureView = new ColorTureLampPage(function as Light);
+ MainPage.BasePageView.AddChidren(TureView);
+ TureView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
}
};
return eventHandler;
--
Gitblit v1.8.0