From 24262d16a0d6e3b7d07486d03ab77e607e1847c3 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 21 十二月 2020 14:22:26 +0800
Subject: [PATCH] 增加获取Bug列表的功能
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 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 929cd3b..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);
@@ -60,6 +70,43 @@
acView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
+ case FunctionType.FloorHeating:
+ var fhView = new FloorHeatingPage(function as FloorHeating);
+ MainPage.BasePageView.AddChidren(fhView);
+ fhView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case FunctionType.Fan:
+ var fanView = new FanPage(function as Fan);
+ MainPage.BasePageView.AddChidren(fanView);
+ fanView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case FunctionType.Socket:
+ var sView = new SocketPage(function as SwitchSocket);
+ MainPage.BasePageView.AddChidren(sView);
+ 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