From b271bcceb1c4e718377ca86b6213816abcf7482a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 13:57:18 +0800
Subject: [PATCH] 20210111-删除功能类别，统一使用spk去设备功能
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 537504e..442b6f9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Entity;
using Shared;
namespace HDL_ON.UI.UI2.Intelligence.Automation
@@ -266,33 +267,33 @@
/// </summary>
/// <param name="functionType">璁惧绫诲瀷</param>
/// <returns></returns>
- public static string GetIconPath(FunctionType functionType)
+ public static string GetIconPath(string functionType)
{
string strPath = "";
switch (functionType)
{
- case FunctionType.Relay:
- case FunctionType.RGB:
- case FunctionType.RGBW:
- case FunctionType.ColorTemperature:
- case FunctionType.Dimmer:
+ case SPK.LightSwitch:
+ case SPK.LightRGB:
+ case SPK.LightRGBW:
+ case SPK.LightCCT:
+ case SPK.LightDimming:
{
strPath = "LogicIcon/lightloguc.png";
}
break;
- case FunctionType.Curtain:
- case FunctionType.RollingShutter:
- case FunctionType.MotorCurtain:
+ case SPK.CurtainSwitch:
+ case SPK.CurtainRoller:
+ case SPK.CurtainTrietex:
{
strPath = "LogicIcon/curtainlogic.png";
}
break;
- case FunctionType.AC:
+ case SPK.AcStandard:
{
strPath = "LogicIcon/airconditionerlogic.png";
}
break;
- case FunctionType.FloorHeating:
+ case SPK.FloorHeatStandard:
{
strPath = "LogicIcon/heatlogic.png";
}
@@ -310,24 +311,24 @@
{
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
- var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer || device.functionType == FunctionType.ColorTemperature || device.functionType == FunctionType.RGB || device.functionType == FunctionType.RGBW);
+ var lightjosn = deviceList.Find((device) => device.spk == SPK.LightSwitch || device.spk == SPK.LightDimming || device.spk == SPK.LightCCT || device.spk == SPK.LightRGB || device.spk == SPK.LightRGBW);
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
}
- var curtainjosn = deviceList.Find((device) => device.functionType == FunctionType.Curtain || device.functionType == FunctionType.MotorCurtain || device.functionType == FunctionType.RollingShutter);
+ var curtainjosn = deviceList.Find((device) => device.spk == SPK.CurtainSwitch || device.spk == SPK.CurtainTrietex || device.spk == SPK.CurtainRoller);
if (curtainjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
}
- var ac = deviceList.Find((device) => device.functionType == FunctionType.AC);
+ var ac = deviceList.Find((device) => device.spk == SPK.AcStandard);
if (ac != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
}
- var floorHeating = deviceList.Find((device) => device.functionType == FunctionType.FloorHeating);
+ var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard);
if (floorHeating != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
@@ -340,30 +341,30 @@
/// </summary>
/// <param name="deviceType">璁惧绫诲瀷(鐏厜绫伙紝绐楀笜绫汇��)</param>
/// <returns></returns>
- public static List<FunctionType> GetDeviceTypeFunctionList(string deviceType)
+ public static List<string> GetDeviceTypeFunctionList(string deviceType)
{
- List<FunctionType> functionTypeList = new List<FunctionType>();
+ List<string> functionTypeList = new List<string>();
if (deviceType == Language.StringByID(StringId.Lights))
{
- functionTypeList.Add(FunctionType.Relay);
- functionTypeList.Add(FunctionType.Dimmer);
- functionTypeList.Add(FunctionType.RGB);
- functionTypeList.Add(FunctionType.RGBW);
- functionTypeList.Add(FunctionType.ColorTemperature);
+ functionTypeList.Add(SPK.LightSwitch);
+ functionTypeList.Add(SPK.LightDimming);
+ functionTypeList.Add(SPK.LightRGB);
+ functionTypeList.Add(SPK.LightRGBW);
+ functionTypeList.Add(SPK.LightCCT);
}
else if (deviceType == Language.StringByID(StringId.Curtain))
{
- functionTypeList.Add(FunctionType.Curtain);
- functionTypeList.Add(FunctionType.RollingShutter);
- functionTypeList.Add(FunctionType.MotorCurtain);
+ functionTypeList.Add(SPK.CurtainSwitch);
+ functionTypeList.Add(SPK.CurtainRoller);
+ functionTypeList.Add(SPK.CurtainTrietex);
}
else if (deviceType == Language.StringByID(StringId.AC))
{
- functionTypeList.Add(FunctionType.AC);
+ functionTypeList.Add(SPK.AcStandard);
}
else if (deviceType == Language.StringByID(StringId.FloorHeating))
{
- functionTypeList.Add(FunctionType.FloorHeating);
+ functionTypeList.Add(SPK.FloorHeatStandard);
}
return functionTypeList;
@@ -372,37 +373,37 @@
/// 鏉′欢/鐩爣鏀寔璁惧
/// </summary>
/// <returns></returns>
- public static List<FunctionType> GetSupportEquipment(string if_type)
+ public static List<string> GetSupportEquipment(string if_type)
{
- List<FunctionType> deviceTypeList = new List<FunctionType>();
+ List<string> deviceTypeList = new List<string>();
switch (if_type)
{
case condition_if:
{
- deviceTypeList.Add(FunctionType.Relay);
- deviceTypeList.Add(FunctionType.RGB);
- deviceTypeList.Add(FunctionType.RGBW);
- deviceTypeList.Add(FunctionType.Dimmer);
- deviceTypeList.Add(FunctionType.ColorTemperature);
- deviceTypeList.Add(FunctionType.Curtain);
- deviceTypeList.Add(FunctionType.RollingShutter);
- deviceTypeList.Add(FunctionType.MotorCurtain);
- deviceTypeList.Add(FunctionType.AC);
- deviceTypeList.Add(FunctionType.FloorHeating);
+ deviceTypeList.Add(SPK.LightSwitch);
+ deviceTypeList.Add(SPK.LightRGB);
+ deviceTypeList.Add(SPK.LightRGBW);
+ deviceTypeList.Add(SPK.LightDimming);
+ deviceTypeList.Add(SPK.LightCCT);
+ deviceTypeList.Add(SPK.CurtainSwitch);
+ deviceTypeList.Add(SPK.CurtainRoller);
+ deviceTypeList.Add(SPK.CurtainTrietex);
+ deviceTypeList.Add(SPK.AcStandard);
+ deviceTypeList.Add(SPK.FloorHeatStandard);
}
break;
case target_if:
{
- deviceTypeList.Add(FunctionType.Relay);
- deviceTypeList.Add(FunctionType.RGB);
- deviceTypeList.Add(FunctionType.RGBW);
- deviceTypeList.Add(FunctionType.Dimmer);
- deviceTypeList.Add(FunctionType.ColorTemperature);
- deviceTypeList.Add(FunctionType.Curtain);
- deviceTypeList.Add(FunctionType.RollingShutter);
- deviceTypeList.Add(FunctionType.MotorCurtain);
- deviceTypeList.Add(FunctionType.AC);
- deviceTypeList.Add(FunctionType.FloorHeating);
+ deviceTypeList.Add(SPK.LightSwitch);
+ deviceTypeList.Add(SPK.LightRGB);
+ deviceTypeList.Add(SPK.LightRGBW);
+ deviceTypeList.Add(SPK.LightDimming);
+ deviceTypeList.Add(SPK.LightCCT);
+ deviceTypeList.Add(SPK.CurtainSwitch);
+ deviceTypeList.Add(SPK.CurtainRoller);
+ deviceTypeList.Add(SPK.CurtainTrietex);
+ deviceTypeList.Add(SPK.AcStandard);
+ deviceTypeList.Add(SPK.FloorHeatStandard);
}
break;
}
@@ -414,13 +415,13 @@
/// <param name="functionType">婧愭暟鎹垪琛�1</param>
/// <param name="deviceList">婧愭暟鎹垪琛�2</param>
/// <returns></returns>
- public static List<Entity.Function> GetShowDeviceList(List<FunctionType> functionType, List<HDL_ON.Entity.Function> deviceList)
+ public static List<Entity.Function> GetShowDeviceList(List<string> functionType, List<HDL_ON.Entity.Function> deviceList)
{
List<HDL_ON.Entity.Function> devList = new List<Entity.Function>();
for (int i = 0; i < deviceList.Count; i++)
{
var dev = deviceList[i];
- if (functionType.Contains(dev.functionType))
+ if (functionType.Contains(dev.spk))
{
///杩囨护鎺変笉闇�瑕佹樉绀虹殑璁惧
devList.Add(dev);
@@ -438,7 +439,7 @@
/// <returns></returns>
public static List<Entity.Function> GetFunctionDeviceList(Entity.Room room, string str)
{
- List<FunctionType> functionTypeList = GetSupportEquipment(str);
+ List<string> functionTypeList = GetSupportEquipment(str);
//杩斿洖鎴块棿璁惧鍒楄〃
var roomDeviceList = GetRoomDevice(room);
//杩斿洖鏈�缁堟敮鎸佹樉绀哄嚭鏉ョ殑璁惧鍒楄〃
--
Gitblit v1.8.0