From d4811b7d34b45ff6b21b97f11da128b5572ec526 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 03 三月 2021 16:03:03 +0800
Subject: [PATCH] 20210303-1
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
old mode 100755
new mode 100644
index d4effc2..5f12ec0
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -15,10 +15,11 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
+ //todo 澧炲姞璁惧锛屽姛鑳藉垪琛ㄧ晫闈�
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
- switch (function.functionType)
+ switch (function.spk)
{
- case FunctionType.Relay:
+ case SPK.LightSwitch:
if (function.spk == SPK.ElectricSocket)
{
var s1View = new SocketPage(function as SwitchSocket);
@@ -34,79 +35,119 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
break;
- case FunctionType.RGB:
+ case SPK.LightRGB:
var rgbView = new RGBPage(function as Light);
MainPage.BasePageView.AddChidren(rgbView);
rgbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- case FunctionType.Dimmer:
+ case SPK.LightDimming:
var dimmerView = new DimmerPage(function as Light);
MainPage.BasePageView.AddChidren(dimmerView);
dimmerView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- case FunctionType.MotorCurtain:
+ case SPK.CurtainTrietex:
var skinView = new MotorCurtainPage(function as Curtain);
MainPage.BasePageView.AddChidren(skinView);
skinView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- case FunctionType.Curtain:
+ case SPK.CurtainSwitch:
var curtainView = new CurtainModulePage(function as Curtain);
MainPage.BasePageView.AddChidren(curtainView);
curtainView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- case FunctionType.RollingShutter:
+ case SPK.CurtainRoller:
var rollingShutterView = new RollingShutterPage(function as Curtain);
MainPage.BasePageView.AddChidren(rollingShutterView);
rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- case FunctionType.AC:
+ case SPK.AcStandard:
var acView = new ACPage(function as AC);
MainPage.BasePageView.AddChidren(acView);
acView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- case FunctionType.FloorHeating:
+ case SPK.FloorHeatStandard:
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:
+ case SPK.ElectricFan:
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:
+ case SPK.ElectricSocket:
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:
+ case SPK.ElectricTV:
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 SPK.ElectricTuyaAirCleaner:
+ var airCleaner = new TuyaAirCleanerPage();
+ airCleaner.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.ElectricTuyaFan:
+ var tuyaFan = new TuyaFanPage();
+ tuyaFan.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
- case FunctionType.A31Music:
+ case SPK.ElectricTuyaWaterValve:
+ var tyWaterValve = new TuyaWaterValvePage();
+ tyWaterValve.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.ElectricTuyaWeepRobot:
+ var weepRobot = new TuyaWeepRobotPage();
+ weepRobot.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.MusicStandard:
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:
+ case SPK.LightCCT:
var TureView = new ColorTureLampPage(function as Light);
MainPage.BasePageView.AddChidren(TureView);
TureView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
+ case SPK.SensorPir:
+ var pirPage = new SensorPirPage();
+ pirPage.ShowColltionButton = false;
+ pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorWater:
+ var waterPage = new SensorWaterImmersionPage();
+ waterPage.ShowColltionButton = false;
+ waterPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorSmoke:
+ var smokePage = new SensorSmokePage();
+ smokePage.ShowColltionButton = false;
+ smokePage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorDoorWindow:
+ var doorwindowPage = new SensorDoorWinwsPage();
+ doorwindowPage.ShowColltionButton = false;
+ doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.ClothesHanger:
+ var clothesHangerpage = new ClothesHangerPage();
+ clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
}
};
return eventHandler;
--
Gitblit v1.8.0