From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index f8dae98..7b59c9e 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -20,6 +20,12 @@
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.spk)
{
+ case SPK.AirSwitch:
+ var airSwitchPage = new AirSwitchPage(function);
+ MainPage.BasePageView.AddChidren(airSwitchPage);
+ airSwitchPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
case SPK.LightSwitch:
var relayView = new RelayPage(function);
MainPage.BasePageView.AddChidren(relayView);
@@ -57,18 +63,21 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:
var fhView = new FloorHeatingPage(function);
MainPage.BasePageView.AddChidren(fhView);
fhView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.ElectricFan:
+ case SPK.HvacFan:
var fanView = new FanPage(function);
MainPage.BasePageView.AddChidren(fanView);
fanView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.ElectricSocket:
+ case SPK.PanelSocket:
var sView = new SocketPage(function);
MainPage.BasePageView.AddChidren(sView);
sView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
@@ -76,28 +85,46 @@
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:
+ case SPK.ElectricTuyaAirCleaner2:
var airCleaner = new TuyaAirCleanerPage();
airCleaner.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaFan2:
var tuyaFan = new TuyaFanPage();
tuyaFan.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.ElectricTuyaWaterValve:
+ case SPK.ElectricTuyaWaterValve2:
var tyWaterValve = new TuyaWaterValvePage();
tyWaterValve.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.ElectricTuyaWeepRobot:
+ case SPK.ElectricTuyaWeepRobot2:
var weepRobot = new TuyaWeepRobotPage();
weepRobot.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.MusicStandard:
+ case SPK.AvMusic:
Music.A31MusicModel.Current = (function as Music.A31MusicModel);//褰撳墠鎾斁鍣�
var a31PlayMusicPage = new Music.A31PlayMusicPage();
MainPage.BasePageView.AddChidren(a31PlayMusicPage);
@@ -130,18 +157,44 @@
doorwindowPage.ShowColltionButton = false;
doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
+ var smPage = new SenesorMegahealthPage();
+ smPage.ShowColltionButton = false;
+ smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorGas:
+ var gasPage = new SensorGasPage();
+ gasPage.ShowColltionButton = false;
+ gasPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
case SPK.ClothesHanger:
var clothesHangerpage = new ClothesHangerPage();
clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.FanIr:
+ var fanIr = new IrFanPage();
+ fanIr.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
case SPK.AcIr:
case SPK.AcStandard:
+ case SPK.HvacAC:
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:
+ case SPK.HvacAirFreshJinmao:
+ var airFresh1 = new AirFreshControlPage();
+ airFresh1.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
+ var airFresh2 = new AirFreshRelayControlPage();
+ airFresh2.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
}
};
--
Gitblit v1.8.0