From 5266531a3a1552a11a29473974481d60100812c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 04 三月 2021 19:24:44 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into NewFilePath
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 5f12ec0..f6559b3 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -65,12 +65,6 @@
rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
- 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 SPK.FloorHeatStandard:
var fhView = new FloorHeatingPage(function as FloorHeating);
MainPage.BasePageView.AddChidren(fhView);
@@ -148,6 +142,17 @@
var clothesHangerpage = new ClothesHangerPage();
clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.IrAC:
+ case SPK.AcStandard:
+ var acPage = new AcControlPage();
+ acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ //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;
}
};
return eventHandler;
--
Gitblit v1.8.0