From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 12 五月 2021 15:13:56 +0800 Subject: [PATCH] Merge branch 'CJL' into wxr4 --- HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs index 564ed4d..3a84846 100644 --- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs +++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs @@ -75,6 +75,7 @@ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; break; case SPK.ElectricTV: + case SPK.TvIr: var tvView = new TVPage(function); MainPage.BasePageView.AddChidren(tvView); tvView.LoadPage(btnCollectionIcon, btnName, btnFromFloor); @@ -138,6 +139,14 @@ var acPage = new AcControlPage(); acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); break; + case SPK.IrLearn: + var irLearinPage = new IrLearnPage(); + irLearinPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); + break; + case SPK.AirFreshJinmao: + var airFresh1 = new AirFreshControlPage(); + airFresh1.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); + break; } }; return eventHandler; -- Gitblit v1.8.0