From cb6e11c5067ecaba4d8f9907989154167c1e8943 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:15:05 +0800
Subject: [PATCH] Merge branch 'wxr4' into dev-tzy
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 3a84846..82d5d2b 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -76,10 +76,23 @@
break;
case SPK.ElectricTV:
case SPK.TvIr:
+ case SPK.TvXmIr:
var tvView = new TVPage(function);
MainPage.BasePageView.AddChidren(tvView);
tvView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.PjtIr://鎶曞奖浠�
+ var pjtView = new PjtPage(function);
+ MainPage.BasePageView.AddChidren(pjtView);
+ pjtView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.StbIr://鏈洪《鐩�
+ var stbView = new StbPage(function);
+ MainPage.BasePageView.AddChidren(stbView);
+ stbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.ElectricTuyaAirCleaner:
var airCleaner = new TuyaAirCleanerPage();
@@ -130,6 +143,11 @@
doorwindowPage.ShowColltionButton = false;
doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.SenesorMegahealth:
+ var smPage = new SenesorMegahealthPage();
+ smPage.ShowColltionButton = false;
+ smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
case SPK.ClothesHanger:
var clothesHangerpage = new ClothesHangerPage();
clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
--
Gitblit v1.8.0