From c047239d340038cea872bae276e713ef866c0a34 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 三月 2021 13:22:21 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 0c58f50..5f12ec0 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -15,6 +15,7 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
+ //todo 澧炲姞璁惧锛屽姛鑳藉垪琛ㄧ晫闈�
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.spk)
{
@@ -93,6 +94,22 @@
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 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);//褰撳墠鎾斁鍣�
@@ -107,6 +124,30 @@
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