From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 96dd1af..bfedba6 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -22,6 +22,12 @@
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.spk)
{
+ case SPK.ElectricEnergy:
+ var skipView = new EnergyMainPage();
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
case SPK.GroupControl:
//var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
//dialog.ShowDialog();
@@ -34,6 +40,12 @@
var airSwitchPage = new AirSwitchPage(function);
MainPage.BasePageView.AddChidren(airSwitchPage);
airSwitchPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.AirSwitchP3:
+ var airSwitchP3Page = new AirSwitchP3Page(function);
+ MainPage.BasePageView.AddChidren(airSwitchP3Page);
+ airSwitchP3Page.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.LightSwitch:
@@ -339,6 +351,26 @@
form.Show();
}
break;
+ case SPK.AvZkAiks:
+ {
+ //褰遍煶涓帶
+ var form = new UI2.FuntionControlView.Aks.AksPage(function, btnName, btnFromFloor, comerom, action);
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+
+ }
+ break;
+ case SPK.ElectricalTvHisense:
+ {
+ //娴蜂俊鐢佃
+ var form = new UI2.FuntionControlView.HisenseTV.HisenseTvPage(function, btnName, btnFromFloor,btnCollectionIcon, comerom, action);
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+
+ }
+ break;
}
};
return eventHandler;
--
Gitblit v1.8.0