From 6bf515816c3c971f57722c5195208f65446ef335 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期一, 29 三月 2021 17:49:15 +0800
Subject: [PATCH] 完成新风功能
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 132 ++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 60 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 687bc60..ea5aac2 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -113,6 +113,7 @@
public void LoadPage()
{
+ MainPage.CurPageIndex = 0;
try
{
this.BeginHeaderRefreshingAction = () =>
@@ -459,7 +460,6 @@
/// </summary>
void LoadDeviceFunctionControlZone()
{
-
#region ContextView
deviceFunctionView.RemoveAll();
functionViews.Clear();
@@ -467,12 +467,18 @@
try
{
int index = 0;
- foreach (var function in FunctionList.List.GetDeviceFunctionList())
+ var list = FunctionList.List.GetDeviceFunctionList();
+ foreach (var function in list)
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
if (function.Spk_Prefix == FunctionCategory.Music)
{
- var music = function as Music.A31MusicModel;
+ //var music = function as Music.A31MusicModel;
+ var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
+ if (music == null)
+ {
+ continue;
+ }
if (music.ServerClientType == -1)
{
continue;
@@ -740,7 +746,8 @@
}
LoadEvent_FunctionCollection(btnCollection, function);
- if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
+ if (//SPK.CurtainSpkList().Contains(function.spk))
+ function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
@@ -769,23 +776,23 @@
};
view.AddChidren(btnCurtainOpen);
- LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
+ LoadEvent_ControlCurtain(function, btnCurtainClose, btnCurtainOpen);
}
- else if (function.spk == SPK.ElectricTV)
+ else if (function.spk == SPK.ElectricTV || function.spk == SPK.TvIr)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
Button btnPower;
btnPower = new Button()
{
X = Application.GetRealWidth(131),
- Y = Application.GetRealHeight(86),
+ Y = Application.GetRealHeight(70),
Width = Application.GetRealWidth(32),
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/PowerClose.png",
};
view.AddChidren(btnPower);
- LoadEvent_ControlTV(function as TV, btnPower);
+ LoadEvent_ControlTV(function, btnPower);
}
else if (function.spk == SPK.MusicStandard)
@@ -878,58 +885,62 @@
};
view.AddChidren(btnSwitch);
- switch (function.Spk_Prefix)
- {
- //todo 澧炲姞璁惧锛屼富椤垫敹钘忓浘鏍�
- case FunctionCategory.Light:
- #region 鐏厜 Light
- btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
- UpdataFunctionStates(function as Light);
- #endregion
- break;
- case FunctionCategory.AC:
- #region 绌鸿皟 AC
- btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
- #endregion
- break;
- case FunctionCategory.FloorHeat:
- #region 鍦扮儹
- btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
- #endregion
- break;
- case FunctionCategory.Electric:
- switch (function.spk)
- {
- case SPK.ElectricSocket:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
- break;
- case SPK.ElectricFan:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
- break;
- case SPK.ElectricTuyaAirCleaner:
- btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIcon.png";
- btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIconOn.png";
- break;
- case SPK.ElectricTuyaFan:
- btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/FanIcon.png";
- btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/FanIconOn.png";
- break;
- case SPK.ElectricTuyaWaterValve:
- btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIcon.png";
- btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIconOn.png";
- break;
- case SPK.ElectricTuyaWeepRobot:
- btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIcon.png";
- btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIconOn.png";
- break;
- }
- break;
- }
+
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+
+ //switch (function.Spk_Prefix)
+ //{
+ // //todo 澧炲姞璁惧锛屼富椤垫敹钘忓浘鏍�
+ // case FunctionCategory.Light:
+ // #region 鐏厜 Light
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
+ // btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
+ // UpdataFunctionStates(function);
+ // #endregion
+ // break;
+ // case FunctionCategory.AC:
+ // #region 绌鸿皟 AC
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
+ // btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
+ // #endregion
+ // break;
+ // case FunctionCategory.FloorHeat:
+ // #region 鍦扮儹
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
+ // btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
+ // #endregion
+ // break;
+ // case FunctionCategory.Electric:
+ // switch (function.spk)
+ // {
+ // case SPK.ElectricSocket:
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
+ // btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
+ // break;
+ // case SPK.ElectricFan:
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
+ // btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
+ // break;
+ // case SPK.ElectricTuyaAirCleaner:
+ // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIcon.png";
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIconOn.png";
+ // break;
+ // case SPK.ElectricTuyaFan:
+ // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/FanIcon.png";
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/FanIconOn.png";
+ // break;
+ // case SPK.ElectricTuyaWaterValve:
+ // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIcon.png";
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIconOn.png";
+ // break;
+ // case SPK.ElectricTuyaWeepRobot:
+ // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIcon.png";
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIconOn.png";
+ // break;
+ // }
+ // break;
+ //}
LoadEvent_SwitchFunction(function, btnSwitch);
}
//鍙栨秷鏀惰棌浜嬩欢
@@ -948,6 +959,7 @@
function.CollectFunction();
};
+
var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone);
view.MouseUpEventHandler = skipControlPageEvent;
btnName.MouseUpEventHandler = skipControlPageEvent;
--
Gitblit v1.8.0