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 | 199 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 198 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 1d65615..7b59c9e 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -1,7 +1,204 @@
锘縰sing System;
+using System.Threading;
+using HDL_ON.Entity;
+using Shared;
+
namespace HDL_ON.UI
{
public partial class PublicAssmebly
{
+
+ /// <summary>
+ /// 鍔熻兘鎺у埗鐣岄潰璺宠浆浜嬩欢
+ /// </summary>
+ public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor
+ )
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ //todo 澧炲姞璁惧锛屽姛鑳藉垪琛ㄧ晫闈�
+ //璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
+ 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);
+ relayView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.LightRGB:
+ var rgbView = new RGBPage(function);
+ MainPage.BasePageView.AddChidren(rgbView);
+ rgbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.LightDimming:
+ var dimmerView = new DimmerPage(function);
+ MainPage.BasePageView.AddChidren(dimmerView);
+ dimmerView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.CurtainTrietex:
+ var skinView = new MotorCurtainPage(function);
+ MainPage.BasePageView.AddChidren(skinView);
+ skinView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.CurtainSwitch:
+ var curtainView = new CurtainModulePage(function);
+ MainPage.BasePageView.AddChidren(curtainView);
+ curtainView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.CurtainRoller:
+ var rollingShutterView = new RollingShutterPage(function);
+ MainPage.BasePageView.AddChidren(rollingShutterView);
+ rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ 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);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ 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);
+ a31PlayMusicPage.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.LightCCT:
+ var TureView = new ColorTureLampPage(function);
+ MainPage.BasePageView.AddChidren(TureView);
+ TureView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.SensorPir:
+ var pirPage = new SensorPirPage();
+ pirPage.ShowColltionButton = false;
+ pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorWater:
+ var waterPage = new SensorWaterImmersionPage();
+ waterPage.ShowColltionButton = false;
+ waterPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorSmoke:
+ var smokePage = new SensorSmokePage();
+ smokePage.ShowColltionButton = false;
+ smokePage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.SensorDoorWindow:
+ var doorwindowPage = new SensorDoorWinwsPage();
+ 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;
+ }
+ };
+ return eventHandler;
+ }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0