From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs | 56 +++++++-------------------------------------------------
1 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
old mode 100755
new mode 100644
index 0ad5aaf..ede07c9
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -128,7 +128,7 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in FunctionList.List.GetDeviceFunctionList())
+ foreach (var function in FunctionList.List.Functions)
{
if (function == null)
{
@@ -166,9 +166,10 @@
}
foreach (var function in functions)
{
- if (function.functionCategory != FunctionCategory.Light &&
- function.functionCategory != FunctionCategory.Thermostat &&
- function.functionCategory != FunctionCategory.Curtain
+ if (function.Spk_Prefix != FunctionCategory.Light &&
+ function.Spk_Prefix != FunctionCategory.AC &&
+ function.Spk_Prefix != FunctionCategory.FloorHeat &&
+ function.Spk_Prefix != FunctionCategory.Curtain
)
{
continue;
@@ -209,51 +210,8 @@
Height = Application.GetMinRealAverage(28),
};
functionRow.AddChidren(btnFunctionIcon);
- switch (function.functionCategory)
- {
- case FunctionCategory.Thermostat:
- switch (function.functionType)
- {
- case FunctionType.AC:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
- break;
- case FunctionType.FloorHeating:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
- break;
- }
- break;
- case FunctionCategory.Curtain:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
- break;
- case FunctionCategory.Light:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
- break;
- case FunctionCategory.SwitchDevice:
- switch (function.functionType)
- {
- case FunctionType.Socket:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
- break;
- }
- break;
- case FunctionCategory.Electrical:
- switch (function.functionType)
- {
- case FunctionType.Fan:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
- break;
- case FunctionType.TV:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
- break;
- }
- break;
- case FunctionCategory.Scene:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
- break;
- case FunctionCategory.Music:
- btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
- break;
- }
+
+ btnFunctionIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
var btnFunctionName = new Button()
{
--
Gitblit v1.8.0